Fix README.md to proper markdown

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

README.md

@@ -67,8 +67,8 @@ It has its origin Ångström distribution  - check https://github.com/Angstrom-d
     form /etc/skel.
 
 [recipes-image](recipes-image):
-  * All images for console / kde / lxqt / xfce ar found. allgui-images build
-    images for all graphical environments.
+  * All images for cinnamon / console / gnome / kde / lxqt / weston / xfce are found in this folder.
+    allgui-images build images for all desktop environments.
 
 [recipes-utils](recipes-utils):
   * udev-rules-udisks-hide-bootpart: Hide boot partition from udisks
@@ -148,6 +148,12 @@ branch: master
 revision: HEAD
 ```
 
+```
+URI: git://github.com/schnitzeltony/meta-gnome-forks.git
+branch: master
+revision: HEAD
+```
+
 #### To add plymouth to GUI-images:
 
 ```
@@ -165,12 +171,6 @@ branch: master
 revision: HEAD
 ```
 
-```
-URI: git://github.com/meta-rust/meta-rust.git
-branch: master
-revision: HEAD
-```
-
 #### To pretend work:
 ```
 URI: git://github.com/schnitzeltony/meta-office.git

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

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

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

@@ -0,0 +1,3 @@
+EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"
+
+RDEPENDS:${PN}-dev:remove = "${PN}-staticdev"

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

@@ -0,0 +1 @@
+PACKAGECONFIG:append = "gui"

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 = " 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/meta-xfce/xfce4-terminal_%.bbappend

@@ -0,0 +1 @@
+RRECOMMENDS:${PN} += "xfce4-terminal-default-config"

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

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

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

@@ -1,6 +1,5 @@
-PACKAGECONFIG_append = " \
+PACKAGECONFIG:append = " \
     hls \
-    libmms \
     faad \
     fluidsynth \
 "

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

@@ -1 +1 @@
-PACKAGECONFIG_append = " pam-wheel"
+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

@@ -4,12 +4,12 @@
 # Hardlink recipe sysroot and generated sysroot to instant native sysroot
 #------------------------------------------------------------------------------
 
-inherit utils instant-paths
+inherit 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-inherits.inc

@@ -4,9 +4,6 @@ INHERIT += "debian"
 # activate config checker
 INHERIT += "sanity"
 
-# activate the blacklister
-INHERIT += "blacklist"
-
 # make devshell available as task
 INHERIT += "devshell"
 
@@ -22,5 +19,3 @@ INHERIT += "sstate"
 # drop buildinfo to /etc/build
 INHERIT += "image-buildinfo-mortsgna"
 
-# Prelink images
-INHERIT += "image-prelink"

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

@@ -1,2 +1,2 @@
 # glibc:
-PNBLACKLIST[libiconv] = "the glibc provided iconv library is used"
+SKIP_RECIPE[libiconv] = "the glibc provided iconv library is used"

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.3"
+DISTRO_VERSION = "v3.5"
 
 # 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
@@ -54,7 +54,7 @@ ONLINE_PACKAGE_MANAGEMENT = "full"
 BB_SIGNATURE_HANDLER ?= "OEBasicHash"
 
 # We want to build a superset for the default config
-LICENSE_FLAGS_WHITELIST += "commercial"
+LICENSE_FLAGS_ACCEPTED += "commercial"
 
 # Can be "glibc" or "musl"
 TCLIBC ?= "glibc"
@@ -88,19 +88,25 @@ 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)}"
 
 
 ###############################################################################
 # Extra tweaks
 ###############################################################################
 
+# xorg is seriously broken with 1.20 -> 21.1 and nobody seems to care
+PREFERRED_VERSION_virtual/xserver = "1.20.%"
+
+# enable fortran for octave
+FORTRAN:forcevariable = ",fortran"
+
 # Unbreak multimachine builds
 LICENSE_DIRECTORY = "${DEPLOY_DIR}/licenses/${MACHINE_ARCH}"
 
