packagegroup-gui-full: replace multiple packages by meta-retro-world

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

README.md

@@ -220,7 +220,7 @@ Policies
 * Please do not send private emails to maintainers. For questions/suggestions.. use GitHub issues.
 * Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
   * Use 4 spaces for indention always
-  * For splitting of long list values use four-space indentation on sucessive lines set the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
+  * For splitting of long list values use four-space indentation on successive lines set the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
 
 
 -----------

TODO

@@ -1,8 +1,5 @@
 These are tasks are planned:
 
-OE:
-* Introduce security_flags.inc
-
 Scripts:
 * get rid of bashisms
 * dialog -> ncurses?

appends/meta-browser/chromium-x11_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " use-egl impl-side-painting proprietary-codecs"
+PACKAGECONFIG = "proprietary-codecs"

appends/meta-gnome/devilspie2/default.lua

@@ -18,7 +18,6 @@ if(wnd_type == "WINDOW_TYPE_NORMAL") then
 		"xarchiver",
 		"Thunar",
 		"geany",
-		"gedit",
 	}
 
 	app_name = get_application_name()

appends/meta-networking/dnsmasq_%.bbappend

@@ -0,0 +1,5 @@
+# In our environment dnsmasq is used by networkmanager only. That takes care
+# of all the configuration parameters necessary. Unfortunately this is broken
+# by dnsmasq running as service: It is set-up by configuration files and that
+# are not matching networkmanagers's needs.
+SYSTEMD_AUTO_ENABLE_${PN} = "disable"

appends/meta-qt5/qtbase-native_%.bbappend

@@ -1 +1,3 @@
 inherit instant-sysroot-native
+
+INSANE_SKIP += "native-last"

appends/meta-qt5/qtbase_%.bbappend

@@ -7,6 +7,11 @@ PACKAGECONFIG_DISTRO += " \
 
 inherit instant-paths
 
