diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-05-07 19:06:10 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-05-07 19:09:00 +0200 |
commit | a2787fdc71d71a24e9308e5ccde4538e992d4b86 (patch) | |
tree | 053beb51a7ee4ddbf4b9ce9458f9845292d9b35a | |
parent | 289d981c59bbf656a28684fe393521fa8c9ecc37 (diff) |
LXQt relies on the dropped X11.
Remove the recipes and related files.
Also remove sddm, the display manager used with lxqt.
Related-to: ELB-5740
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
19 files changed, 0 insertions, 402 deletions
diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel/panel.conf b/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel/panel.conf deleted file mode 100644 index 4b98b39..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel/panel.conf +++ /dev/null @@ -1,118 +0,0 @@ -[General] -__userfile__=true - -[desktopswitch] -alignment=Left -type=desktopswitch - -[mainmenu] -alignment=Left -type=mainmenu - -[mount] -alignment=Right -type=mount - -[panel1] -alignment=-1 -animation-duration=0 -background-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0) -background-image= -desktop=0 -font-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0) -hidable=false -iconSize=22 -lineCount=1 -lockPanel=false -opacity=100 -panelSize=32 -plugins=mainmenu, desktopswitch, quicklaunch, taskbar, tray, statusnotifier, mount, volume, clock, showdesktop, sensors, sysstat, worldclock2 -position=Bottom -reserve-space=true -show-delay=0 -width=100 -width-percent=true - -[quicklaunch] -alignment=Left -apps\1\desktop=/usr/share/applications/pcmanfm-qt.desktop -apps\2\desktop=/usr/share/applications/qterminal.desktop -apps\size=2 -type=quicklaunch - -[sensors] -alignment=Right -chips\imx_thermal_zone-virtual-0\temp1\color=#628cb2 -chips\imx_thermal_zone-virtual-0\temp1\enabled=true -tempBarWidth=8 -type=sensors -updateInterval=1 -useFahrenheitScale=false -warningAboutHighTemperature=true - -[showdesktop] -alignment=Right -type=showdesktop - -[statusnotifier] -alignment=Right -type=statusnotifier - -[sysstat] -alignment=Right -cpu\frequencyColour=#808080 -cpu\niceColour=#008000 -cpu\otherColour=#808000 -cpu\systemColour=#800000 -cpu\useFrequency=false -cpu\userColour=#00ff7f -data\source=cpu -data\type=CPU -graph\minimalSize=30 -graph\updateInterval=1 -graph\useThemeColours=false -grid\colour=#808080 -grid\lines=1 -mem\appsColour=#000080 -mem\buffersColour=#008000 -mem\cachedColour=#808000 -mem\swapColour=#800000 -net\logarithmicScale=true -net\logarithmicScaleSteps=4 -net\maximumSpeed=1 MB/s -net\receivedColour=#000080 -net\transmittedColour=#808000 -title\colour=#000000 -title\label= -type=sysstat - -[taskbar] -alignment=Left -autoRotate=true -buttonHeight=100 -buttonStyle=IconText -buttonWidth=200 -closeOnMiddleClick=true -cycleOnWheelScroll=true -groupingEnabled=true -iconByClass=false -raiseOnCurrentDesktop=false -showDesktopNum=0 -showGroupOnHover=true -showOnlyCurrentScreenTasks=false -showOnlyMinimizedTasks=false -showOnlyOneDesktopTasks=false -type=taskbar - -[tray] -alignment=Right -type=tray - -[volume] -alignment=Right -audioEngine=Alsa -type=volume - -[worldclock2] -alignment=Right -type=worldclock diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend deleted file mode 100644 index 8d437cb..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-panel:" - -# add some widgets, add some applications to quicklaunch by injecting -# panel.conf configured on the target - -SRC_URI += "file://panel.conf" -do_configure:prepend () { - cp ${WORKDIR}/panel.conf ${S}/panel/resources/ -} diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session/0001-session.conf-add-qterminal-as-default-terminal.patch b/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session/0001-session.conf-add-qterminal-as-default-terminal.patch deleted file mode 100644 index f4ecae4..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session/0001-session.conf-add-qterminal-as-default-terminal.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d75c0cc25075b78730a4ef29823d6fabe2d46a6b Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Tue, 2 Jan 2018 10:44:43 +0100 -Subject: [PATCH] session.conf: add qterminal as default terminal - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - config/session.conf | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config/session.conf b/config/session.conf -index ded6aa8..c0aacf5 100644 ---- a/config/session.conf -+++ b/config/session.conf -@@ -3,8 +3,10 @@ window_manager=openbox - leave_confirmation=true - - [Environment] -+BROWSER= - GTK_CSD=0 - GTK_OVERLAY_SCROLLING=0 -+TERM=qterminal - - [Mouse] - cursor_size=18 --- -2.13.6 - diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend deleted file mode 100644 index c3b8be2..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-session:" - -SRC_URI += "file://0001-session.conf-add-qterminal-as-default-terminal.patch" diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6D.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6D.png Binary files differdeleted file mode 100755 index 5f145d3..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6D.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6Q.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6Q.png Binary files differdeleted file mode 100755 index 72623c1..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6Q.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF50.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF50.png Binary files differdeleted file mode 100644 index d28e967..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF50.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF61.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF61.png Binary files differdeleted file mode 100644 index 404ae0f..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF61.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6DL.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6DL.png Binary files differdeleted file mode 100644 index 37e8c2f..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6DL.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6S.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6S.png Binary files differdeleted file mode 100644 index faca0ad..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6S.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6ULL.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6ULL.png Binary files differdeleted file mode 100644 index 7fc1228..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6ULL.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7D.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7D.png Binary files differdeleted file mode 100644 index c0fb9a1..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7D.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7S.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7S.png Binary files differdeleted file mode 100644 index 18d671d..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7S.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_Toradex.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_Toradex.png Binary files differdeleted file mode 100644 index dc56b11..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_Toradex.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend deleted file mode 100644 index f88e38b..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend +++ /dev/null @@ -1,90 +0,0 @@ -WALLPAPER-MACHINE = "Wallpaper_Toradex.png" -WALLPAPER-MACHINE:colibri-imx6ull = "Wallpaper_ColibriiMX6ULL.png" -WALLPAPER-MACHINE:colibri-imx6ull-emmc = "Wallpaper_ColibriiMX6ULL.png" -WALLPAPER-MACHINE:colibri-imx7-emmc = "Wallpaper_ColibriiMX7D.png" - -FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-themes:" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI += " \ - file://Wallpaper_Toradex.png \ - file://${WALLPAPER-MACHINE} \ -" - -# for apalis-imx6/colibri-imx6, we decide on the target during postinst -SRC_URI:append:apalis-imx6 += " \ - file://Wallpaper_ApalisiMX6D.png \ - file://Wallpaper_ApalisiMX6Q.png \ -" -SRC_URI:append:colibri-imx6 += " \ - file://Wallpaper_ColibriiMX6DL.png \ - file://Wallpaper_ColibriiMX6S.png \ -" - -# for colibri-imx7 we decide on the target during postinst -SRC_URI:append:colibri-imx7 += " \ - file://Wallpaper_ColibriiMX7D.png \ - file://Wallpaper_ColibriiMX7S.png \ -" -SRC_URI:append:colibri-imx7-emmc += " \ - file://Wallpaper_ColibriiMX7D.png \ -" - -do_install:append () { - install -m 0755 -d ${D}/${datadir}/lxqt/themes/toradex - install -m 0644 ${WORKDIR}/Wallpaper*.png ${D}/${datadir}/lxqt/themes/toradex - ln -sf ${WALLPAPER-MACHINE} ${D}/${datadir}/lxqt/themes/toradex/toradex.png -} - -pkg_postinst_ontarget:${PN}:apalis-imx6 () { - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 4) - ln -sf Wallpaper_ApalisiMX6Q.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - 2) - ln -sf Wallpaper_ApalisiMX6D.png ${datadir}/lxqt/themes/toradex/toradex.png - fi - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - esac -} -pkg_postinst_ontarget:${PN}:colibri-imx6 () { - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 2) - ln -sf Wallpaper_ColibriiMX6DL.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - 1) - ln -sf Wallpaper_ColibriiMX6S.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - esac -} - -pkg_postinst_ontarget:${PN}:colibri-imx7 () { -# Currently the soc bus subsystem seems not to work on i.MX 7Solo -# SOC_TYPE=`cat /sys/bus/soc/devices/soc0/soc_id` -# if [ "x$SOC_TYPE" = "xi.MX7D" ]; then -# ln -sf Wallpaper_ColibriiMX7D.png ${datadir}/lxqt/themes/toradex/toradex.png -# else -# ln -sf Wallpaper_ColibriiMX7S.png ${datadir}/lxqt/themes/toradex/toradex.png -# fi - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 2) - ln -sf Wallpaper_ColibriiMX7D.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - 1) - ln -sf Wallpaper_ColibriiMX7S.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - esac -} diff --git a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt/0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch b/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt/0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch deleted file mode 100644 index cffad50..0000000 --- a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt/0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 12a1469fa171f5d0e50b536a6e073ea5ca45a152 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Wed, 3 Jan 2018 14:33:37 +0100 -Subject: [PATCH] settings.conf.in: change to use a toradex wallpaper - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - config/pcmanfm-qt/lxqt/settings.conf.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config/pcmanfm-qt/lxqt/settings.conf.in b/config/pcmanfm-qt/lxqt/settings.conf.in -index b7ef002..70a1d18 100644 ---- a/config/pcmanfm-qt/lxqt/settings.conf.in -+++ b/config/pcmanfm-qt/lxqt/settings.conf.in -@@ -14,9 +14,9 @@ SingleClick=false - ConfirmDelete=true - - [Desktop] --WallpaperMode=stretch --Wallpaper=@LXQT_SHARE_DIR@/themes/frost/lxqt-origami-light.png --BgColor=#000000 -+WallpaperMode=center -+Wallpaper=@LXQT_SHARE_DIR@/themes/toradex/toradex.png -+BgColor=#00508c - FgColor=#ffffff - ShadowColor=#000000 - ShowHidden=false --- -2.13.6 - diff --git a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend b/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend deleted file mode 100644 index 13ce53d..0000000 --- a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/pcmanfm-qt:" - -SRC_URI += "file://0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch" diff --git a/meta-qt5-extra/recipes-misc/sddm/files/sddm.conf b/meta-qt5-extra/recipes-misc/sddm/files/sddm.conf deleted file mode 100644 index 720f45c..0000000 --- a/meta-qt5-extra/recipes-misc/sddm/files/sddm.conf +++ /dev/null @@ -1,120 +0,0 @@ -[Autologin] -# Whether sddm should automatically log back into sessions when they exit -Relogin=false - -# Name of session file for autologin session (if empty try last logged in) -Session=lxqt - -# Username for autologin session -User=root - - -[General] -# Halt command -HaltCommand=/usr/bin/systemctl poweroff - -# Input method module -InputMethod= - -# Initial NumLock state. Can be on, off or none. -# If property is set to none, numlock won't be changed -# NOTE: Currently ignored if autologin is enabled. -Numlock=none - -# Reboot command -RebootCommand=/usr/bin/systemctl reboot - - -[Theme] -# Current theme name -Current= - -# Cursor theme used in the greeter -CursorTheme= - -# Number of users to use as threshold -# above which avatars are disabled -# unless explicitly enabled with EnableAvatars -DisableAvatarsThreshold=7 - -# Enable display of custom user avatars -EnableAvatars=true - -# Global directory for user avatars -# The files should be named <username>.face.icon -FacesDir=/usr/share/sddm/faces - -# Theme directory path -ThemeDir=/usr/share/sddm/themes - - -[Users] -# Default $PATH for logged in users -DefaultPath=/bin:/usr/bin:/usr/local/bin - -# Comma-separated list of shells. -# Users with these shells as their default won't be listed -HideShells=/bin/sync,/bin/false,/bin/nologin,/usr/sbin/ppp-dialin - -# Comma-separated list of users that should not be listed -HideUsers=daemon,bin,sys,games,man,lp,mail,news,uucp,proxy,www-data,backup,list,irc,gnats,polkitd - -# Maximum user id for displayed users -MaximumUid=60000 - -# Minimum user id for displayed users -MinimumUid=0 - -# Remember the session of the last successfully logged in user -RememberLastSession=true - -# Remember the last successfully logged in user -RememberLastUser=true - - -[Wayland] -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/wayland-session - -# Directory containing available Wayland sessions -SessionDir=/usr/share/wayland-sessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/wayland-session.log - - -[X11] -# Path to a script to execute when starting the display server -DisplayCommand=/usr/share/sddm/scripts/Xsetup - -# Path to a script to execute when stopping the display server -DisplayStopCommand=/usr/share/sddm/scripts/Xstop - -# The lowest virtual terminal number that will be used. -MinimumVT=1 - -# Arguments passed to the X server invocation -ServerArguments=-nolisten tcp - -# Path to X server binary -ServerPath=/usr/bin/X - -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/Xsession - -# Directory containing available X sessions -SessionDir=/usr/share/xsessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/xorg-session.log - -# Path to the Xauthority file -UserAuthFile=.Xauthority - -# Path to xauth binary -XauthPath=/usr/bin/xauth - -# Path to Xephyr binary -XephyrPath=/usr/bin/Xephyr - - diff --git a/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend b/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend deleted file mode 100644 index 8802adb..0000000 --- a/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |