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

It can break devtool

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)
 
 
 -----------

appends/meta-browser/chromium-ozone-wayland_%.bbappend

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

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-gnome/devilspie2_%.bbappend

@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

appends/meta-gnome/gvfs_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " archive gcr libmtp libgphoto2 samba systemd"
+PACKAGECONFIG:append = " archive gcr libmtp libgphoto2 samba systemd"

appends/meta-networking/dnsmasq_%.bbappend

@@ -2,4 +2,4 @@
 # 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"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"

appends/meta-networking/networkmanager-openvpn_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " gnome"
+PACKAGECONFIG:append = " gnome"

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

appends/meta-oe/nodejs_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " shared"
+PACKAGECONFIG:append = " shared"

appends/meta-oe/udisks2_%.bbappend

@@ -1 +1 @@
-RRECOMMENDS_${PN} += "udev-rules-udisks-hide-bootpart"
+RRECOMMENDS:${PN} += "udev-rules-udisks-hide-bootpart"

appends/meta-qt5/qtbase_%.bbappend

@@ -7,12 +7,12 @@ PACKAGECONFIG_DISTRO += " \
 
 inherit instant-paths
 
-do_install_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() {
+do_copy_to_target_sysroot:append() {
     # ---------- qt.conf ----------
     # create
     generate_qt_config_file_paths

appends/meta-qt5/qtquickcontrols2_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " examples"
+PACKAGECONFIG:append = " examples"

appends/meta-qt5/qtwayland_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " examples"
+PACKAGECONFIG:append = " examples"

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"

appends/meta-xfce/libxfce4ui_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " startup-notification gladeui2"
+PACKAGECONFIG:append = " startup-notification gladeui2"

appends/meta-xfce/packagegroup-xfce-extended.bbappend

@@ -1,3 +1,3 @@
-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
     imsettings \
 "

appends/meta-xfce/thunar-volman_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " notify"
+PACKAGECONFIG:append = " notify"

appends/meta-xfce/xfce4-settings_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " sound-setter notify"
+PACKAGECONFIG:append = " sound-setter notify"

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'

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

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 BASEFILESISSUEINSTALL = "do_install_mortsgnaissue"
 

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
 }

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"

appends/oe-core/enchant2_%.bbappend

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

appends/oe-core/gstreamer1.0-plugins-bad_%.bbappend

@@ -1,4 +1,4 @@
-PACKAGECONFIG_append = " \
+PACKAGECONFIG:append = " \
     hls \
     libmms \
     faad \

appends/oe-core/gstreamer1.0-plugins-ugly_%.bbappend

@@ -1,3 +1,3 @@
-PACKAGECONFIG_append = " \
+PACKAGECONFIG:append = " \
     x264 \
 "

appends/oe-core/libsdl2_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append_class-target = " jack"
+PACKAGECONFIG:append:class-target = " jack"

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

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

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

appends/oe-core/pulseaudio_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " jack"
+PACKAGECONFIG:append = " jack"

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
 }

appends/oe-core/sudo_%.bbappend

@@ -0,0 +1 @@
+PACKAGECONFIG:append = " pam-wheel"

appends/oe-core/weston%.bbappend

@@ -1,2 +1,2 @@
 # A root session without password activated by just two keys - honestly..
-RRECOMMENDS_${PN}_remove = "weston-init"
+RRECOMMENDS:${PN}:remove = "weston-init"

classes/instant-sysroot-native.bbclass

@@ -8,8 +8,8 @@ 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}
@@ -18,8 +18,8 @@ instant_sysroot_copy () {
 
 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

classes/instant-sysroot-target.bbclass

@@ -173,10 +173,7 @@ do_copy_to_target_sysroot() {
     fi
 }
 
-addtask copy_to_target_sysroot after do_package_write_deb do_package_write_ipk do_package_write_rpm 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}"
 

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 \

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

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'  or 'armv7ve'  or 'cortexa7'  or 'cortexa8'  or 'cortexa9' 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'

conf/distro/include/mortsgna-distro-features.inc