+do_install_append() {
+    # at least KDE's extra-cmake-modules expect qmake-qt5
+    ln -s qmake ${D}/${bindir}/qmake-qt5
+}
+
 do_copy_to_target_sysroot_append() {
     # ---------- qt.conf ----------
     # create

appends/oe-core/base-files/profile

@@ -25,10 +25,10 @@ if [ -z "$LANG" ]; then
 fi
 
 # `ls' enhancements:
-export LS_OPTIONS='--color=auto'
 eval `dircolors`
-alias ls='ls $LS_OPTIONS'
+alias l.='ls -d .* --color=auto'
-alias ll='ls $LS_OPTIONS -l'
+alias ll='ls -l --color=auto'
+alias ls='ls --color=auto'
 
 # colorize all grep variants
 alias grep='grep --color'

appends/oe-core/base-files_%.bbappend

@@ -3,8 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 BASEFILESISSUEINSTALL = "do_install_mortsgnaissue"
 
 do_install_mortsgnaissue () {
-    echo ${MACHINE} > ${D}${sysconfdir}/hostname
-
     install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
     if [ -n "${DISTRO_NAME}" ]; then
         echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue

appends/oe-core/cmake-native%.bbappend

@@ -1 +1,3 @@
 inherit instant-sysroot-native
+
+INSANE_SKIP += "native-last"

appends/oe-core/enchant2_%.bbappend

@@ -0,0 +1,3 @@
+PACKAGECONFIG = "hunspell"
+
+RRECOMMENDS_${PN} += "hunspell-dictionaries"

appends/oe-core/packagegroup-core-x11-xserver%.bbappend

@@ -0,0 +1,5 @@
+# we want xf86-input-libinput and some BSP layers exceed their allowed limits :(
+XSERVER_remove = " xf86-input-evdev "
+
+# at least for test add xserver's standard xf86-video-modesetting
+XSERVER_append = " xf86-video-modesetting"

appends/oe-core/sudo_%.bbappend

@@ -0,0 +1 @@
+PACKAGECONFIG_append = " pam-wheel"

classes/instant-sysroot-native.bbclass

@@ -16,7 +16,7 @@ instant_sysroot_copy () {
     hardlinkdir ${RECIPE_SYSROOT_NATIVE} ${INSTANT_NATIVE_PATH}
 }
 
-do_populate_sysroot[postfuncs] += "${INSTANTPOPULATE}"
+do_populate_sysroot[postfuncs] += "${INSTANTPOPULATE} "
 INSTANTPOPULATE = ""
 INSTANTPOPULATE_class-native = "instant_populate_sysroot"
 INSTANTPOPULATE_class-cross = "instant_populate_sysroot"

conf/distro/mortsgna.conf

@@ -10,7 +10,7 @@
 ###############################################################################
 
 # follow Yocto version scheme
-DISTRO_VERSION = "v3.1"
+DISTRO_VERSION = "v3.3"
 
 # With Angstrom we had DISTRO_TYPE = "debug"/"release". No recipe except
 # good old lxdm takes care (yes it was me). OE-Core way is setting
@@ -114,15 +114,16 @@ ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
 
 # blacklist policy
-PNBLACKLIST[pn-fso-apm]       = "regular apmd is good enough"
+PNBLACKLIST[pn-fso-apm]             = "regular apmd is good enough"
-
+PNBLACKLIST[weston-init]            = "A passwordless root session reachable by two keys - security???"
+PNBLACKLIST[packagegroup-core-x11] = "Conflicts with mortsgna-images"
+PNBLACKLIST[xserver-nodm-init]     = "Mortsgna-images use graphical display managers"
 
 ###############################################################################
 # Quality & security hardening
 ###############################################################################
 
-# uncomment to enable security flags - images tested had issues
+require conf/distro/include/security_flags.inc
-#require conf/distro/include/security_flags.inc
 
 # disable static libs
 require conf/distro/include/no-static-libs.inc
@@ -144,8 +145,6 @@ WARN_TO_ERROR_QA = " \
 WARN_QA_remove = "${WARN_TO_ERROR_QA}"
 ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
 
-PNBLACKLIST[weston-init]       = "A passwordless root session reachable by two keys - security???"
-
 ###############################################################################
 # Image defaults
 ###############################################################################

conf/layer.conf

@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "mortsgna-layer"
 BBFILE_PATTERN_mortsgna-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_mortsgna-layer = "7"
 
-LAYERSERIES_COMPAT_mortsgna-layer = "zeus dunfell"
+LAYERSERIES_COMPAT_mortsgna-layer = "dunfell gatesgarth hardknott"
 
 # This is a compromise: Because of dynamic appends it needs oe-core only. Our
 # images have a huge dependency list (see README). So the layers set here are
@@ -17,6 +17,7 @@ LAYERDEPENDS_mortsgna-layer = "core openembedded-layer networking-layer"
 
 BBFILES_DYNAMIC += " \
     browser-layer:${LAYERDIR}/appends/meta-browser/*.bbappend \
+    chromium-browser-layer:${LAYERDIR}/appends/meta-browser/*.bbappend \
     \
     gnome-layer:${LAYERDIR}/appends/meta-gnome/*.bbappend \
     \

raspi-image-test-and-setup

@@ -0,0 +1,66 @@
+Setup new image:
+
+* BACKUP CURRENT HOME
+* REMOVE NETWORK PLUG
+
+* 1st login xfce
+* copy this file to /home/morona / open with gedit / setup colour theme
+
+As root:
+* systemctl disable serial-getty@ttyS0
+* systemctl disable serial-getty@ttyAMA0
+* systemctl enable dbus-broker.service
+* systemctl --global enable dbus-broker.service
+* create /home/<user>/.asoundrc with (soundcards can be sndrpihifiberry/audioinjectorpi...)
+    pcm.!default {
+        type hw
+        card sndrpihifiberry
+    }
+    ctl.!default {
+        type hw
+        card sndrpihifiberry
+    }
+* audioinjector: enable mixer control "Output Mixer HiFi"
+* passwd
+
+As user:
+* passwd
+* check session autostart (evt. disable blueman/baloo/tracker/scrensaver..)
+* datetime: timezone
+* optionally for a tiny better performance: reduce screen resolution (yes really tested: 1280x1024 / 1280x720 are fine)
+* check /var/log/postinstall.log
+* restart
+* network plug
+* check journalctl output
+* check systemd-analyze: Can be 8-9s
+* glmark2-es2: On Pi3 (no B+) ~145 / On Pi 4 ~269
+* chromium unselect 'Allow Chromium-sign-in / add ad-blocker / check youtube music-video
+* libreoffice: open documents to set libreoffice default
+* jack setup
+* qtractor midiimport / open reference-project and check all instruments
+* ardour5/6
+* qmmp/projectm
+* mixxx
+* vlc
+* supercollider
+* krita/kdenlive/kalzium
+* set-up git (.gitconfig) / ssh-keygen -> github
+* qt-creator 
+    standard build directory:
+      /home/morona/tmp/qtbuilds/build-%{CurrentProject:Name}-%{CurrentKit:FileSystemName}-%{CurrentBuild:Name}
+    help/about plugins
+      disable ClangCodeModel
+    kit/compiler:
+      set gcc explicitly - clang causes trouble on qml-register functions
+    kit/cmake:
+      CMAKE_INSTALL_PREFIX:STRING=/home/morona/tmp/qtinstalls/usr
+      CMAKE_PREFIX_PATH:STRING=/home/morona/tmp/qtinstalls/usr;%{Qt:QT_INSTALL_PREFIX}
+      OE_QMAKE_PATH_EXTERNAL_HOST_BINS:STRING=/usr/bin
+* clone avr projects & build them
+* kicad: open example / check 3d preview
+* mame: set video opengl / test some ROMs
+* vice: select cairo
+* dosbox / dosbox-x / stella
+* supertux(kart??)
+* open all gnome- / all kde-plasma- / lxqt- / liri- / lumina-sessions
+

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/desktop/icons.screen0-1213x1008.rc

@@ -1,11 +0,0 @@
-[xfdesktop-version-4.10.3+-rcfile_format]
-4.10.3+=true
-
-[BB09-AB56]
-row=1
-col=0
-
-[4C9E-146F]
-row=0
-col=0
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/cpufreq-11.rc

@@ -1,10 +1,12 @@
 timeout=1
-show_cpu=0
+show_cpu=-3
 show_icon=false
 show_label_freq=true
 show_label_governor=true
 show_warning=true
 keep_compact=false
 one_line=false
-fontname=Sans 8
+fontname=Sans 7
+icon_color_freq=false
+freq_unit=0
 

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/cpugraph-1.rc

@@ -10,8 +10,6 @@ Command=xfce4-taskmanager
 InTerminal=0
 StartupNotification=1
 ColorMode=0
-Foreground1=#0000ffff0000
+Background=rgb(0,0,0)
-Foreground2=#ffff00000000
+PerCore=0
-Foreground3=#00000000ffff
-Background=#333339393b3b
 

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/systemload-12.rc

@@ -1,28 +0,0 @@
-[Main]
-Timeout=500
-Timeout_Seconds=1
-Use_Timeout_Seconds=false
-Use_Click_Command=false
-Click_Command=xfce4-taskmanager
-
-[SL_Cpu]
-Enabled=false
-Use_Label=true
-Color=rgb(0,0,192)
-Text=cpu
-
-[SL_Mem]
-Enabled=true
-Use_Label=false
-Color=rgb(0,192,0)
-Text=mem
-
-[SL_Swap]
-Enabled=false
-Use_Label=true
-Color=rgb(240,240,0)
-Text=swap
-
-[SL_Uptime]
-Enabled=false
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/whiskermenu-3.rc

@@ -1,4 +1,4 @@
-favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-web-browser.desktop,qjackctl.desktop,ardour5.desktop,lmms.desktop,muse.desktop,qtractor.desktop,rosegarden.desktop,mixxx.desktop,cgenie.desktop,vice_64.desktop
+favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-web-browser.desktop,qjackctl.desktop,ardour5.desktop,ardour6.desktop,lmms.desktop,muse.desktop,qtractor.desktop,rosegarden.desktop,mixxx.desktop,cgenie.desktop,vice_64.desktop
 recent=
 button-title=Anwendungen
 button-icon=xfce4-whiskermenu
@@ -15,7 +15,6 @@ category-icon-size=1
 load-hierarchy=false
 recent-items-max=10
 favorites-in-recent=true
-display-recent-default=false
 position-search-alternate=false
 position-commands-alternate=false
 position-categories-alternate=false

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/xfce4-sensors-plugin-7.rc

@@ -4,6 +4,7 @@ Show_Labels=false
 str_fontsize=small
 val_fontsize=1
 Font=Sans 11
+Update_Interval=1
 Show_Units=true
 Small_Spacings=false
 Command_Name=xfce4-sensors

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/xkb-plugin-7.rc

@@ -1,4 +0,0 @@
-display_type=0
-display_textsize=2
-group_policy=0
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/terminal/terminalrc

@@ -1,23 +1,8 @@
 [Configuration]
-ColorForeground=#ffffffffffff
-ColorBackground=#000000000000
-ColorCursor=#a0a0a0a0a0a0
-FontName=Monospace 10
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBordersDefault=TRUE
-MiscCursorBlinks=FALSE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=80x24
-MiscInheritGeometry=FALSE
 MiscMenubarDefault=FALSE
-MiscMouseAutohide=FALSE
+MiscToolbarDefault=FALSE
-MiscToolbarDefault=TRUE
+MiscConfirmClose=FALSE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
 ScrollingLines=1000000
+ScrollingOnOutput=FALSE
+ColorPalette=rgb(0,0,0);rgb(252,30,30);rgb(132,237,32);rgb(236,202,50);rgb(48,70,252);rgb(198,60,221);rgb(6,152,154);rgb(211,215,207);rgb(85,87,83);rgb(252,96,96);rgb(161,246,79);rgb(247,232,114);rgb(99,131,254);rgb(211,167,206);rgb(80,252,252);rgb(238,238,236)
 

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml

@@ -4,14 +4,14 @@
   <property name="default-view" type="string" value="void"/>
   <property name="last-compact-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_SMALLEST"/>
   <property name="last-details-view-column-order" type="string" value="THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE,THUNAR_COLUMN_DATE_MODIFIED"/>
-  <property name="last-details-view-column-widths" type="string" value="50,155,50,50,492,50,50,83,181"/>
+  <property name="last-details-view-column-widths" type="string" value="50,142,50,50,254,50,50,80,181,139"/>
   <property name="last-details-view-fixed-columns" type="bool" value="false"/>
   <property name="last-details-view-visible-columns" type="string" value="THUNAR_COLUMN_DATE_MODIFIED,THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE"/>
-  <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_SMALL"/>
+  <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_50_PERCENT"/>
   <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_NORMAL"/>
   <property name="last-location-bar" type="string" value="ThunarLocationEntry"/>
-  <property name="last-separator-position" type="int" value="303"/>
+  <property name="last-separator-position" type="int" value="232"/>
-  <property name="last-show-hidden" type="bool" value="false"/>
+  <property name="last-show-hidden" type="bool" value="true"/>
   <property name="last-side-pane" type="string" value="ThunarShortcutsPane"/>
   <property name="last-sort-column" type="string" value="THUNAR_COLUMN_NAME"/>
   <property name="last-sort-order" type="string" value="GTK_SORT_ASCENDING"/>

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

@@ -14,7 +14,6 @@
         <value type="int" value="15"/>
         <value type="int" value="8"/>
         <value type="int" value="5"/>
-        <value type="int" value="9"/>
         <value type="int" value="13"/>
         <value type="int" value="6"/>
         <value type="int" value="10"/>
@@ -53,19 +52,17 @@
       <property name="show-frame" type="bool" value="false"/>
       <property name="size-max" type="uint" value="40"/>
       <property name="square-icons" type="bool" value="false"/>
+      <property name="icon-size" type="int" value="32"/>
     </property>
     <property name="plugin-8" type="string" value="closebutton">
       <property name="theme" type="string" value="Default"/>
     </property>
-    <property name="plugin-9" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
     <property name="plugin-10" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
     </property>
     <property name="plugin-13" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
+      <property name="expand" type="bool" value="true"/>
     </property>
     <property name="plugin-2" type="string" value="clock">
       <property name="mode" type="uint" value="0"/>
@@ -85,7 +82,24 @@
     <property name="plugin-3" type="string" value="whiskermenu"/>
     <property name="plugin-1" type="string" value="cpugraph"/>
     <property name="plugin-11" type="string" value="cpufreq"/>
-    <property name="plugin-12" type="string" value="systemload"/>
+    <property name="plugin-12" type="string" value="systemload">
+      <property name="cpu" type="empty">
+        <property name="enabled" type="bool" value="false"/>
+      </property>
+      <property name="memory" type="empty">
+        <property name="label" type="string" value=""/>
+      </property>
+      <property name="swap" type="empty">
+        <property name="enabled" type="bool" value="false"/>
+      </property>
+      <property name="uptime" type="empty">
+        <property name="enabled" type="bool" value="false"/>
+      </property>
+      <property name="network" type="empty">
+        <property name="enabled" type="bool" value="true"/>
+        <property name="label" type="string" value=""/>
+      </property>
+    </property>
     <property name="plugin-7" type="string" value="xfce4-sensors-plugin"/>
   </property>
 </channel>

recipes-defaultconfig/users/group-wheel.bb

@@ -0,0 +1,11 @@
+SUMMARY = "Create usergroup wheel for sudo"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+inherit useradd
+
+USERADD_PACKAGES = "${PN}"
+#USERADD_PARAM = ""
+GROUPADD_PARAM_${PN} = "--system wheel"
+
+ALLOW_EMPTY_${PN} = "1"

recipes-defaultconfig/users/unpriv-user_1.2.bb

@@ -6,12 +6,13 @@ inherit useradd user-with-full-skel
 
 USERNAME = "morona"
 # groups user shall be member of (NO WHITESPACES ALLOWED)
-USERGROUPS = "audio,video,${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'datetime,network,', '', d)}systemd-journal"
+USERGROUPS = "audio,video,dialout,wheel,${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'datetime,network,', '', d)}systemd-journal"
 
 # all those we are member of
 USER_DEPS ?= " \
     systemd \
     \
+    group-wheel \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'polkit-group-rule-datetime polkit-group-rule-network', '', d)} \
 "
 

recipes-image/allgui/allgui-dev-image.bb

@@ -5,7 +5,6 @@ export IMAGE_BASENAME = "allgui-dev-image"
 IMAGE_INSTALL += " \
     packagegroup-gui-dev \
     \
-    exo-csource \
     xfce4-dev-tools \
     libxfce4ui-glade \
 "

recipes-image/console/console-base-image.bb

@@ -12,11 +12,20 @@ IMAGE_INSTALL += " \
     systemd-bash-completion \
     systemd-analyze \
     cpufrequtils \
+    findutils \
     htop \
     util-linux-lsblk \
     nano \
+    rsync \
+    wget \
+    dbus-broker \
+    sudo \
+    ${LIBC_SPECIFIC_PACKS} \
 "
 
+LIBC_SPECIFIC_PACKS = ""
+LIBC_SPECIFIC_PACKS_libc-glibc = "glibc-gconv glibc-gconvs glibc-utils"
+
 IMAGE_DEV_MANAGER   = "udev"
 IMAGE_INIT_MANAGER  = "systemd"
 IMAGE_INITSCRIPTS   = " "

recipes-image/include/x11-base.inc

@@ -4,7 +4,6 @@ X11_BASE_INSTALL += " \
     ${DISTRO_GUI_USER} \
     packagegroup-core-x11-xserver \
     \
-    dbus \
     iso-codes \
     mime-support \
     xauth \

recipes-image/packagegroups/packagegroup-gui-dev.bb

@@ -5,47 +5,53 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 inherit packagegroup
 
 RDEPENDS_${PN} = " \
-    qt5-creator \
+    qt5-creator qtwebengine-dev \
     qtquickcontrols2-examples qtwayland-examples \
     hexedit \
     glade \
     umbrello \
     lokalize \
     geany-plugins \
-    gtk-demo gtk+3-demo \
+    gtk+3-demo \
     \
     weston weston-xwayland  \
     \
     unzip xz tar bzip2 \
-    make cmake meson \
+    make cmake extra-cmake-modules meson \
     automake autoconf libtool m4 \
-    gcc-symlinks g++-symlinks cpp-symlinks \
+    gcc-symlinks g++-symlinks cpp-symlinks libgomp-dev \
     dtc \
-    pkgconfig binutils-symlinks elfutils gnu-config \
+    pkgconfig binutils-symlinks elfutils gnu-config util-linux \
     gdb gdbserver \
-    git git-bash-completion subversion \
+    valgrind \
-    python python-shell python-subprocess \
+    git git-bash-completion git-perltools subversion \
-    python3 \
+    python3-core \
     perl php vala lua php json-glib \
     texinfo gettext \
-    patch quilt ncurses dialog \
+    patch quilt ncurses dialog kdialog \
     man man-pages \
     gawk \
     chrpath \
     nodejs nodejs-npm nodejs-systemtap \
     \
+    ruby ruby-dev \
+    \
+    libeigen-dev \
+    \
     wireshark \
     nfs-utils-client \
     lmsensors-sensord lmsensors-sensorsdetect \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    pulseview qtiohelper minicom i2c-tools \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-microcontroller', 'packagegroup-avr', '', d)} \
+    python3-pyserial python3-smbus python3-smbus2 python3-spidev \
+    \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-microcontroller', 'meta-microcontroller-world', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'rubygems', 'rubygems-jekyll', '', d)} \
 "
 
-RDEPENDS_${PN}_append_libc-glibc = " \
+RDEPENDS_${PN}_append_rpi = "rpi-gpio"
-    glibc-utils \
-"
 
 #    qemu
-#    valgrind
+#    
 

recipes-image/packagegroups/packagegroup-gui-full.bb

@@ -12,6 +12,8 @@ RDEPENDS_${PN} = " \
     source-han-sans-kr-fonts \
     source-han-sans-jp-fonts \
     source-han-sans-tw-fonts \
+    ttf-noto-emoji-color \
+    ttf-noto-emoji-regular \
     \
     tzdata-misc tzdata-africa \
     tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
@@ -22,8 +24,10 @@ RDEPENDS_${PN} = " \
     menulibre \
     \
     gparted \
+    gnome-disk-utility \
     \
     mpd \
+    mpv \
     vlc \
     parole gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-omx gstreamer1.0-libav \
     gstreamer1.0-plugins-base-meta gstreamer1.0-plugins-good-meta \
@@ -34,23 +38,22 @@ RDEPENDS_${PN} = " \
     \
     ${MACHINE_SPECIFICS_FULL} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox cass80 z80 vice stella opentyrian d1x-rebirth', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'meta-retro-world', '', d)} \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice abiword-meta', '', d)} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertuxkart supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom scummvm', '', d)} \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-musicians', 'packagegroup-gui-musicians', '', d)} \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'sdr-layer', 'packagegroup-sdr-python-extended packagegroup-sdr-gnuradio-base packagegroup-sdr-gnuradio-extended packagegroup-sdr-rtlsdr packagegroup-sdr-uhd', '', d)} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'gottcode-world kde-apps-world qmlarkdown', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'gottcode-world kde-apps-world qmlarkdown quaternion spectral scribus', '', d)} \
 "
 
 #    firefox 
 #    gursormaker
 #    kodi 
