mortsgna.conf: Do not make native-last warnings fatal

It can break devtool Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Revert "packagegroup-gui-dev/packagegroup-gui-full: Add chromium-ozone-wayland"
2022-01-09 21:53:49 +01:00 · 2022-01-04 20:20:33 +01:00 · 2022-01-04 16:09:25 +01:00 · 2022-01-04 16:08:54 +01:00 · 2022-01-03 19:55:55 +01:00 · 2022-01-02 21:00:08 +01:00
105 changed files with 576 additions and 379 deletions
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ It has its origin Ångström distribution  - check https://github.com/Angstrom-d
  * All images for console / kde / lxqt / xfce ar found. allgui-images build
    images for all graphical environments.

-[recipes-utlis](recipes-utlis):
+[recipes-utils](recipes-utils):
  * udev-rules-udisks-hide-bootpart: Hide boot partition from udisks
  * Some tools (these are the only left from angstrom). Honestly: Have never
    used them but kept them if users come from angstrom and might miss
@@ -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)


 -----------
--- a/3
+++ b/3
@@ -1,8 +1,5 @@
 These are tasks are planned:

-OE:
-* Introduce security_flags.inc
-
 Scripts:
 * get rid of bashisms
 * dialog -> ncurses?
--- a/appends/meta-browser/chromium-ozone-wayland_%.bbappend
+++ b/appends/meta-browser/chromium-ozone-wayland_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " use-egl impl-side-painting proprietary-codecs"
+PACKAGECONFIG = "proprietary-codecs"
--- a/appends/meta-browser/chromium-x11_%.bbappend
+++ b/appends/meta-browser/chromium-x11_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " use-egl impl-side-painting proprietary-codecs"
+PACKAGECONFIG = "proprietary-codecs"
--- a/appends/meta-gnome/devilspie2/default.lua
+++ b/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()
--- a/appends/meta-gnome/devilspie2_%.bbappend
+++ b/appends/meta-gnome/devilspie2_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
--- a/appends/meta-gnome/gvfs_%.bbappend
+++ b/appends/meta-gnome/gvfs_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " archive gcr libmtp libgphoto2 samba systemd"
+PACKAGECONFIG:append = " archive gcr libmtp libgphoto2 samba systemd"
--- a/appends/meta-multimedia/fluidsynth_%.bbappend
+++ b/appends/meta-multimedia/fluidsynth_%.bbappend
@@ -1,6 +1,6 @@
 PACKAGECONFIG ?= " \
-    sndfile \
    jack \
-    pulseaudio \
    portaudio \
+    readline \
+    sndfile \
 "
--- a/appends/meta-networking/dnsmasq_%.bbappend
+++ b/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"
--- a/appends/meta-networking/networkmanager-openvpn_%.bbappend
+++ b/appends/meta-networking/networkmanager-openvpn_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:append = " gnome"
--- a/appends/meta-oe/lxdm_%.bbappend
+++ b/appends/meta-oe/lxdm_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
    # Since we
    # * do not have angstroms's DISTRO_TYPE
    # * do not want to set all debug-tweaks
--- a/appends/meta-oe/nodejs_%.bbappend
+++ b/appends/meta-oe/nodejs_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:append = " shared"
--- a/appends/meta-oe/udisks2_%.bbappend
+++ b/appends/meta-oe/udisks2_%.bbappend
@@ -1 +1 @@
-RRECOMMENDS_${PN} += "udev-rules-udisks-hide-bootpart"
+RRECOMMENDS:${PN} += "udev-rules-udisks-hide-bootpart"
--- a/appends/meta-oe/udisks_%.bbappend
+++ b/appends/meta-oe/udisks_%.bbappend
@@ -1 +0,0 @@
-RRECOMMENDS_${PN} += "udev-rules-udisks-hide-bootpart"
--- a/appends/meta-qt5/qtbase-native_%.bbappend
+++ b/appends/meta-qt5/qtbase-native_%.bbappend
@@ -1 +1,3 @@
 inherit instant-sysroot-native
+
+INSANE_SKIP += "native-last"
--- a/appends/meta-qt5/qtbase_%.bbappend
+++ b/appends/meta-qt5/qtbase_%.bbappend
@@ -7,7 +7,12 @@ PACKAGECONFIG_DISTRO += " \

 inherit instant-paths