@@ -29,7 +29,7 @@ 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"
@@ -44,17 +44,18 @@ 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'

conf/distro/include/mortsgna-libc-musl.inc

@@ -4,7 +4,7 @@
 # libc settings
 DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION') == '1']}"
 
-DISTRO_FEATURES_remove = "ldconfig"
+DISTRO_FEATURES:remove = "ldconfig"
 
 USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"

conf/distro/mortsgna.conf

@@ -10,7 +10,7 @@
 ###############################################################################
 
 # follow Yocto version scheme
-DISTRO_VERSION = "v3.1"
+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,7 +111,7 @@ 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"
@@ -128,22 +128,19 @@ 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
-# wait with 'mime' & 'mime-xdg' (meta-browser tests with old branches)
+# QA check settings - make all warnings errors
 WARN_TO_ERROR_QA = " \
-    already-stripped compile-host-path install-host-path \
-    xorg-driver-abi textrel incompatible-license files-invalid infodir \
-    build-deps symlink-to-sysroot multilib \
-    installed-vs-shipped ldflags pn-overrides rpaths staticdev libdir \
-    uppercase-pn \
-    unknown-configure-option useless-rpaths host-user-contaminated \
-    invalid-packageconfig patch-fuzz src-uri-bad \
+    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
@@ -160,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
@@ -225,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 ?= " \

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 = "dunfell gatesgarth hardknott"
+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,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 \
     \

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} \

raspi-image-test-and-setup

@@ -7,10 +7,10 @@ Setup new image:
 * copy this file to /home/morona / open with gedit / setup colour theme
 
 As root:
-* systemctl disable systemd-networkd-wait-online.service
-* TODO systemctl disable brcm43438
 * 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

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
-Foreground2=#ffff00000000
-Foreground3=#00000000ffff
-Background=#333339393b3b
+Background=rgb(0,0,0)
+PerCore=0
 

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

@@ -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/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=TRUE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
+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)
 

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"/>

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/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>

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 \

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,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"

recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb

@@ -1,38 +0,0 @@
-SUMMARY = "GNOME disk utility"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SECTION = "x11/gnome"
-
-DEPENDS = " \
-    gtk+3 \
-    libdvdread \
-    libcanberra \
-    libnotify \
-    libsecret \
-    libpwquality \
-    udisks2 \
-"
-
-GNOMEBASEBUILDCLASS = "meson"
-
-inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-EXTRA_OEMESON = " \
-    -Dman=false \
-"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-
-# As soon as elogind is of interest this needs rework: meson option is combo
-PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd"
-
-SRC_URI[archive.sha256sum] = "dd033d3f36ab070bc72317cf3045e5b4927765543f1bce7612b2c7f96595167a"
-
-FILES_${PN} += " \
-    ${datadir}/metainfo \
-    ${datadir}/dbus-1 \
-"
-

recipes-image/allgui/allgui-full-image.bb

@@ -24,4 +24,4 @@ IMAGE_INSTALL += " \
     nodejs nodejs-npm nodejs-systemtap \
 "
 
-IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"

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

@@ -18,8 +18,14 @@ IMAGE_INSTALL += " \
     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/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}"

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}"

recipes-image/lxqt/lxqt-tiny-image.bb

@@ -7,4 +7,4 @@ IMAGE_INSTALL += " \
     qpdfview \
 "
 
-IMAGE_INSTALL_remove = "evince"
+IMAGE_INSTALL:remove = "evince"

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 \
     \

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

@@ -2,9 +2,12 @@ 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} = " \
+RDEPENDS:${PN} = " \
     qt5-creator qtwebengine-dev \
     qtquickcontrols2-examples qtwayland-examples \
     hexedit \
@@ -21,34 +24,36 @@ RDEPENDS_${PN} = " \
     automake autoconf libtool m4 \
     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 \
     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 \
     \
-    pulseview qtiohelper \
+    pulseview qtiohelper minicom i2c-tools \
+    python3-pyserial python3-smbus python3-smbus2 python3-spidev \
     \
-    ${@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)} \
     ${@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
 #    

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