@@ -111,13 +117,13 @@ 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[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"
+SKIP_RECIPE[pn-fso-apm]             = "regular apmd is good enough"
+SKIP_RECIPE[weston-init]            = "A passwordless root session reachable by two keys - security???"
+SKIP_RECIPE[packagegroup-core-x11] = "Conflicts with mortsgna-images"
+SKIP_RECIPE[xserver-nodm-init]     = "Mortsgna-images use graphical display managers"
 
 ###############################################################################
 # Quality & security hardening
@@ -128,22 +134,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 +163,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 +228,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 = "kirkstone langdale"
 
 # 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

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

@@ -62,5 +62,5 @@ As user:
 * vice: select cairo
 * dosbox / dosbox-x / stella
 * supertux(kart??)
-* open all gnome- / all kde-plasma- / lxqt- / liri- / lumina-sessions
+* open all available desktops
 

recipes-defaultconfig/guiconfig/lxqt-default-config_1.0.1.bb

@@ -1,4 +1,4 @@
-DESCRIPTION = "This recipe presets xfce user default configuration"
+SUMMARY = "LXQT default user configuration"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 

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.1.bb

@@ -1,7 +1,6 @@
-DESCRIPTION = "This recipe presets xfce user default configuration"
+SUMMARY = "XFCE default user configuration"
 LICENSE = "MIT & CC0-1.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r4"
 
 # License sunrise: https://www.pexels.com/photo/sunrise-under-cloudy-sky-illustration-67832/
 
@@ -24,9 +23,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/guiconfig/xfce4-terminal-default-config_1.0.bb

@@ -0,0 +1,15 @@
+SUMMARY = "xfce4-terminal default user configuration"
+LICENSE = "MIT & CC0-1.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit allarch
+
+SRC_URI = " \
+    file://.config \
+"
+
+do_install() {
+    # default user configration -> /etc/skel
+    install -d ${D}${sysconfdir}/skel
+    cp -r ${WORKDIR}/.config ${D}${sysconfdir}/skel/
+}

recipes-defaultconfig/users/group-wheel.bb

@@ -6,6 +6,6 @@ inherit useradd
 
 USERADD_PACKAGES = "${PN}"
 #USERADD_PARAM = ""
-GROUPADD_PARAM_${PN} = "--system wheel"
+GROUPADD_PARAM:${PN} = "--system wheel"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"

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

@@ -17,17 +17,17 @@ USER_DEPS ?= " \
 "
 
 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-devtools/xsd/xsd_4.1.0.bb

@@ -0,0 +1,20 @@
+SUMMARY = "W3C XML schema to C++ data binding compiler"
+HOMEPAGE = "https://www.codesynthesis.com/products/xsd/"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://xsd/LICENSE;md5=79e31466c4d9f3a85f2f987c11ebcd83"
+
+BBCLASSEXTEND = "native"
+
+DEPENDS = "xerces-c"
+
+SRC_URI = "https://codesynthesis.com/~boris/tmp/xsd/${PV}.a11/xsd-${PV}.a11+dep.tar.bz2"
+SRC_URI[sha256sum] = "4fbe2d1e17ad4451bb3a9d9101ac89f7b465205470f1c7ad5e2c1386ac2c87d2"
+
+S = "${WORKDIR}/xsd-${PV}.a11+dep"
+
+do_install() {
+    install -d ${D}${includedir}
+    install -m 0755 -D ${S}/xsd/xsd/xsd ${D}${bindir}/xsdcxx
+    cp -r ${S}/xsd/libxsd/xsd ${D}${includedir}/xsd
+}
+

recipes-graphics/xorg-xserver/xserver-xorg.inc

@@ -0,0 +1,191 @@
+SUMMARY = "The X.Org X server"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/base"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
+
+# xf86-*-* packages depend on an X server built with the xfree86 DDX
+# so we have a virtual to represent that:
+# deprecated, we should use virtual/xserver instead
+PROVIDES = "virtual/xserver-xf86"
+
+# Other packages tend to just care that there is *an* X server:
+PROVIDES += "virtual/xserver"
+
+PE = "2"
+INC_PR = "r8"
+
+XORG_PN = "xorg-server"
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.gz"
+
+CVE_PRODUCT = "xorg-server x_server"
+# This is specific to Debian's xserver-wrapper.c
+CVE_CHECK_IGNORE += "CVE-2011-4613"
+# As per upstream, exploiting this flaw is non-trivial and it requires exact
+# timing on the behalf of the attacker. Many graphical applications exit if their
+# connection to the X server is lost, so a typical desktop session is either
+# impossible or difficult to exploit. There is currently no upstream patch
+# available for this flaw.
+CVE_CHECK_IGNORE += "CVE-2020-25697"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "x11"
+
+LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
+DEPENDS = "xorgproto ${LIB_DEPS} font-util"
+
+# Split out some modules and extensions from the main package
+# These aren't needed for basic operations and only take up space:
+#  32.0k   libdri.so
+#  91.0k   libexa.so
+#  336.0k  libglx.so
+#  1360k   libint10.so
+#  180.0k  libwfb.so
+#  320.0k  libxaa.so
+#  124.0k  libxf1bpp.so
+#  84.0k   libxf4bpp.so
+#          librecord.so
+#          libextmod.so
+#          libdbe.so
+
+PACKAGES =+ "${PN}-sdl \
+             ${PN}-fbdev \
+             ${PN}-xvfb \
+             ${PN}-utils \
+             ${PN}-xephyr \
+             ${PN}-xwayland \
+             ${PN}-multimedia-modules \
+             ${PN}-extension-dri \
+             ${PN}-extension-dri2 \
+             ${PN}-extension-glx \
+             ${PN}-extension-record \
+             ${PN}-extension-extmod \
+             ${PN}-extension-dbe \
+             ${PN}-module-libint10 \
+             ${PN}-module-libafb \
+             ${PN}-module-libwfb  \
+             ${PN}-module-libmfb \
+             ${PN}-module-libcfb \
+             ${PN}-module-exa \
+             ${PN}-module-xaa \
+             ${PN}-module-libxf1bpp \
+             ${PN}-module-libxf4bpp \
+             xf86-video-modesetting"
+
+SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver"
+INSANE_SKIP:${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi"
+
+XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput"
+RRECOMMENDS:${PN} += "${XSERVER_RRECOMMENDS}"
+RRECOMMENDS:${PN}-xwayland += "${XSERVER_RRECOMMENDS}"
+RDEPENDS:${PN}-xvfb += "xkeyboard-config"
+RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
+
+FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
+FILES:${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
+FILES:${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
+FILES:${PN}-sdl = "${bindir}/Xsdl"
+FILES:${PN}-fbdev = "${bindir}/Xfbdev"
+FILES:${PN}-xvfb = "${bindir}/Xvfb"
+FILES:${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
+FILES:${PN}-xephyr = "${bindir}/Xephyr"
+FILES:${PN}-xwayland = "${bindir}/Xwayland"
+FILES:${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
+FILES:${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
+FILES:${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
+FILES:${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
+FILES:${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
+FILES:${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
+FILES:${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
+FILES:${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
+FILES:${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
+FILES:${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
+FILES:${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
+FILES:${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
+FILES:${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
+FILES:${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
+FILES:${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
+FILES:${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
+FILES:xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so"
+
+EXTRA_OECONF += "--with-fop=no \
+                 --with-pic \
+                 --disable-static \
+                 --disable-record \
+                 --disable-dmx \
+                 --disable-xnest \
+                 --enable-xvfb \
+                 --enable-composite \
+                 --without-dtrace \
+                 --with-int10=x86emu \
+                 --sysconfdir=/etc/X11 \
+                 --localstatedir=/var \
+                 --with-xkb-output=/var/lib/xkb \
+                 --with-os-name=Linux \
+"
+
+OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
+PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \
+"
+
+PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
+PACKAGECONFIG[dga] = "--enable-dga,--disable-dga"
+PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa"
+PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2"
+# DRI3 requires xshmfence to also be enabled
+PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3"
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl virtual/libx11"
+PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl"
+PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
+PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
+PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
+PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
+PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
+PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
+PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy"
+
+# Xorg requires a SHA1 implementation, pick one
+XORG_CRYPTO ??= "openssl"
+PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
+PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
+PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
+
+do_install:append () {
+	# Its assumed base-files creates this for us
+	rmdir ${D}${localstatedir}/log/
+        sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5
+    rm -f ${D}${bindir}/cvt
+}
+
+# Add runtime provides for the ABI versions of the video and input subsystems,
+# so that drivers can depend on the relevant version.
+python populate_packages:prepend() {
+    import subprocess
+
+    # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going
+    # into the new package, not the staged ones.
+    newenv = dict(os.environ)
+    newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/")
+
+    def get_abi(name):
+        abis = {
+          "video": "abi_videodrv",
+          "input": "abi_xinput"
+        }
+        p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name],
+                             shell=True, env=newenv, stdout=subprocess.PIPE)
+        stdout, stderr = p.communicate()
+        output = stdout.decode("utf-8").split(".")[0]
+        mlprefix = d.getVar('MLPREFIX') or ''
+        return "%sxorg-abi-%s-%s" % (mlprefix, name, output)
+
+    pn = d.getVar("PN")
+    d.appendVar("RPROVIDES:" + pn, " " + get_abi("input"))
+    d.appendVar("RPROVIDES:" + pn, " " + get_abi("video"))
+}

recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch

@@ -0,0 +1,23 @@
+From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 7 Feb 2020 20:36:45 +0100
+Subject: [PATCH] drmmode_display.c: add missing mi.h include
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ hw/xfree86/drivers/modesetting/drmmode_display.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
+index e18cc37..3445cce 100644
+--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
+@@ -46,6 +46,7 @@
+ #include "xf86Crtc.h"
+ #include "drmmode_display.h"
+ #include "present.h"
++#include "mi.h"
+ 
+ #include <cursorstr.h>
+ 

recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch

@@ -0,0 +1,90 @@
+From 12041ad0610f1345d6b9994c32943fd4dd01f65d Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu, 20 Jan 2022 10:20:38 +0100
+Subject: [PATCH] render: Fix build with gcc 12
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The xserver fails to compile with the latest gcc 12:
+
+ render/picture.c: In function ‘CreateSolidPicture’:
+ render/picture.c:874:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[16]’ [-Werror=array-bounds]
+  874 |     pPicture->pSourcePict->type = SourcePictTypeSolidFill;
+      |                          ^~
+ render/picture.c:868:45: note: object of size 16 allocated by ‘malloc’
+  868 |     pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
+      |                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ render/picture.c: In function ‘CreateLinearGradientPicture’:
+ render/picture.c:906:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
+  906 |     pPicture->pSourcePict->linear.type = SourcePictTypeLinear;
+      |                          ^~
+ render/picture.c:899:45: note: object of size 32 allocated by ‘malloc’
+  899 |     pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
+      |                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ render/picture.c: In function ‘CreateConicalGradientPicture’:
+ render/picture.c:989:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
+  989 |     pPicture->pSourcePict->conical.type = SourcePictTypeConical;
+      |                          ^~
+ render/picture.c:982:45: note: object of size 32 allocated by ‘malloc’
+  982 |     pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
+      |                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ cc1: some warnings being treated as errors
+ ninja: build stopped: subcommand failed.
+
+This is because gcc 12 has become stricter and raises a warning now.
+
+Fix the warning/error by allocating enough memory to store the union
+struct.
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e]
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Acked-by: Michel Dänzer <mdaenzer@redhat.com>
+Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256
+---
+ render/picture.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/render/picture.c b/render/picture.c
+index afa0d25..2be4b19 100644
+--- a/render/picture.c
++++ b/render/picture.c
+@@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int *error)
+     }
+ 
+     pPicture->id = pid;
+-    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
++    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+     if (!pPicture->pSourcePict) {
+         *error = BadAlloc;
+         free(pPicture);
+@@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, xPointFixed * p2,
+     }
+ 
+     pPicture->id = pid;
+-    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
++    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+     if (!pPicture->pSourcePict) {
+         *error = BadAlloc;
+         free(pPicture);
+@@ -936,7 +936,7 @@ CreateRadialGradientPicture(Picture pid, xPointFixed * inner,
+     }
+ 
+     pPicture->id = pid;
+-    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictRadialGradient));
++    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+     if (!pPicture->pSourcePict) {
+         *error = BadAlloc;
+         free(pPicture);
+@@ -979,7 +979,7 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * center, xFixed angle,
+     }
+ 
+     pPicture->id = pid;
+-    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
++    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+     if (!pPicture->pSourcePict) {
+         *error = BadAlloc;
+         free(pPicture);
+-- 
+2.35.1
+

recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch

@@ -0,0 +1,36 @@
+From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 1 Mar 2019 09:47:57 -0800
+Subject: [PATCH] test/xtest: Initialize array with braces
+
+Fixes an error when extra warnings are enabled, this is caught with clang
+
+test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
+    WindowRec root = {0};
+                      ^
+                      {}
+1 error generated.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ test/xtest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/xtest.c b/test/xtest.c
+index fc5e433..d7e6620 100644
+--- a/test/xtest.c
++++ b/test/xtest.c
+@@ -61,7 +61,7 @@ xtest_init_devices(void)
+ {
+     ScreenRec screen = {0};
+     ClientRec server_client = {0};
+-    WindowRec root = {0};
++    WindowRec root = {{0}};
+     WindowOptRec optional = {0};
+ 
+     /* random stuff that needs initialization */
+-- 
+2.21.0
+

recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch

@@ -0,0 +1,53 @@
+From d77cdc5e1eee26821ab98c947abea53fb7b18fe5 Mon Sep 17 00:00:00 2001
+From: California Sullivan <california.l.sullivan@intel.com>
+Date: Fri, 16 Mar 2018 17:23:11 -0700
+Subject: [PATCH] xf86pciBus.c: use Intel ddx only for pre-gen4 hardware
+
+Use intel ddx only on pre-gen4 hw, newer ones will fall back to modesetting
+Author: Timo Aaltonen <tjaalton@debian.org>
+
+Instead of defaulting to the Intel driver for all Intel hardware, only
+default it for older hardware for which it has shown to be better for.
+
+Others fall through to the -modesetting default.
+
+Upstream-Status: Pending [Debian/Fedora patch
+https://src.fedoraproject.org/rpms/xorg-x11-server/c/ee515e44b07e37689abf48cf2fffb41578f3bc1d]
+
+Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
+---
+ hw/xfree86/common/xf86pciBus.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index e61ae0cd4..d70c99197 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
+ 		case 0x0bef:
+ 			/* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
+ 			break;
+-		default:
++		/* Default to intel only on pre-gen4 chips */
++		case 0x3577:
++		case 0x2562:
++		case 0x3582:
++		case 0x358e:
++		case 0x2572:
++		case 0x2582:
++		case 0x258a:
++		case 0x2592:
++		case 0x2772:
++		case 0x27a2:
++		case 0x27ae:
++		case 0x29b2:
++		case 0x29c2:
++		case 0x29d2:
++		case 0xa001:
++		case 0xa011:
+ 			driverList[0] = "intel";
+ 			break;
+         }
+-- 
+2.14.3
+

recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch

@@ -0,0 +1,34 @@
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Thu, 20 Sep 2018 20:12:24 +0100
+Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
+
+Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
+simply get all of the CFLAGS.  Aside from completeness, this helps builds in
+sysroots as pkg-config knows what to do with --cflags but doesn't remap
+arbitrary variables.
+
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ xorg-server.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xorg-server.m4 b/xorg-server.m4
+index 18255b91a..195bda5d8 100644
+--- a/xorg-server.m4
++++ b/xorg-server.m4
+@@ -31,7 +31,7 @@ dnl
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ 	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+ 	SAVE_CFLAGS="$CFLAGS"
+-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
++	CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
+ 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
+-- 
+2.11.0
+

recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch

@@ -0,0 +1,50 @@
+Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Thu, 1 Aug 2019 15:24:51 +0100
+Subject: [PATCH] sdksyms.sh: don't embed the build path
+
+This script generates a header that has a comment containing the build path for
+no real reason.  As this source can end up deployed on targets in debug packages
+this means there is both potentially sensitive information leakage about the
+build environment, and a source of change for reproducible builds.
+---
+ hw/xfree86/sdksyms.sh | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
+index 39e33711d..bdf47a71a 100755
+--- a/hw/xfree86/sdksyms.sh
++++ b/hw/xfree86/sdksyms.sh
+@@ -302,13 +302,16 @@ LC_ALL=C
+ export LC_ALL
+ ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
+ ${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
++function basename(file) {
++    sub(".*/", "", file)
++    return file
++}
+ BEGIN {
+     sdk = 0;
+     print("/*");
+     print(" * These symbols are referenced to ensure they");
+     print(" * will be available in the X Server binary.");
+     print(" */");
+-    printf("/* topdir=%s */\n", topdir);
+     print("_X_HIDDEN void *xorg_symbols[] = {");
+ 
+     printf("sdksyms.c:") > "sdksyms.dep";
+@@ -337,7 +340,7 @@ BEGIN {
+ 	# remove quotes
+ 	gsub(/"/, "", $3);
+ 	line = $2;
+-	header = $3;
++	header = basename($3);
+ 	if (! headers[$3]) {
+ 	    printf(" \\\n  %s", $3) >> "sdksyms.dep";
+ 	    headers[$3] = 1;
+-- 
+2.20.1
+

recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb

@@ -0,0 +1,34 @@
+require xserver-xorg.inc
+
+SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
+           file://pkgconfig.patch \
+           file://0001-test-xtest-Initialize-array-with-braces.patch \
+           file://sdksyms-no-build-path.patch \
+           file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
+           file://0001-render-Fix-build-with-gcc-12.patch \
+           "
+SRC_URI[sha256sum] = "54b199c9280ff8bf0f73a54a759645bd0eeeda7255d1c99310d5b7595f3ac066"
+
+CFLAGS += "-fcommon"
+
+# These extensions are now integrated into the server, so declare the migration
+# path for in-place upgrades.
+
+RREPLACES:${PN} =  "${PN}-extension-dri \
+                    ${PN}-extension-dri2 \
+                    ${PN}-extension-record \
+                    ${PN}-extension-extmod \
+                    ${PN}-extension-dbe \
+                   "
+RPROVIDES:${PN} =  "${PN}-extension-dri \
+                    ${PN}-extension-dri2 \
+                    ${PN}-extension-record \
+                    ${PN}-extension-extmod \
+                    ${PN}-extension-dbe \
+                   "
+RCONFLICTS:${PN} = "${PN}-extension-dri \
+                    ${PN}-extension-dri2 \
+                    ${PN}-extension-record \
+                    ${PN}-extension-extmod \
+                    ${PN}-extension-dbe \
+                   "

recipes-image/allgui/allgui-base-image.bb

@@ -19,11 +19,11 @@ IMAGE_INSTALL += " \
     \
     packagegroup-gnome-desktop \
     \
+    packagegroup-cinnamon-base \
+    \
     packagegroup-lxqt-base \
     lxqt-default-config \
     \
-    liri-world \
-    \
     lumina-world \
     \
     weston weston-xwayland \

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

@@ -6,8 +6,6 @@ IMAGE_INSTALL += " \
     packagegroup-gui-full \
     kde-world \
     \
-    onboard \
-    \
     faenza-icon-theme \
     openzone \
     \
@@ -24,4 +22,4 @@ IMAGE_INSTALL += " \
     nodejs nodejs-npm nodejs-systemtap \
 "
 
-IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"

recipes-image/cinnamon/cinnamon-base-image.bb

@@ -1,13 +1,18 @@
 require recipes-image/console/console-net-image.bb
 require recipes-image/include/x11-base.inc
 
-export IMAGE_BASENAME = "liri-base-image"
+export IMAGE_BASENAME = "cinnamon-base-image"
+
+CINNAMON_DM ?= "lxdm"
 
 IMAGE_INSTALL += " \
     ${X11_BASE_INSTALL} \
-    sddm \
+    ${CINNAMON_DM} \
     \
-    liri-world \
+    packagegroup-cinnamon-base \
+    packagegroup-gui-base \
+    \
+    xfce4-terminal \
 "
 
 # reenable graphical target

recipes-image/cinnamon/cinnamon-full-image.bb

@@ -0,0 +1,8 @@
+require cinnamon-tiny-image.bb
+
+export IMAGE_BASENAME = "cinnamon-full-image"
+
+IMAGE_INSTALL += " \
+    packagegroup-gui-full \
+"
+

recipes-image/cinnamon/cinnamon-tiny-image.bb

@@ -0,0 +1,8 @@
+require cinnamon-base-image.bb
+
+export IMAGE_BASENAME = "cinnamon-tiny-image"
+
+IMAGE_INSTALL += " \
+    packagegroup-gui-tiny \
+"
+

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

@@ -24,7 +24,7 @@ IMAGE_INSTALL += " \
 "
 
 LIBC_SPECIFIC_PACKS = ""
-LIBC_SPECIFIC_PACKS_libc-glibc = "glibc-gconv glibc-gconvs glibc-utils"
+LIBC_SPECIFIC_PACKS:libc-glibc = "glibc-gconv glibc-gconvs glibc-utils"
 
 IMAGE_DEV_MANAGER   = "udev"
 IMAGE_INIT_MANAGER  = "systemd"

recipes-image/console/console-net-image.bb

@@ -6,7 +6,8 @@ NETWORKPACKS ?= " \
     iputils \
     networkmanager \
     networkmanager-openvpn \
-    networkmanager-bash-completion \
+    networkmanager-nmcli \
+    networkmanager-nmcli-bash-completion \
 "
 
 IMAGE_INSTALL += " \

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 \
@@ -19,7 +22,7 @@ RDEPENDS_${PN} = " \
     unzip xz tar bzip2 \
     make cmake extra-cmake-modules meson \
     automake autoconf libtool m4 \
-    gcc-symlinks g++-symlinks cpp-symlinks libgomp-dev \
+    ccache gcc-symlinks g++-symlinks cpp-symlinks libgomp-dev \
     dtc \
     pkgconfig binutils-symlinks elfutils gnu-config util-linux \
     gdb gdbserver \
@@ -33,6 +36,13 @@ RDEPENDS_${PN} = " \
     gawk \
     chrpath \
     nodejs nodejs-npm nodejs-systemtap \
+    googletest-dev \
+    protobuf protobuf-compiler protobuf-dev \
+    flatbuffers flatbuffers-compiler flatbuffers-dev flatbuffers-staticdev python3-flatbuffers \
+    modemmanager-dev modemmanager-qt-dev \
+    networkmanager-dev networkmanager-qt-dev libnma-dev \
+    qtvirtualkeyboard-dev qwt-qt5-dev \
+    syntax-highlighting-dev \
     \
     ruby ruby-dev \
     \
@@ -45,12 +55,15 @@ RDEPENDS_${PN} = " \
     pulseview qtiohelper minicom i2c-tools \
     python3-pyserial python3-smbus python3-smbus2 python3-spidev \
     \
-    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-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)} \
+    \
+    fftw-dev fftwf-wisdom fftw-wisdom fftwl-wisdom \
+    libxml2-utils libxerces-c libxerces-c-dev xsd-dev \
 "
 
-RDEPENDS_${PN}_append_rpi = "rpi-gpio"
+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 \
@@ -15,10 +18,6 @@ RDEPENDS_${PN} = " \
     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 \
-    \
     gimp \
     fontforge \
     menulibre \
@@ -34,23 +33,23 @@ RDEPENDS_${PN} = " \
     pulseaudio-misc \
     \
     qwt-qt5-examples \
-    gnuplot gnuplot-x11 \
+    gnuplot gnuplot-x11 octave \
     \
     ${MACHINE_SPECIFICS_FULL} \
     \
-    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-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', '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)} \
     \
     ${@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 scribus', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'gottcode-world kde-apps-world qmlarkdown quaternion spectral kdreports', '', d)} \
 "
 
 #    firefox 

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-full-image.bb

@@ -7,8 +7,6 @@ export IMAGE_BASENAME = "xfce4-full-image"
 IMAGE_INSTALL += " \
     packagegroup-gui-full \
     \
-    onboard \
-    \
     faenza-icon-theme \
     openzone \
     \

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_any('BBFILE_COLLECTIONS', 'browser-layer chromium-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_any('BBFILE_COLLECTIONS', 'browser-layer chromium-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

@@ -1,21 +0,0 @@
-SUMMARY = "Provide random MAC address for devices with 00:00:00:00:00 as MAC address"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-
-SRC_URI = "file://fixmac.sh \
-           file://fixmac.rules"
-
-
-do_install() {
-	install -d ${D}${sysconfdir}/udev/rules.d
-	install -m 0644  ${WORKDIR}/fixmac.rules ${D}${sysconfdir}/udev/rules.d
-
-	install -d ${D}${bindir}
-	install -m 0755 ${WORKDIR}/fixmac.sh ${D}${bindir}
-
-	sed -i -e s:/sbin:${base_sbindir}:g -e s:/etc:${sysconfdir}:g ${D}${bindir}/fixmac.sh
-
-}
-
-RDEPENDS_${PN} = "ranpwd"

recipes-utils/fixmac/fixmac/fixmac.rules

@@ -1 +0,0 @@
-KERNEL=="eth*", ACTION=="add", ATTR{address}=="00:00:00:00:00:00", RUN += "/usr/bin/fixmac.sh %k"

recipes-utils/fixmac/fixmac/fixmac.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -e /etc/ethernetmac.$1 ] ; then
-	MACADDRESS="$(cat /etc/ethernetmac.$1)"
-else
-	MACADDRESS="$(ranpwd -m)"
-	echo ${MACADDRESS} > /etc/ethernetmac.$1
-fi
-
-/sbin/ifconfig $1 hw ether ${MACADDRESS} && /sbin/ifconfig $1 up

recipes-utils/ranpwd/ranpwd/ranpwd_confgure.patch

@@ -1,45 +0,0 @@
-Fix configure errors e.g.
-
-| /home/kraj/work/angstrom-repo/build/tmp-angstrom_next-eglibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/ranpwd/1.2+gitAUTOINC+b62aab579e-r0/git/configure: line 2866: syntax error near unexpected token `-Wall'
-| /home/kraj/work/angstrom-repo/build/tmp-angstrom_next-eglibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/ranpwd/1.2+gitAUTOINC+b62aab579e-r0/git/configure: line 2866: `PA_ADD_CFLAGS(-Wall)'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-Index: git/Makefile.am
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ git/Makefile.am	2014-04-25 10:39:58.217987489 -0700
-@@ -0,0 +1,4 @@
-+bin_PROGRAMS = ranpwd
-+man_MANS = ranpwd.1
-+ranpwd_SOURCES = ranpwd.c
-+TESTS = ranpwd
-Index: git/configure.in
-===================================================================
---- git.orig/configure.in	2014-04-25 10:28:04.544650560 -0700
-+++ git/configure.in	2014-04-25 10:39:58.217987489 -0700
-@@ -12,23 +12,10 @@
- 
- AC_INIT(ranpwd, 1.2)
- AC_PREREQ(2.59)
-+AM_INIT_AUTOMAKE
- 
- AC_PROG_CC
- 
--PA_ADD_CFLAGS(-Wall)
--PA_ADD_CFLAGS(-W)
--PA_ADD_CFLAGS(-Wpointer-arith)
--PA_ADD_CFLAGS(-Wbad-function-cast)
--PA_ADD_CFLAGS(-Wcast-equal)
--PA_ADD_CFLAGS(-Wstrict-prototypes)
--PA_ADD_CFLAGS(-Wmissing-prototypes)
--PA_ADD_CFLAGS(-Wmissing-declarations)
--PA_ADD_CFLAGS(-Wnested-externs)
--PA_ADD_CFLAGS(-Winline)
--PA_ADD_CFLAGS(-Wshadow)
--PA_ADD_CFLAGS(-Wcast-align)
--PA_ADD_CFLAGS(-pipe)
--
- AC_CHECK_HEADERS(getopt.h)
- AC_CHECK_FUNCS(getopt_long)
- 

recipes-utils/ranpwd/ranpwd_git.bb

@@ -1,29 +0,0 @@
-DESCRIPTION = "Random password generator"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://ranpwd.c;beginline=1;endline=11;md5=0e8585e19117526efedfaeb50c345d7a"
-SECTION = "console/utils"
-
-PV = "1.2+git${SRCPV}"
-
-inherit autotools
-
-SRC_URI = "git://github.com/koenkooi/ranpwd.git;protocol=https \
-           file://ranpwd_confgure.patch \
-          "
-
-SRCREV = "b62aab579e288715b82d5575befaa2b8ff210c2b"
-
-S="${WORKDIR}/git"
-
-do_configure_prepend () {
-	( cd ${S} 
-	touch NEWS README AUTHORS ChangeLog
-	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
-		cp aclocal.m4 acinclude.m4
-	fi )
-}
-
-do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 ${B}/ranpwd ${D}/${bindir}/ranpwd
-}

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

@@ -60,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

@@ -83,7 +83,8 @@ SelectCardDevice() {
             ErrorOut 'Cancel selected at SelectCardDevice().'
         fi
         DevicePath=${DevicePathArr[$menuitem]}
-        DeviceSize=`lsblk --nodeps --raw --noheadings --output SIZE --bytes $dev`
+        DeviceSize=`lsblk --nodeps --raw --noheadings --output SIZE --bytes $DevicePath`
+
         unset menuitem
         unset menuitems
     fi
@@ -98,13 +99,15 @@ SelectCardDevice() {
 # DeployFileDir: Path of the file selected
 SelectDeployedFile() {
     if [ -z "$DeployedFile" ]; then
-        GetBitbakeEnvVar "TMPDIR"
-        _TMPDIR="$BitbakeEnvVar"
+        if [ -z "$BITBAKE_TMPDIR" ]; then
+            GetBitbakeEnvVar "TMPDIR"
+            BITBAKE_TMPDIR="$BitbakeEnvVar"
+        fi
         # bitbake environment found?
-        if [ -z "$_TMPDIR" ]; then
+        if [ -z "$BITBAKE_TMPDIR" ]; then
             ErrorOut "Bitbake environment variable TMPDIR not found!"
         fi
-        DeployPath=${_TMPDIR}/deploy/images/${Machine}
+        DeployPath=${BITBAKE_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?"
@@ -113,7 +116,7 @@ SelectDeployedFile() {
         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
 
@@ -240,7 +243,7 @@ RunUserStartRoot() {
         done
         # dialog's gui is done here
         clear
-        echo "${style_bold}${style_red}IMPORTANT: THIS is YOUR LAST EXIT...${style_normal}"
+        echo "${style_bold}${style_red}IMPORTANT: THIS is YOUR LAST EXIT!!!${style_normal}"
         if [ "x$1" = "x" ] ; then
             # No message text passed: use standard
             if [ -n "$DeployedFile" ]; then

scripts/include/machine-bbone.inc

@@ -20,11 +20,11 @@ RootCardWriteCallback() {
         # write
         StartMessage="\nWrite $DeployedFile to $DevicePath..."
         if echo $DeployedFile | grep -q '.wic.gz'; then
-            EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
+            EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath status=progress oflag=nocache bs=1024K" "$StartMessage"
         elif echo $DeployedFile | grep -q '.wic.xz'; then
-            EvalExAuto "tar -x -f $DeployedFile --to-stdout | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
+            EvalExAuto "tar -x -f $DeployedFile --to-stdout | dd of=$DevicePath status=progress oflag=nocache bs=1024K" "$StartMessage"
         else
-            EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
+            EvalExAuto "dd of=$DevicePath status=progress oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
         fi
         # resize I
         EvalExAuto "parted -s $DevicePath -- resizepart 2 -0" "\nResize I ${DevicePath}2..."

scripts/include/machine-imx.inc

@@ -20,9 +20,9 @@ RootCardWriteCallback() {
         # write
         StartMessage="\nWrite $DeployedFile to $DevicePath..."
         if echo $DeployedFile | grep -q '.wic.gz'; then
-            EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
+            EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath status=progress oflag=nocache bs=1024K" "$StartMessage"
         else
-            EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
+            EvalExAuto "dd of=$DevicePath status=progress oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
         fi
         # resize I
         EvalExAuto "parted -s $DevicePath -- resizepart 2 -0" "\nResize I ${DevicePath}2..."

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 status=progress oflag=nocache bs=1024K" "$StartMessage"
+        else
+            EvalExAuto "dd of=$DevicePath status=progress 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}'`