-#    mpv 
 

recipes-image/packagegroups/packagegroup-gui-games.bb

@@ -7,11 +7,9 @@ inherit packagegroup
 # Those listed here are either ugly or nonworking
 RDEPENDS_${PN} = " \
     atanks \
-    scummvm \
     etr \
     gnome-chess \
     gnome-robots \
-    supertuxkart \
     \
     gnome-games \
     mog \

recipes-image/xfce4/xfce4-dev-image.bb

@@ -7,7 +7,6 @@ export IMAGE_BASENAME = "xfce4-dev-image"
 IMAGE_INSTALL += " \
     packagegroup-gui-dev \
     \
-    exo-csource \
     xfce4-dev-tools \
     libxfce4ui-glade \
 "

recipes-image/xfce4/xfce4-music-dev-image.bb

@@ -0,0 +1,30 @@
+require xfce4-music-image.bb
+
+export IMAGE_BASENAME = "xfce4-music-dev-image"
+
+XFCE_DM = "sddm sddm-morona-autologin"
+
+IMAGE_INSTALL += " \
+    packagegroup-gui-dev \
+    \
+    xfce4-dev-tools \
+    libxfce4ui-glade \
+    \
+    packagegroup-gui-musicians \
+    \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
+    \
+    jack-dev \
+    lv2-dev \
+    libvorbis-dev \
+    aubio-dev \
+    libmad-dev \
+    libsamplerate0-dev \
+    rubberband-dev \
+    liblo-dev \
+    lilv-dev \
+    suil-dev \
+    serd-dev \
+    sord-dev \
+"