@@ -2,12 +2,15 @@ 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 \
@@ -27,6 +30,7 @@ RDEPENDS_${PN} = " \
     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 \
@@ -37,13 +41,13 @@ RDEPENDS_${PN} = " \
     \
     ${MACHINE_SPECIFICS_FULL} \
     \
-    ${@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)} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox dosbox-x cage 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', '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', '', 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)} \
     \
@@ -55,5 +59,4 @@ RDEPENDS_${PN} = " \
 #    firefox 
 #    gursormaker
 #    kodi 
-#    mpv 
 

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

@@ -5,7 +5,7 @@ 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 \
     etr \
     gnome-chess \
@@ -13,7 +13,6 @@ RDEPENDS_${PN} = " \
     \
     gnome-games \
     mog \
-    openastromenace \
 "
 
 

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 \

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

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-initramfs', 'plymouth plymouth-set-default-theme plymouth-initrd', '', d)} \
     xdg-user-dirs \
     \

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 \

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

@@ -10,11 +10,6 @@ IMAGE_INSTALL += " \
     xfce4-dev-tools \
     libxfce4ui-glade \
     \
-    packagegroup-gui-musicians \
-    \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
-    \
     jack-dev \
     lv2-dev \
     libvorbis-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)} \
+    epiphany ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
 "

recipes-utils/fixmac/fixmac.bb

@@ -18,4 +18,4 @@ do_install() {
 
 }
 
-RDEPENDS_${PN} = "ranpwd"
+RDEPENDS:${PN} = "ranpwd"

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

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"

scripts/include/card-helpers.inc

@@ -104,10 +104,16 @@ 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`
+            FileSize=`du -Dbh "$FilePath" | cut -f1`
             menuitems+=( "$iCount" "`basename $FilePath` / size: $FileSize" )
         done
 

scripts/include/machine-raspberrypi.inc

@@ -1,14 +1,14 @@
 #! /bin/bash
 
 # machine-raspberrypi.inc
-# (c) Copyright 2018 Andreas Müller <schnitzeltony@gmail.com>
+# (c) Copyright 2021 Andreas Müller <schnitzeltony@gmail.com>
 # Licensed under terms of GPLv2
 #
 # This script contains settings and callbacks fir raspberrypi boards
 
 # default settings
 DEFAULT_MACHINE_FAMILY='raspberrypi*'
-DEFAULT_FIND_ROOTFS='-name *.rpi-sdimg -type l'
+DEFAULT_FIND_ROOTFS='-name *.rpi-sdimg -type l -o -name *.wic -type l -o -name *.wic.bz2 -type l'
 DEFAULT_KERNEL_IMAGE_TYPE='Image'
 
 # callback for card-write
@@ -18,7 +18,12 @@ RootCardWriteCallback() {
         # evt. write partition table
         CheckPartitionTable "$DevicePath"
         # write
-        EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "\nWrite $DeployedFile to $DevicePath..."
+        StartMessage="\nWrite $DeployedFile to $DevicePath..."
+        if echo $DeployedFile | grep -q '.wic.bz2'; then
+            EvalExAuto "bunzip2 -c $DeployedFile | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
+        else
+            EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
+        fi
         # resize I
         EvalExAuto "parted -s $DevicePath -- resizepart 2 -0" "\nResize I ${DevicePath}2..."
         # resize II

scripts/update-recipe-checksums.sh

@@ -38,7 +38,7 @@ echo -e "${style_bold}Run bitbake -k --runall=fetch $@...${style_normal}"
 bitbake -k --runall=fetch "$@" 2>&1 | while read line; do
    if echo "$line" | grep -q "was expected"; then
        # Shorten line to ensure not being confused by filenames containing spaces
-       line=`echo "$line" | sed 's:.*checksum ::'`
+       line=`echo "$line" | sed 's:.*checksum ::' | sed "s:'::g"`
        # Extract checksums
        newchecksum=`echo "$line" | awk '{print $1}'`
        oldchecksum=`echo "$line" | awk '{print $3}'`