-do_copy_to_target_sysroot_append() {
+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
    generate_qt_config_file_paths
--- a/appends/meta-qt5/qtquickcontrols2_%.bbappend
+++ b/appends/meta-qt5/qtquickcontrols2_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " examples"
+PACKAGECONFIG:append = " examples"
--- a/appends/meta-qt5/qtwayland_%.bbappend
+++ b/appends/meta-qt5/qtwayland_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " examples"
+PACKAGECONFIG:append = " examples"
--- a/appends/meta-qt5/vlc_%.bbappend
+++ b/appends/meta-qt5/vlc_%.bbappend
@@ -1,3 +1,3 @@
 # VLC is not part of meta-qt5. We add append here so the append will work only
 # in case meta-qt5 is in layers
-PACKAGECONFIG_append = " qt5"
+PACKAGECONFIG:append = " qt5"
--- a/appends/meta-xfce/libxfce4ui_%.bbappend
+++ b/appends/meta-xfce/libxfce4ui_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " startup-notification gladeui"
+PACKAGECONFIG:append = " startup-notification gladeui2"
--- a/appends/meta-xfce/packagegroup-xfce-extended.bbappend
+++ b/appends/meta-xfce/packagegroup-xfce-extended.bbappend
@@ -0,0 +1,3 @@
+RRECOMMENDS:${PN} += " \
+    imsettings \
+"
--- a/appends/meta-xfce/thunar-volman_%.bbappend
+++ b/appends/meta-xfce/thunar-volman_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " notify"
+PACKAGECONFIG:append = " notify"
--- a/appends/meta-xfce/xfce4-settings_%.bbappend
+++ b/appends/meta-xfce/xfce4-settings_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " datetime-setter sound-setter notify"
+PACKAGECONFIG:append = " sound-setter notify"
--- a/appends/oe-core/base-files/profile
+++ b/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 ll='ls $LS_OPTIONS -l'
+alias l.='ls -d .* --color=auto'
+alias ll='ls -l --color=auto'
+alias ls='ls --color=auto'

 # colorize all grep variants
 alias grep='grep --color'
--- a/appends/oe-core/base-files_%.bbappend
+++ b/appends/oe-core/base-files_%.bbappend
@@ -1,10 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+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
--- a/appends/oe-core/base-passwd_%.bbappend
+++ b/appends/oe-core/base-passwd_%.bbappend
@@ -1,3 +1,3 @@
-do_install_append() {
+do_install:append() {
    sed -i 's|root::0:0:root:/home/root:/bin/sh|root::0:0:root:/home/root:/bin/bash|' ${D}${datadir}/${BPN}/passwd.master
 }
--- a/appends/oe-core/cairo_%.bbappend
+++ b/appends/oe-core/cairo_%.bbappend
@@ -1,5 +1,5 @@
 # It is time I do suggest common / global PREFERRED_OPENGL variable

-PACKAGECONFIG_remove_class-target = "opengl"
+PACKAGECONFIG:remove:class-target = "opengl"

-PACKAGECONFIG_append_class-target = " egl glesv2"
+PACKAGECONFIG:append:class-target = " egl glesv2"
--- a/appends/oe-core/cmake-native%.bbappend
+++ b/appends/oe-core/cmake-native%.bbappend
@@ -1 +1,3 @@
 inherit instant-sysroot-native
+
+INSANE_SKIP += "native-last"
--- a/appends/oe-core/enchant2_%.bbappend
+++ b/appends/oe-core/enchant2_%.bbappend
@@ -0,0 +1,3 @@
+PACKAGECONFIG = "hunspell"
+
+RRECOMMENDS:${PN} += "hunspell-dictionaries"
--- a/appends/oe-core/gstreamer1.0-plugins-bad_%.bbappend
+++ b/appends/oe-core/gstreamer1.0-plugins-bad_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG_append = " \
+PACKAGECONFIG:append = " \
    hls \
    libmms \
    faad \
--- a/appends/oe-core/gstreamer1.0-plugins-ugly_%.bbappend
+++ b/appends/oe-core/gstreamer1.0-plugins-ugly_%.bbappend
@@ -1,3 +1,3 @@
-PACKAGECONFIG_append = " \
+PACKAGECONFIG:append = " \
    x264 \
 "
--- a/appends/oe-core/libsdl2_%.bbappend
+++ b/appends/oe-core/libsdl2_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_class-target = " jack"
+PACKAGECONFIG:append:class-target = " jack"
--- a/appends/oe-core/libsoup-2.4_%.bbappend
+++ b/appends/oe-core/libsoup-2.4_%.bbappend
@@ -1 +0,0 @@
-PACKAGECONFIG_append = " gnome"
--- a/appends/oe-core/linux%.bbappend
+++ b/appends/oe-core/linux%.bbappend
@@ -1,4 +1,4 @@
-kernel_do_deploy_append() {
+kernel_do_deploy:append() {
    # deploy an extra link containing abiversion - used by our
    # card-kernel-write scripts
    for imageType in ${KERNEL_IMAGETYPES} ; do
--- a/appends/oe-core/packagegroup-core-x11-xserver%.bbappend
+++ b/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"
--- a/appends/oe-core/pulseaudio_%.bbappend
+++ b/appends/oe-core/pulseaudio_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " jack"
+PACKAGECONFIG:append = " jack"
--- a/appends/oe-core/readline_%.bbappend
+++ b/appends/oe-core/readline_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

 SRC_URI += "file://inputrc"

 # Get more out of our console
-do_install_append() {
+do_install:append() {
 	cp ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
 }
--- a/appends/oe-core/sudo_%.bbappend
+++ b/appends/oe-core/sudo_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:append = " pam-wheel"
--- a/appends/oe-core/weston%.bbappend
+++ b/appends/oe-core/weston%.bbappend
@@ -0,0 +1,2 @@
+# A root session without password activated by just two keys - honestly..
+RRECOMMENDS:${PN}:remove = "weston-init"
--- a/classes/instant-sysroot-native.bbclass
+++ b/classes/instant-sysroot-native.bbclass
@@ -8,18 +8,18 @@ inherit utils instant-paths

 do_prepare_recipe_sysroot[postfuncs] += "${INSTANTSYSROOTFUNC}"
 INSTANTSYSROOTFUNC = ""
-INSTANTSYSROOTFUNC_class-native = "instant_sysroot_copy"
-INSTANTSYSROOTFUNC_class-cross = "instant_sysroot_copy"
+INSTANTSYSROOTFUNC:class-native = "instant_sysroot_copy"
+INSTANTSYSROOTFUNC:class-cross = "instant_sysroot_copy"

 instant_sysroot_copy () {
    mkdir -p ${INSTANT_NATIVE_PATH}
    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"
+INSTANTPOPULATE:class-native = "instant_populate_sysroot"
+INSTANTPOPULATE:class-cross = "instant_populate_sysroot"

 instant_populate_sysroot () {
    find "${SYSROOT_DESTDIR}${STAGING_DIR_NATIVE}" -type f -o -type l | while read file; do
--- a/classes/instant-sysroot-target.bbclass
+++ b/classes/instant-sysroot-target.bbclass
@@ -38,10 +38,10 @@
 #   4. Set sysroot (see INSTANT_TARGET_PATH in instant-path.bbclass):
 #      ${TMPDIR}/sysroot-instant-target-${MACHINE_ARCH}
 #   5. Select compilers (it is not necessary for debug but without QTCreator won't enable Kit) for C and C++ e.g:
-#      C:   '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gcc'
-#      C++: '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-g++'
+#      C:   '${TMPDIR}/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gcc'
+#      C++: '${TMPDIR}/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-g++'
 #   6. Select debugger e.g:
-#      GDB: '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gdb'
+#      GDB: '${TMPDIR}/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gdb'
 #   7. To avoid qtcreator stopping on certain signals Select 'Debugger' in left list and in
 #      * 'GDB'-tab unselect 'Show a message box when reciving a signal'
 #      * 'Locals & Expressions' add in 'Debugging Helper Customization' lines as
@@ -49,7 +49,7 @@
 #         running int breaks
 #   8. Select 'OK' in Options dialog -> 'Start Debugger' should be back on top
 # * Make sure 'OE' Kit is selected
-# * Browse for executable e.g '<TMDIR>/sysroot-instant-target/usr/bin/thunar'
+# * Browse for executable e.g '${TMPDIR}/sysroot-instant-target-${MACHINE_ARCH}/usr/bin/thunar'
 # * Set IP:Port of target machine e.g '192.168.2.108:5000'
 # * Select 'OK'
 #
@@ -173,10 +173,7 @@ do_copy_to_target_sysroot() {
    fi
 }

-addtask copy_to_target_sysroot after do_package before do_build
-
-# same as do package
-do_copy_to_target_sysroot[vardeps] = "${PACKAGEBUILDPKGD} ${PACKAGESPLITFUNCS} ${PACKAGEFUNCS} ${@gen_packagevar(d)}"
+addtask copy_to_target_sysroot after do_package_write_deb do_package_write_ipk do_package_write_rpm do_package_write_tar

 do_copy_to_target_sysroot[stamp-extra-info] = "${MACHINE_ARCH}"

--- a/classes/instant-toolchain-target.bbclass
+++ b/classes/instant-toolchain-target.bbclass
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

 do_compile[postfuncs] += "${COMPILE_POST_TARGET}"
 COMPILE_POST_TARGET = ""
-COMPILE_POST_TARGET_class-target = "instant_compile_target"
+COMPILE_POST_TARGET:class-target = "instant_compile_target"

 INSTANTPOPULATE_TOOLCHAIN_VARS = " \
    CC \
--- a/classes/user-with-full-skel.bbclass
+++ b/classes/user-with-full-skel.bbclass
@@ -15,7 +15,7 @@
 SKEL_INIT_MARKER = "force-skel-full-init"

 # user recipe part
-pkg_postinst_${PN}_prepend() {
+pkg_postinst:${PN}:prepend() {
    if [ -n "$D" -a -n "${USERNAME}" ]; then
        touch $D/home/${USERNAME}/${SKEL_INIT_MARKER}
    fi
--- a/conf/distro/include/mortsgna-armv7-tune.inc
+++ b/conf/distro/include/mortsgna-armv7-tune.inc
@@ -4,7 +4,11 @@ def armv7_tune_handler(d):
    # to common tune value
    if d.getVar('MORTSGNA_ARMV7_TUNE') == '1':
        features = d.getVar('TUNE_FEATURES').split()
-        if 'armv7a' in features or 'armv7ve' in features:
+        if 'armv7a' in features or \
+           'armv7ve' in features or \
+           'cortexa7' in features or \
+           'cortexa8' in features or \
+           'cortexa9' in features:
            tune = 'armv7athf'
            if 'bigendian' in features:
                tune += 'b'
@@ -12,6 +16,5 @@ def armv7_tune_handler(d):
                tune += '-neon'
        else:
            tune = d.getVar('DEFAULTTUNE')
-
    return tune

--- a/conf/distro/include/mortsgna-distro-features.inc
+++ b/conf/distro/include/mortsgna-distro-features.inc
@@ -29,30 +29,34 @@ DISTRO_FEATURES = " \
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 # Uncomment to completely disable support for sysv scripts:
-#PACKAGECONFIG_pn-systemd = "xz"
+#PACKAGECONFIG:pn-systemd = "xz"

 # USE-flag like features
 DISTRO_FEATURES += "tk"
 DISTRO_FEATURES += "x11"
-DISTRO_FEATURES += "3g"
 DISTRO_FEATURES += "pulseaudio"
 DISTRO_FEATURES += "ldconfig"
 DISTRO_FEATURES += "polkit"
+DISTRO_FEATURES += "helpfiles"

 # OpenGL support
 DISTRO_FEATURES += "opengl"

 # wayland...
 DISTRO_WAYLAND = "wayland"
-
 # No wayland for vivante blobs
-DISTRO_WAYLAND_mx6 = ""
-DISTRO_WAYLAND_mx7 = ""
-DISTRO_WAYLAND_mx8 = ""
-DISTRO_WAYLAND_use-mainline-bsp = "wayland"
-
+DISTRO_WAYLAND:mx6 = ""
+DISTRO_WAYLAND:mx7 = ""
+DISTRO_WAYLAND:mx8 = ""
+DISTRO_WAYLAND:use-mainline-bsp = "wayland"
 DISTRO_FEATURES += "${DISTRO_WAYLAND}"

-# Inherit the default LIBC features superset from OE-core
-DISTRO_FEATURES += "${DISTRO_FEATURES_LIBC}"
+# vulkan
+DISTRO_VULKAN = ""
+DISTRO_VULKAN:raspberrypi4 = "vulkan"
+DISTRO_VULKAN:raspberrypi4-64 = "vulkan"
+DISTRO_FEATURES += "${DISTRO_VULKAN}"
+
+# Uncomment for tests on gold-trouble only
+#DISTRO_FEATURES += 'ld-is-gold'

--- a/conf/distro/include/mortsgna-libc-musl.inc
+++ b/conf/distro/include/mortsgna-libc-musl.inc
@@ -4,6 +4,8 @@
 # libc settings
 DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION') == '1']}"

+DISTRO_FEATURES:remove = "ldconfig"
+
 USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
 USE_NLS_gcc-cross = "no"
--- a/conf/distro/include/mortsgna-preferred-providers.inc
+++ b/conf/distro/include/mortsgna-preferred-providers.inc
@@ -22,3 +22,13 @@ XSERVER ?= " \
    xf86-video-modesetting \
 "

+# Follow meta-java README:
+# Possible provider: cacao-initial-native and jamvm-initial-native
+PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
+
+# Possible provider: cacao-native and jamvm-native
+PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+
+# Optional since there is only one provider for now
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+
--- a/conf/distro/mortsgna.conf
+++ b/conf/distro/mortsgna.conf
@@ -10,7 +10,7 @@
 ###############################################################################

 # follow Yocto version scheme
-DISTRO_VERSION = "v2.7"
+DISTRO_VERSION = "v3.4"

 # 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
@@ -88,13 +88,13 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc

 # thumb2 only
 ARM_INSTRUCTION_SET ??= "thumb"
-ARM_INSTRUCTION_SET_armv4 ?= "arm"
-ARM_INSTRUCTION_SET_armv5 ?= "arm"
-ARM_INSTRUCTION_SET_armv6 ?= "arm"
+ARM_INSTRUCTION_SET:armv4 ?= "arm"
+ARM_INSTRUCTION_SET:armv5 ?= "arm"
+ARM_INSTRUCTION_SET:armv6 ?= "arm"

 # set MORTSGNA_ARMV7_TUNE="1" in your local.conf to build armv7athf
 require conf/distro/include/mortsgna-armv7-tune.inc
-DEFAULTTUNE_mortsgna := "${@armv7_tune_handler(d)}"
+DEFAULTTUNE:mortsgna := "${@armv7_tune_handler(d)}"


 ###############################################################################
@@ -111,35 +111,36 @@ MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY"
 ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"

 # qemu has taken a dislike to armeb as well
-ENABLE_BINARY_LOCALE_GENERATION_armeb = "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

-# QA check settings - a little stricter than the OE-Core / poky for two reasons
-# 1. They make sense
-# 2. Many poky users out there might complain about my other layers or patches
-#    sent
+# QA check settings - make all warnings errors
 WARN_TO_ERROR_QA = " \
-    already-stripped compile-host-path install-host-path \
-    installed-vs-shipped ldflags pn-overrides rpaths staticdev \
-    unknown-configure-option useless-rpaths host-user-contaminated \
-    invalid-packageconfig patch-fuzz \
+    libdir xorg-driver-abi \
+    textrel incompatible-license files-invalid \
+    infodir build-deps src-uri-bad symlink-to-sysroot multilib \
+    invalid-packageconfig host-user-contaminated uppercase-pn patch-fuzz \
+    mime mime-xdg unlisted-pkg-lics unhandled-features-check \
+    missing-update-alternatives missing-ptest \
+    license-exists license-no-generic license-syntax license-format \
+    license-incompatible license-file-missing \
 "
-WARN_QA_remove = "${WARN_TO_ERROR_QA}"
-ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
-
+WARN_QA:remove = "${WARN_TO_ERROR_QA}"
+ERROR_QA:append = " ${WARN_TO_ERROR_QA}"

 ###############################################################################
 # Image defaults
@@ -156,7 +157,7 @@ DISTRO_GUI_USER ?= "unpriv-user"
 # If you don't want parts of this in your packagegroup-base using images you can put this in the image recipe:
 # BAD_RECOMMENDATIONS = "<packages-to-remove>"
 # or
-# IMAGE_INSTALL_remove = "<packages-to-remove>"
+# IMAGE_INSTALL:remove = "<packages-to-remove>"
 #
 # os-release: Distro release info on target
 # kernel modules: ship fs modules so you can mount stuff and af-packet so networking works
@@ -193,6 +194,7 @@ EXTRA_IMAGE_FEATURES += " \
    empty-root-password \
    allow-empty-password \
    post-install-logging \
+    volatile-log \
 "

 # make x11-base a valid IMAGE_FEATURES
@@ -220,7 +222,7 @@ IMAGE_BOOT ?= "${IMAGE_INITSCRIPTS} \
 IMAGE_INSTALL += "${IMAGE_BOOT}"

 # some default locales
-IMAGE_LINGUAS_libc-glibc ?= "de-de fr-fr en-us en-gb es-es it-it"
+IMAGE_LINGUAS:libc-glibc ?= "de-de fr-fr en-us en-gb es-es it-it"

 # there are important missing I bet
 IMAGE_LINGUAS_FULL ?= " \
--- a/conf/layer.conf
+++ b/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 = "sumo thud warrior"
+LAYERSERIES_COMPAT_mortsgna-layer = "honister"

 # 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,9 +17,12 @@ 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 \
    \
+    networking-layer:${LAYERDIR}/appends/meta-networking/*.bbappend \
+    \
    multimedia-layer:${LAYERDIR}/appends/meta-multimedia/*.bbappend \
    \
    openembedded-layer:${LAYERDIR}/appends/meta-oe/*.bbappend \
--- a/qt5-sdk-recipes/qtcreator-sdk-prepare.bb
+++ b/qt5-sdk-recipes/qtcreator-sdk-prepare.bb
@@ -21,11 +21,11 @@ do_install() {
    cp $sourcepath/$qtconf $targetpath/
 }

-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"

 # An image installing this requires the following packages at least for working
 # instant sdk support
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
    qtbase \
    gdbserver \
    ${TASK_BASIC_SSHDAEMON} \
--- a/66
+++ b/66
@@ -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
+
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/gnome-shell-overrides-migration.desktop
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/gnome-shell-overrides-migration.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/imsettings-start.desktop
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/imsettings-start.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/org.gnome.Evolution-alarm-notify.desktop
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/org.gnome.Evolution-alarm-notify.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-extract.desktop
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-extract.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-miner-fs.desktop
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-miner-fs.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-store.desktop
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-store.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/xfce4-screensaver.desktop
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/xfce4-screensaver.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/desktop/icons.screen0-1213x1008.rc
+++ b/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
-
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/cpufreq-11.rc
+++ b/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

--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/cpugraph-1.rc
+++ b/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
-Foreground2=#ffff00000000
-Foreground3=#00000000ffff
-Background=#333339393b3b
+Background=rgb(0,0,0)
+PerCore=0

--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/systemload-12.rc
+++ b/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
-
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/whiskermenu-3.rc
+++ b/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
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/xfce4-sensors-plugin-7.rc
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/xfce4-sensors-plugin-7.rc
@@ -0,0 +1,23 @@
+[General]
+Show_Title=false
+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
+
+[Chip0]
+Name=ACPI
+Number=0
+
+[Chip0_Feature0]
+Address=0
+Name=thermal_zone0
+Color=#008000
+Show=true
+Min=0.00
+Max=70.00
+
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/xkb-plugin-7.rc
+++ b/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
-
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/terminal/terminalrc
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/terminal/terminalrc
@@ -1,29 +1,8 @@
 [Configuration]
-FontName=Monospace 9
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBellUrgent=FALSE
-MiscBordersDefault=TRUE
-MiscCursorBlinks=FALSE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=80x24
-MiscInheritGeometry=FALSE
 MiscMenubarDefault=FALSE
-MiscMouseAutohide=FALSE
-MiscMouseWheelZoom=TRUE
-MiscToolbarDefault=TRUE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
-MiscMiddleClickOpensUri=FALSE
-MiscCopyOnSelect=FALSE
-MiscDefaultWorkingDir=
-MiscRewrapOnResize=TRUE
-MiscUseShiftArrowsToScroll=FALSE
-MiscSlimTabs=FALSE
-ColorForeground=#000000000000
-ColorBackground=#fae0f4f1a311
+MiscToolbarDefault=FALSE
+MiscConfirmClose=FALSE
+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)

--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
+++ b/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-show-hidden" type="bool" value="false"/>
+  <property name="last-separator-position" type="int" value="232"/>
+  <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"/>
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -14,13 +14,13 @@
        <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"/>
        <value type="int" value="2"/>
        <value type="int" value="4"/>
        <value type="int" value="11"/>
+        <value type="int" value="7"/>
        <value type="int" value="12"/>
        <value type="int" value="1"/>
      </property>
@@ -52,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"/>
@@ -84,6 +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>
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
@@ -3,6 +3,6 @@
 <channel name="xfce4-settings-manager" version="1.0">
  <property name="last" type="empty">
    <property name="window-width" type="int" value="858"/>
-    <property name="window-height" type="int" value="661"/>
+    <property name="window-height" type="int" value="675"/>
  </property>
 </channel>
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -2,87 +2,12 @@

 <channel name="xfwm4" version="1.0">
  <property name="general" type="empty">
-    <property name="activate_action" type="string" value="bring"/>
-    <property name="borderless_maximize" type="bool" value="true"/>
-    <property name="box_move" type="bool" value="false"/>
-    <property name="box_resize" type="bool" value="false"/>
-    <property name="button_layout" type="string" value="O|SHMC"/>
-    <property name="button_offset" type="int" value="0"/>
-    <property name="button_spacing" type="int" value="0"/>
-    <property name="click_to_focus" type="bool" value="true"/>
-    <property name="focus_delay" type="int" value="250"/>
-    <property name="cycle_apps_only" type="bool" value="false"/>
-    <property name="cycle_draw_frame" type="bool" value="true"/>
-    <property name="cycle_hidden" type="bool" value="true"/>
-    <property name="cycle_minimum" type="bool" value="true"/>
-    <property name="cycle_workspaces" type="bool" value="false"/>
-    <property name="double_click_time" type="int" value="250"/>
-    <property name="double_click_distance" type="int" value="5"/>
-    <property name="double_click_action" type="string" value="maximize"/>
-    <property name="easy_click" type="string" value="Alt"/>
-    <property name="focus_hint" type="bool" value="true"/>
-    <property name="focus_new" type="bool" value="true"/>
-    <property name="frame_opacity" type="int" value="87"/>
-    <property name="full_width_title" type="bool" value="true"/>
-    <property name="inactive_opacity" type="int" value="87"/>
-    <property name="maximized_offset" type="int" value="0"/>
-    <property name="move_opacity" type="int" value="87"/>
-    <property name="placement_ratio" type="int" value="20"/>
-    <property name="placement_mode" type="string" value="center"/>
+    <property name="frame_opacity" type="int" value="90"/>
+    <property name="inactive_opacity" type="int" value="90"/>
+    <property name="move_opacity" type="int" value="90"/>
    <property name="popup_opacity" type="int" value="100"/>
-    <property name="mousewheel_rollup" type="bool" value="true"/>
-    <property name="prevent_focus_stealing" type="bool" value="false"/>
-    <property name="raise_delay" type="int" value="250"/>
-    <property name="raise_on_click" type="bool" value="true"/>
-    <property name="raise_on_focus" type="bool" value="false"/>
-    <property name="raise_with_any_button" type="bool" value="true"/>
-    <property name="repeat_urgent_blink" type="bool" value="false"/>
-    <property name="resize_opacity" type="int" value="87"/>
-    <property name="restore_on_move" type="bool" value="true"/>
-    <property name="scroll_workspaces" type="bool" value="true"/>
-    <property name="shadow_delta_height" type="int" value="0"/>
-    <property name="shadow_delta_width" type="int" value="0"/>
-    <property name="shadow_delta_x" type="int" value="0"/>
-    <property name="shadow_delta_y" type="int" value="-3"/>
-    <property name="shadow_opacity" type="int" value="50"/>
-    <property name="show_app_icon" type="bool" value="false"/>
-    <property name="show_dock_shadow" type="bool" value="true"/>
-    <property name="show_frame_shadow" type="bool" value="true"/>
-    <property name="show_popup_shadow" type="bool" value="false"/>
-    <property name="snap_resist" type="bool" value="false"/>
-    <property name="snap_to_border" type="bool" value="true"/>
-    <property name="snap_to_windows" type="bool" value="false"/>
-    <property name="snap_width" type="int" value="10"/>
-    <property name="theme" type="string" value="Default"/>
-    <property name="tile_on_move" type="bool" value="true"/>
-    <property name="title_alignment" type="string" value="center"/>
-    <property name="title_font" type="string" value="Sans Bold 9"/>
-    <property name="title_horizontal_offset" type="int" value="0"/>
-    <property name="title_shadow_active" type="string" value="false"/>
-    <property name="title_shadow_inactive" type="string" value="false"/>
-    <property name="title_vertical_offset_active" type="int" value="0"/>
-    <property name="title_vertical_offset_inactive" type="int" value="0"/>
-    <property name="toggle_workspaces" type="bool" value="false"/>
-    <property name="unredirect_overlays" type="bool" value="true"/>
-    <property name="urgent_blink" type="bool" value="false"/>
+    <property name="resize_opacity" type="int" value="90"/>
    <property name="use_compositing" type="bool" value="false"/>
    <property name="workspace_count" type="int" value="1"/>
-    <property name="workspace_names" type="array">
-      <value type="string" value="Arbeitsfläche 1"/>
-      <value type="string" value="Arbeitsfläche 2"/>
-      <value type="string" value="Arbeitsfläche 3"/>
-      <value type="string" value="Arbeitsfläche 4"/>
-    </property>
-    <property name="wrap_cycle" type="bool" value="true"/>
-    <property name="wrap_layout" type="bool" value="true"/>
-    <property name="wrap_resistance" type="int" value="10"/>
-    <property name="wrap_windows" type="bool" value="true"/>
-    <property name="wrap_workspaces" type="bool" value="false"/>
-    <property name="cycle_preview" type="bool" value="true"/>
-    <property name="cycle_tabwin_mode" type="int" value="0"/>
-    <property name="horiz_scroll_opacity" type="bool" value="false"/>
-    <property name="sync_to_vblank" type="bool" value="false"/>
-    <property name="titleless_maximize" type="bool" value="false"/>
-    <property name="zoom_desktop" type="bool" value="true"/>
  </property>
 </channel>
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config/.local/share/applications/mimeapps.list
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config/.local/share/applications/mimeapps.list
@@ -1,37 +0,0 @@
-[Default Applications]
-application/x-bzip-compressed-tar=xarchiver.desktop
-application/x-compressed-tar=xarchiver.desktop
-text/plain=gedit.desktop
-application/x-lrzip=xarchiver.desktop
-application/x-bzip=xarchiver.desktop
-application/gzip=xarchiver.desktop
-application/x-lzip=xarchiver.desktop
-application/zip=xarchiver.desktop
-application/x-lzma-compressed-tar=xarchiver.desktop
-application/x-tar=xarchiver.desktop
-application/x-tarz=xarchiver.desktop
-application/x-ustar=xarchiver.desktop
-application/x-xz-compressed-tar=xarchiver.desktop
-image/png=ristretto.desktop
-image/jpeg=ristretto.desktop
-application/x-deb=xarchiver.desktop
-application/pdf=evince.desktop
-
-[Added Associations]
-application/x-bzip-compressed-tar=xarchiver.desktop;
-application/x-compressed-tar=xarchiver.desktop;
-text/plain=gedit.desktop;
-application/x-lrzip=xarchiver.desktop;
-application/x-bzip=xarchiver.desktop;
-application/gzip=xarchiver.desktop;
-application/x-lzip=xarchiver.desktop;
-application/zip=xarchiver.desktop;
-application/x-lzma-compressed-tar=xarchiver.desktop;
-application/x-tar=xarchiver.desktop;
-application/x-tarz=xarchiver.desktop;
-application/x-ustar=xarchiver.desktop;
-application/x-xz-compressed-tar=xarchiver.desktop;
-image/png=ristretto.desktop;
-image/jpeg=ristretto.desktop;
-application/x-deb=xarchiver.desktop;
-application/pdf=evince.desktop;
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb
@@ -24,9 +24,9 @@ do_install() {
    install -m 0644 ${WORKDIR}/sunrise-sky-blue-sunlight-67832.jpeg ${D}${datadir}/backgrounds/ 
 }

-FILES_${PN} += "${datadir}/backgrounds"
+FILES:${PN} += "${datadir}/backgrounds"

-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
    adwaita-icon-theme-cursors \
    adwaita-icon-theme-symbolic \
    adwaita-icon-theme-symbolic-hires \
--- a/recipes-defaultconfig/users/group-wheel.bb
+++ b/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"
--- a/recipes-defaultconfig/users/unpriv-user_1.2.bb
+++ b/recipes-defaultconfig/users/unpriv-user_1.2.bb
@@ -6,27 +6,28 @@ 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)} \
 "

 DEPENDS += "${USER_DEPS}"
-RDEPENDS_${PN} = "${USER_DEPS} bash"
+RDEPENDS:${PN} = "${USER_DEPS} bash"

 USERADD_PACKAGES = "${PN}"

-USERADD_PARAM_${PN} = "-m -c Morona -d /home/${USERNAME} -s /bin/bash -k /etc/skel -g ${USERNAME} --groups ${USERGROUPS} ${USERNAME}"
+USERADD_PARAM:${PN} = "-m -c Morona -d /home/${USERNAME} -s /bin/bash -k /etc/skel -g ${USERNAME} --groups ${USERGROUPS} ${USERNAME}"

-GROUPADD_PARAM_${PN} = "${USERNAME}"
+GROUPADD_PARAM:${PN} = "${USERNAME}"

-pkg_postinst_ontarget_${PN}() {
+pkg_postinst_ontarget:${PN}() {
 # empty password
 passwd -d ${USERNAME}
 }

-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
--- a/recipes-image/allgui/allgui-base-image.bb
+++ b/recipes-image/allgui/allgui-base-image.bb
@@ -17,6 +17,8 @@ IMAGE_INSTALL += " \
    network-manager-applet \
    xfce4-default-config \
    \
+    packagegroup-gnome-desktop \
+    \
    packagegroup-lxqt-base \
    lxqt-default-config \
    \
--- a/recipes-image/allgui/allgui-dev-image.bb
+++ b/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 \
 "
--- a/recipes-image/allgui/allgui-full-image.bb
+++ b/recipes-image/allgui/allgui-full-image.bb
@@ -13,6 +13,15 @@ IMAGE_INSTALL += " \
    \
    orage \
    xfce4-orageclock-plugin \
+    \
+    pkgconfig binutils-symlinks elfutils gnu-config \
+    cmake meson \
+    gdbserver \
+    git git-bash-completion \
+    qt5-creator \
+    qwt-qt5 \
+    \
+    nodejs nodejs-npm nodejs-systemtap \
 "

-IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"
--- a/recipes-image/allgui/allgui-tiny-image.bb
+++ b/recipes-image/allgui/allgui-tiny-image.bb
@@ -13,5 +13,7 @@ IMAGE_INSTALL += " \
    \
    packagegroup-kde-apps-tiny \
    \
+    packagegroup-gnome-apps \
+    \
    weston-examples \
 "
--- a/recipes-image/console/console-base-image.bb
+++ b/recipes-image/console/console-base-image.bb
@@ -12,12 +12,20 @@ IMAGE_INSTALL += " \
    systemd-bash-completion \
    systemd-analyze \
    cpufrequtils \
+    findutils \
    htop \
-    fixmac \
    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   = " "
--- a/recipes-image/console/console-net-image.bb
+++ b/recipes-image/console/console-net-image.bb
@@ -5,6 +5,7 @@ NETWORKPACKS ?= " \
    avahi-autoipd \
    iputils \
    networkmanager \
+    networkmanager-openvpn \
    networkmanager-bash-completion \
 "

--- a/recipes-image/gnome/gnome-base-image.bb
+++ b/recipes-image/gnome/gnome-base-image.bb
@@ -0,0 +1,19 @@
+require recipes-image/console/console-net-image.bb
+require recipes-image/include/x11-base.inc
+
+export IMAGE_BASENAME = "gnome-base-image"
+
+GNOME_DM ?= "gdm"
+
+IMAGE_INSTALL += " \
+    ${X11_BASE_INSTALL} \
+    ${GNOME_DM} \
+    \
+    packagegroup-gnome-desktop \
+    packagegroup-gui-base \
+    \
+    network-manager-applet \
+"
+
+# reenable graphical target
+IMAGE_FEATURES += "x11-base"
--- a/recipes-image/gnome/gnome-tiny-image.bb
+++ b/recipes-image/gnome/gnome-tiny-image.bb
@@ -0,0 +1,10 @@
+require gnome-base-image.bb
+
+export IMAGE_BASENAME = "gnome-tiny-image"
+
+IMAGE_INSTALL += " \
+    packagegroup-gnome-apps \
+    \
+    packagegroup-gui-tiny \
+"
+
--- a/recipes-image/include/x11-base.inc
+++ b/recipes-image/include/x11-base.inc
@@ -4,7 +4,6 @@ X11_BASE_INSTALL += " \
    ${DISTRO_GUI_USER} \
    packagegroup-core-x11-xserver \
    \
-    dbus-x11 \
    iso-codes \
    mime-support \
    xauth \
--- a/recipes-image/kde/kde-full-image.bb
+++ b/recipes-image/kde/kde-full-image.bb
@@ -7,4 +7,4 @@ IMAGE_INSTALL += " \
    packagegroup-gui-full \
 " 

-IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"
--- a/recipes-image/lxqt/lxqt-full-image.bb
+++ b/recipes-image/lxqt/lxqt-full-image.bb
@@ -6,4 +6,4 @@ IMAGE_INSTALL += " \
    packagegroup-gui-full \
 "

-IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"
--- a/recipes-image/lxqt/lxqt-tiny-image.bb
+++ b/recipes-image/lxqt/lxqt-tiny-image.bb
@@ -7,4 +7,4 @@ IMAGE_INSTALL += " \
    qpdfview \
 "

-IMAGE_INSTALL_remove = "evince"
+IMAGE_INSTALL:remove = "evince"
--- a/recipes-image/packagegroups/packagegroup-gui-base.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-base.bb
@@ -2,9 +2,12 @@ SUMMARY = "All packages required for a base image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

+# fontconfig packages get dynamically renamed
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit packagegroup

-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
    ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-common \
    ttf-liberation-sans ttf-liberation-mono ttf-liberation-serif \
    \
--- a/recipes-image/packagegroups/packagegroup-gui-dev.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-dev.bb
@@ -2,48 +2,59 @@ SUMMARY = "All packages required for a dev image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

+# json-glib gets dynamically renamed
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit packagegroup

-RDEPENDS_${PN} = " \
-    qt5-creator \
+RDEPENDS:${PN} = " \
+    qt5-creator qtwebengine-dev \
    qtquickcontrols2-examples qtwayland-examples \
    hexedit \
-    glade3 glade \
+    glade \
    umbrello \
    lokalize \
    geany-plugins \
-    gtk-demo gtk+3-demo \
+    gtk+3-demo \
    \
    weston weston-xwayland  \
    \
    unzip xz tar bzip2 \
-    make cmake \
+    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 \
-    python python-shell python-subprocess \
-    python3 \
+    valgrind \
+    git git-bash-completion git-perltools subversion \
+    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 \
+    python3-pyserial python3-smbus python3-smbus2 python3-spidev \
+    \
+    epiphany ${@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 = " \
-    glibc-utils \
-"
+RDEPENDS:${PN}:append:rpi = "rpi-gpio"

 #    qemu
-#    valgrind
+#    

--- a/recipes-image/packagegroups/packagegroup-gui-full.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-full.bb
@@ -2,62 +2,61 @@ SUMMARY = "All packages required for a full image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

+# qwt-qt5-examples package gets dynamically renamed
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit packagegroup

 MACHINE_SPECIFICS_FULL = ""
 MACHINE_SPECIFICS_FULL_mx6 = "gstreamer1.0-plugins-imx"

-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
    source-han-sans-cn-fonts \
    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 \
    tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
    \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
-    abiword-meta \
    gimp \
    fontforge \
    menulibre \
    \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
-    \
    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 \
-    dragon \
    gstreamer1.0-plugins-base-meta gstreamer1.0-plugins-good-meta \
    pulseaudio-misc \
-    ${MACHINE_SPECIFICS_FULL} \
-    \
-    ark \
-    filelight \
-    konsole \
-    spectacle \
-    \
-    kde-apps-world \
-    \
-    gottcode-world \
    \
    qwt-qt5-examples \
    gnuplot gnuplot-x11 \
-    qskinny \
    \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox z80 vice stella opentyrian d1x-rebirth', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom', '', d)} \
+    ${MACHINE_SPECIFICS_FULL} \
+    \
+    epiphany ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
+    \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'meta-retro-world', '', d)} \
+    \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice inkscape scribus abiword-meta', '', d)} \
+    \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertuxkart supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom scummvm pinball pinball-table-gnu pinball-table-hurd', '', 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 quaternion spectral', '', d)} \
 "

 #    firefox 
 #    gursormaker
 #    kodi 
-#    mpv 

--- a/recipes-image/packagegroups/packagegroup-gui-games.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-games.bb
@@ -5,17 +5,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 inherit packagegroup

 # Those listed here are either ugly or nonworking
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
    atanks \
-    scummvm \
    etr \
    gnome-chess \
    gnome-robots \
-    supertuxkart \
    \
    gnome-games \
    mog \
-    openastromenace \
 "


--- a/recipes-image/packagegroups/packagegroup-gui-musicians.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-musicians.bb
@@ -2,9 +2,12 @@ SUMMARY = "All packages required for musician image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

+# fluidsynth-bin gets dynamically renamed
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 inherit packagegroup

-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
    musicians-world \
    mixxx \
    qmmp \
--- a/recipes-image/packagegroups/packagegroup-gui-tiny.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-tiny.bb
@@ -4,15 +4,13 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda

 inherit packagegroup

-RDEPENDS_${PN} = " \
-    tzdata \
+RDEPENDS:${PN} = " \
    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-initramfs', 'plymouth plymouth-set-default-theme plymouth-initrd', '', d)} \
    xdg-user-dirs \
    \
    evince \
    geany \
    \
-    ntp ntp-utils \
    tzdata \
    dnsmasq \
    devilspie2 \
@@ -20,5 +18,5 @@ RDEPENDS_${PN} = " \
    gnome-system-monitor \
    dconf-editor \
    \
-    glmark2 mesa-demos eglinfo-x11 \
+    glmark2 mesa-demos \
 "
--- a/recipes-image/packagegroups/packagegroup-kde-apps-tiny.bb
+++ b/recipes-image/packagegroups/packagegroup-kde-apps-tiny.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda

 inherit packagegroup

-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
    kate \
    dolphin \
    konsole \
--- a/recipes-image/xfce4/xfce4-dev-image.bb
+++ b/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 \
 "
--- a/recipes-image/xfce4/xfce4-music-dev-image.bb
+++ b/recipes-image/xfce4/xfce4-music-dev-image.bb
@@ -0,0 +1,25 @@
+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 \
+    \
+    jack-dev \
+    lv2-dev \
+    libvorbis-dev \
+    aubio-dev \
+    libmad-dev \
+    libsamplerate0-dev \
+    rubberband-dev \
+    liblo-dev \
+    lilv-dev \
+    suil-dev \
+    serd-dev \
+    sord-dev \
+"
--- a/recipes-image/xfce4/xfce4-music-image.bb
+++ b/recipes-image/xfce4/xfce4-music-image.bb
@@ -4,12 +4,9 @@ export IMAGE_BASENAME = "xfce4-music-image"

 XFCE_DM = "sddm sddm-morona-autologin"

-# Saving to SDCard creates delays/underruns
-IMAGE_FEATURES += "volatile-log"
-
 IMAGE_INSTALL += " \
    packagegroup-gui-musicians \
    \
    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    epiphany ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
 "
--- a/recipes-image/xfce4/xfce4-tiny-image.bb
+++ b/recipes-image/xfce4/xfce4-tiny-image.bb
@@ -8,5 +8,6 @@ IMAGE_INSTALL += " \
    rodent-icon-theme \
    \
    packagegroup-gui-tiny \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-musicians', 'xfce4-mixer', '', d)} \
 "

--- a/recipes-utils/fixmac/fixmac.bb
+++ b/recipes-utils/fixmac/fixmac.bb
@@ -18,4 +18,4 @@ do_install() {

 }

-RDEPENDS_${PN} = "ranpwd"
+RDEPENDS:${PN} = "ranpwd"
--- a/recipes-utils/ranpwd/ranpwd_git.bb
+++ b/recipes-utils/ranpwd/ranpwd_git.bb
@@ -7,7 +7,7 @@ PV = "1.2+git${SRCPV}"

 inherit autotools

-SRC_URI = "git://github.com/koenkooi/ranpwd.git;protocol=https \
+SRC_URI = "git://github.com/koenkooi/ranpwd.git;protocol=https;branch=master \
           file://ranpwd_confgure.patch \
          "

@@ -15,7 +15,7 @@ SRCREV = "b62aab579e288715b82d5575befaa2b8ff210c2b"

 S="${WORKDIR}/git"

-do_configure_prepend () {
+do_configure:prepend () {
 	( cd ${S} 
 	touch NEWS README AUTHORS ChangeLog
 	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
--- a/recipes-utils/udev-udisks/udev-rules-udisks-hide-bootpart_1.0.bb
+++ b/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
@@ -59,4 +60,4 @@ do_install () {
    done
 }

-FILES_${PN} = "${nonarch_base_libdir}/udev/rules.d"
+FILES:${PN} = "${nonarch_base_libdir}/udev/rules.d"
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`RRECOMMENDS_${PN} += "udev-rules-udisks-hide-bootpart"`