recipes-image/xfce4/xfce4-music-image.bb

@@ -8,5 +8,5 @@ IMAGE_INSTALL += " \
     packagegroup-gui-musicians \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
 "

recipes-utils/udev-udisks/udev-rules-udisks-hide-bootpart_1.0.bb

@@ -12,7 +12,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # Feel free to add more...
 
 BOOTPARTSPEC = "boot,vfat BOOT,vfat"
-BOOTPARTSPEC_rpi = "raspberrypi,vfat"
+# Both raspi layers thip theit own rule
+BOOTPARTSPEC_rpi = ""
 
 do_install () {
 	install -d ${D}${nonarch_base_libdir}/udev/rules.d

scripts/include/card-helpers.inc

@@ -104,7 +104,13 @@ SelectDeployedFile() {
         if [ -z "$_TMPDIR" ]; then
             ErrorOut "Bitbake environment variable TMPDIR not found!"
         fi
-        for FilePath in `find ${_TMPDIR}/deploy/images/${Machine} $FindString | sort` ; do
+        DeployPath=${_TMPDIR}/deploy/images/${Machine}
+        if [ ! -e ${DeployPath} ]; then
+            echo "${style_yellow}${style_bold}DeployPath: ${DeployPath}${style_normal}"
+            ErrorOut "Deploy path for ${Machine} not found! Wrong script started?"
+        fi
+        
+        for FilePath in `find ${DeployPath} $FindString | sort` ; do
             iCount=`expr $iCount + 1`
             RootFileNameArr[${iCount}]="$FilePath"
             FileSize=`du -Dh "$FilePath" | cut -f1`