update-recipe-checksums: Repeat update procedure as checksums were replaced

There are two cases which are enhanced:

1. A recipe contains one tarball with new checksums: After replacement the
   script fetches again so a valid tarball is available right after running
   this script.
2. A recipe contains multiple tarballs with new checksums: All checksums are
   corrected and on exit tarballs are usable immedately without further fetch.

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

README.md

@@ -70,7 +70,7 @@ It has its origin Ångström distribution  - check https://github.com/Angstrom-d
   * All images for console / kde / lxqt / xfce ar found. allgui-images build
     images for all graphical environments.
 
-[recipes-utlis](recipes-utlis):
+[recipes-utils](recipes-utils):
   * udev-rules-udisks-hide-bootpart: Hide boot partition from udisks
   * Some tools (these are the only left from angstrom). Honestly: Have never
     used them but kept them if users come from angstrom and might miss

appends/meta-multimedia/fluidsynth_%.bbappend

@@ -1,6 +1,6 @@
 PACKAGECONFIG ?= " \
-    sndfile \
     jack \
-    pulseaudio \
     portaudio \
+    readline \
+    sndfile \
 "

appends/meta-oe/nodejs_%.bbappend

@@ -0,0 +1 @@
+PACKAGECONFIG_append = " shared"

appends/meta-oe/udisks_%.bbappend

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

appends/meta-xfce/libxfce4ui_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " startup-notification gladeui"
+PACKAGECONFIG_append = " startup-notification gladeui2"

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

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

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

@@ -1 +1 @@
-PACKAGECONFIG_append = " datetime-setter sound-setter notify"
+PACKAGECONFIG_append = " sound-setter notify"

appends/oe-core/weston%.bbappend

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

classes/instant-sysroot-target.bbclass

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

conf/distro/include/mortsgna-armv7-tune.inc

@@ -4,7 +4,7 @@ def armv7_tune_handler(d):
     # to common tune value
     if d.getVar('MORTSGNA_ARMV7_TUNE') == '1':
         features = d.getVar('TUNE_FEATURES').split()
-        if 'armv7a' in features or 'armv7ve' in features:
+        if 'armv7a' in features or 'armv7ve'  or 'armv7ve'  or 'cortexa7'  or 'cortexa8'  or 'cortexa9' in features:
             tune = 'armv7athf'
             if 'bigendian' in features:
                 tune += 'b'
@@ -12,6 +12,5 @@ def armv7_tune_handler(d):
                 tune += '-neon'
         else:
             tune = d.getVar('DEFAULTTUNE')
-
     return tune
 

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

@@ -34,10 +34,10 @@ VIRTUAL-RUNTIME_init_manager = "systemd"
 # USE-flag like features
 DISTRO_FEATURES += "tk"
 DISTRO_FEATURES += "x11"
-DISTRO_FEATURES += "3g"
 DISTRO_FEATURES += "pulseaudio"
 DISTRO_FEATURES += "ldconfig"
 DISTRO_FEATURES += "polkit"
+DISTRO_FEATURES += "helpfiles"
 
 # OpenGL support
 DISTRO_FEATURES += "opengl"
@@ -56,3 +56,6 @@ DISTRO_FEATURES += "${DISTRO_WAYLAND}"
 # Inherit the default LIBC features superset from OE-core
 DISTRO_FEATURES += "${DISTRO_FEATURES_LIBC}"
 
+# Uncomment for tests on gold-trouble only
+#DISTRO_FEATURES += 'ld-is-gold'
+

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

@@ -4,6 +4,8 @@
 # libc settings
 DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION') == '1']}"
 
+DISTRO_FEATURES_remove = "ldconfig"
+
 USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
 USE_NLS_gcc-cross = "no"

conf/distro/include/mortsgna-preferred-providers.inc

@@ -22,3 +22,13 @@ XSERVER ?= " \
     xf86-video-modesetting \
 "
 
+# Follow meta-java README:
+# Possible provider: cacao-initial-native and jamvm-initial-native
+PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
+
+# Possible provider: cacao-native and jamvm-native
+PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+
+# Optional since there is only one provider for now
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+

conf/distro/mortsgna.conf

@@ -10,7 +10,7 @@
 ###############################################################################
 
 # follow Yocto version scheme
-DISTRO_VERSION = "v2.7"
+DISTRO_VERSION = "v3.1"
 
 # 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
@@ -131,15 +131,20 @@ require conf/distro/include/no-static-libs.inc
 # 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)
 WARN_TO_ERROR_QA = " \
     already-stripped compile-host-path install-host-path \
-    installed-vs-shipped ldflags pn-overrides rpaths staticdev \
+    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 \
+    invalid-packageconfig patch-fuzz src-uri-bad \
 "
 WARN_QA_remove = "${WARN_TO_ERROR_QA}"
 ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
 
+PNBLACKLIST[weston-init]       = "A passwordless root session reachable by two keys - security???"
 
 ###############################################################################
 # Image defaults
@@ -193,6 +198,7 @@ EXTRA_IMAGE_FEATURES += " \
     empty-root-password \
     allow-empty-password \
     post-install-logging \
+    volatile-log \
 "
 
 # make x11-base a valid IMAGE_FEATURES

conf/layer.conf

@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "mortsgna-layer"
 BBFILE_PATTERN_mortsgna-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_mortsgna-layer = "7"
 
-LAYERSERIES_COMPAT_mortsgna-layer = "sumo thud warrior"
+LAYERSERIES_COMPAT_mortsgna-layer = "zeus dunfell"
 
 # 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
@@ -20,6 +20,8 @@ BBFILES_DYNAMIC += " \
     \
     gnome-layer:${LAYERDIR}/appends/meta-gnome/*.bbappend \
     \
+    networking-layer:${LAYERDIR}/appends/meta-networking/*.bbappend \
+    \
     multimedia-layer:${LAYERDIR}/appends/meta-multimedia/*.bbappend \
     \
     openembedded-layer:${LAYERDIR}/appends/meta-oe/*.bbappend \

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/gnome-shell-overrides-migration.desktop

@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/imsettings-start.desktop

@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/org.gnome.Evolution-alarm-notify.desktop

@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-extract.desktop

@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-miner-fs.desktop

@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-store.desktop

@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/xfce4-screensaver.desktop

@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+

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

@@ -0,0 +1,22 @@
+[General]
+Show_Title=false
+Show_Labels=false
+str_fontsize=small
+val_fontsize=1
+Font=Sans 11
+Show_Units=true
+Small_Spacings=false
+Command_Name=xfce4-sensors
+
+[Chip0]
+Name=ACPI
+Number=0
+
+[Chip0_Feature0]
+Address=0
+Name=thermal_zone0
+Color=#008000
+Show=true
+Min=0.00
+Max=70.00
+

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

@@ -1,8 +1,10 @@
 [Configuration]
-FontName=Monospace 9
+ColorForeground=#ffffffffffff
+ColorBackground=#000000000000
+ColorCursor=#a0a0a0a0a0a0
+FontName=Monospace 10
 MiscAlwaysShowTabs=FALSE
 MiscBell=FALSE
-MiscBellUrgent=FALSE
 MiscBordersDefault=TRUE
 MiscCursorBlinks=FALSE
 MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
@@ -10,7 +12,6 @@ MiscDefaultGeometry=80x24
 MiscInheritGeometry=FALSE
 MiscMenubarDefault=FALSE
 MiscMouseAutohide=FALSE
-MiscMouseWheelZoom=TRUE
 MiscToolbarDefault=TRUE
 MiscConfirmClose=TRUE
 MiscCycleTabs=TRUE
@@ -18,12 +19,5 @@ MiscTabCloseButtons=TRUE
 MiscTabCloseMiddleClick=TRUE
 MiscTabPosition=GTK_POS_TOP
 MiscHighlightUrls=TRUE
-MiscMiddleClickOpensUri=FALSE
-MiscCopyOnSelect=FALSE
-MiscDefaultWorkingDir=
-MiscRewrapOnResize=TRUE
-MiscUseShiftArrowsToScroll=FALSE
-MiscSlimTabs=FALSE
-ColorForeground=#000000000000
-ColorBackground=#fae0f4f1a311
+ScrollingLines=1000000
 

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

@@ -21,6 +21,7 @@
         <value type="int" value="2"/>
         <value type="int" value="4"/>
         <value type="int" value="11"/>
+        <value type="int" value="7"/>
         <value type="int" value="12"/>
         <value type="int" value="1"/>
       </property>
@@ -85,5 +86,6 @@
     <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-7" type="string" value="xfce4-sensors-plugin"/>
   </property>
 </channel>

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

@@ -3,6 +3,6 @@
 <channel name="xfce4-settings-manager" version="1.0">
   <property name="last" type="empty">
     <property name="window-width" type="int" value="858"/>
-    <property name="window-height" type="int" value="661"/>
+    <property name="window-height" type="int" value="675"/>
   </property>
 </channel>

recipes-defaultconfig/guiconfig/xfce4-default-config/.local/share/applications/mimeapps.list

@@ -1,37 +0,0 @@
-[Default Applications]
-application/x-bzip-compressed-tar=xarchiver.desktop
-application/x-compressed-tar=xarchiver.desktop
-text/plain=gedit.desktop
-application/x-lrzip=xarchiver.desktop
-application/x-bzip=xarchiver.desktop
-application/gzip=xarchiver.desktop
-application/x-lzip=xarchiver.desktop
-application/zip=xarchiver.desktop
-application/x-lzma-compressed-tar=xarchiver.desktop
-application/x-tar=xarchiver.desktop
-application/x-tarz=xarchiver.desktop
-application/x-ustar=xarchiver.desktop
-application/x-xz-compressed-tar=xarchiver.desktop
-image/png=ristretto.desktop
-image/jpeg=ristretto.desktop
-application/x-deb=xarchiver.desktop
-application/pdf=evince.desktop
-
-[Added Associations]
-application/x-bzip-compressed-tar=xarchiver.desktop;
-application/x-compressed-tar=xarchiver.desktop;
-text/plain=gedit.desktop;
-application/x-lrzip=xarchiver.desktop;
-application/x-bzip=xarchiver.desktop;
-application/gzip=xarchiver.desktop;
-application/x-lzip=xarchiver.desktop;
-application/zip=xarchiver.desktop;
-application/x-lzma-compressed-tar=xarchiver.desktop;
-application/x-tar=xarchiver.desktop;
-application/x-tarz=xarchiver.desktop;
-application/x-ustar=xarchiver.desktop;
-application/x-xz-compressed-tar=xarchiver.desktop;
-image/png=ristretto.desktop;
-image/jpeg=ristretto.desktop;
-application/x-deb=xarchiver.desktop;
-application/pdf=evince.desktop;

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

@@ -17,6 +17,8 @@ IMAGE_INSTALL += " \
     network-manager-applet \
     xfce4-default-config \
     \
+    packagegroup-gnome-desktop \
+    \
     packagegroup-lxqt-base \
     lxqt-default-config \
     \

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

@@ -13,6 +13,15 @@ IMAGE_INSTALL += " \
     \
     orage \
     xfce4-orageclock-plugin \
+    \
+    pkgconfig binutils-symlinks elfutils gnu-config \
+    cmake meson \
+    gdbserver \
+    git git-bash-completion \
+    qt5-creator \
+    qwt-qt5 \
+    \
+    nodejs nodejs-npm nodejs-systemtap \
 "
 
 IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"

recipes-image/allgui/allgui-tiny-image.bb

@@ -13,5 +13,7 @@ IMAGE_INSTALL += " \
     \
     packagegroup-kde-apps-tiny \
     \
+    packagegroup-gnome-apps \
+    \
     weston-examples \
 "

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

@@ -13,7 +13,6 @@ IMAGE_INSTALL += " \
     systemd-analyze \
     cpufrequtils \
     htop \
-    fixmac \
     util-linux-lsblk \
     nano \
 "

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

@@ -5,6 +5,7 @@ NETWORKPACKS ?= " \
     avahi-autoipd \
     iputils \
     networkmanager \
+    networkmanager-openvpn \
     networkmanager-bash-completion \
 "
 

recipes-image/gnome/gnome-base-image.bb

@@ -0,0 +1,19 @@
+require recipes-image/console/console-net-image.bb
+require recipes-image/include/x11-base.inc
+
+export IMAGE_BASENAME = "gnome-base-image"
+
+GNOME_DM ?= "gdm"
+
+IMAGE_INSTALL += " \
+    ${X11_BASE_INSTALL} \
+    ${GNOME_DM} \
+    \
+    packagegroup-gnome-desktop \
+    packagegroup-gui-base \
+    \
+    network-manager-applet \
+"
+
+# reenable graphical target
+IMAGE_FEATURES += "x11-base"

recipes-image/gnome/gnome-tiny-image.bb

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

recipes-image/include/x11-base.inc

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

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

@@ -8,7 +8,7 @@ RDEPENDS_${PN} = " \
     qt5-creator \
     qtquickcontrols2-examples qtwayland-examples \
     hexedit \
-    glade3 glade \
+    glade \
     umbrello \
     lokalize \
     geany-plugins \
@@ -17,7 +17,7 @@ RDEPENDS_${PN} = " \
     weston weston-xwayland  \
     \
     unzip xz tar bzip2 \
-    make cmake \
+    make cmake meson \
     automake autoconf libtool m4 \
     gcc-symlinks g++-symlinks cpp-symlinks \
     dtc \
@@ -32,12 +32,14 @@ RDEPENDS_${PN} = " \
     man man-pages \
     gawk \
     chrpath \
+    nodejs nodejs-npm nodejs-systemtap \
     \
     wireshark \
     nfs-utils-client \
     lmsensors-sensord lmsensors-sensorsdetect \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-microcontroller', 'packagegroup-avr', '', d)} \
 "
 
 RDEPENDS_${PN}_append_libc-glibc = " \

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

@@ -17,43 +17,36 @@ RDEPENDS_${PN} = " \
     tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
     tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
-    abiword-meta \
     gimp \
     fontforge \
     menulibre \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
-    \
     gparted \
     \
     mpd \
     vlc \
     parole gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-omx gstreamer1.0-libav \
-    dragon \
     gstreamer1.0-plugins-base-meta gstreamer1.0-plugins-good-meta \
     pulseaudio-misc \
-    ${MACHINE_SPECIFICS_FULL} \
-    \
-    ark \
-    filelight \
-    konsole \
-    spectacle \
-    \
-    kde-apps-world \
-    \
-    gottcode-world \
     \
     qwt-qt5-examples \
     gnuplot gnuplot-x11 \
-    qskinny \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox z80 vice stella opentyrian d1x-rebirth', '', d)} \
+    ${MACHINE_SPECIFICS_FULL} \
+    \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox cass80 z80 vice stella opentyrian d1x-rebirth', '', d)} \
+    \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice abiword-meta', '', d)} \
+    \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom', '', d)} \
+    \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-musicians', 'packagegroup-gui-musicians', '', d)} \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'sdr-layer', 'packagegroup-sdr-python-extended packagegroup-sdr-gnuradio-base packagegroup-sdr-gnuradio-extended packagegroup-sdr-rtlsdr packagegroup-sdr-uhd', '', d)} \
     \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'gottcode-world kde-apps-world qmlarkdown', '', d)} \
 "
 
 #    firefox 

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

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

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

@@ -4,9 +4,6 @@ export IMAGE_BASENAME = "xfce4-music-image"
 
 XFCE_DM = "sddm sddm-morona-autologin"
 
-# Saving to SDCard creates delays/underruns
-IMAGE_FEATURES += "volatile-log"
-
 IMAGE_INSTALL += " \
     packagegroup-gui-musicians \
     \

recipes-image/xfce4/xfce4-tiny-image.bb

@@ -8,5 +8,6 @@ IMAGE_INSTALL += " \
     rodent-icon-theme \
     \
     packagegroup-gui-tiny \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-musicians', 'xfce4-mixer', '', d)} \
 "
 

scripts/bbone-card-write.sh

@@ -0,0 +1,14 @@
+#! /bin/bash
+
+# bbone-card-write.sh
+# (c) Copyright 2019 Andreas Müller <schnitzeltony@gmail.com>
+# Licensed under terms of GPLv2
+#
+# This script writes image to sdcard and aligns rootfs partition to max size.
+
+# Includes
+. `dirname $0`/include/common-helpers.inc
+. `dirname $0`/include/card-helpers.inc
+. `dirname $0`/include/machine-bbone.inc
+
+StartCardWrite

scripts/include/machine-bbone.inc

@@ -0,0 +1,75 @@
+#! /bin/bash
+
+# machine-bbone.inc
+# (c) Copyright 2019 Andreas Müller <schnitzeltony@gmail.com>
+# Licensed under terms of GPLv2
+#
+# This script contains settings and callbacks for TI beagle boards
+
+# default settings
+DEFAULT_MACHINE_FAMILY='*bone*'
+DEFAULT_FIND_ROOTFS='-name *.wic -o -name *.wic.gz -type l'
+DEFAULT_KERNEL_IMAGE_TYPE='zImage'
+
+# callback for card-write
+RootCardWriteCallback() {
+    # rootfs write/resize to card fit
+    time(
+        # evt. write partition table
+        CheckPartitionTable "$DevicePath"
+        # 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"
+        elif echo $DeployedFile | grep -q '.wic.xz'; then
+            EvalExAuto "tar -x -f $DeployedFile --to-stdout | 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
+        EvalExAuto "resize2fs ${DevicePath}2" "\nResize II ${DevicePath}2..."
+     )
+}
+
+# callback for card-kernel-write (WIP)
+RootCardKernelWriteCallback() {
+    tmpdir=`mktemp -d`
+
+    # mount boot partition
+    EvalExAuto "mount ${DevicePath}1 $tmpdir" "\nMount boot partition ${DevicePath}1 to $tmpdir..."
+    # initial kernel
+    EvalExAuto "rm -f $tmpdir/${KernelImageType}*" "\nRemove old kernels..."
+    EvalExAuto "cp $DeployedFile $tmpdir/$KernelImageType" "\nCopy new kernel $KernelImageType..."
+    # devicetrees
+    EvalExAuto "rm -f $tmpdir/*.dtb" "\nRemove old devicetrees..."
+    echo
+    for dtb in `find ${DeployFileDir} -name "${KernelImageType}*.dtb" -type l`; do
+        dtbname=`basename $dtb | sed 's:'${KernelImageType}'-::'`
+        EvalExAuto "cp $dtb $tmpdir/${dtbname}" "Copy $dtb -> $tmpdir/${dtbname}..."
+    done
+    # unmount boot partition
+    EvalExAuto "sleep 1 && umount ${DevicePath}1" "\nUnmount boot partition..."
+
+    # mount rootfs
+    EvalExAuto "mount ${DevicePath}2 $tmpdir" "\nMount rootfs ${DevicePath}2 to $tmpdir..."
+    # rootfs/boot kernel
+    EvalExAuto "rm -f $tmpdir/boot/${KernelImageType}*" "\nRemove old kernels..."
+    EvalExAuto "cp $DeployedFile $tmpdir/boot/$KernelWithAbiName" "\nCopy new kernel to /boot/$KernelWithAbiName..."
+    EvalExAuto "ln -sf $KernelWithAbiName $tmpdir/boot/$KernelImageType" "\nLink kernel to /boot/$KernelImageType -> $KernelWithAbiName..."
+    # kernel modules
+    CopyKernelModules
+    RegisterKernelModules
+    # unmount rootfs
+    EvalExAuto "sleep 1 && umount ${DevicePath}2" "\nUnmount rootfs..."
+
+    rm -rf $tmpdir
+}
+
+CheckPrerequisite "time"
+CheckPrerequisite "gunzip"
+CheckPrerequisite "tar"
+CheckPrerequisite "dd"
+CheckPrerequisite "parted"
+CheckPrerequisite "resize2fs"

scripts/update-recipe-checksums.sh

@@ -1,42 +1,60 @@
 #!/bin/sh
 
 # raspberrypi-card-write.sh
-# (c) Copyright 2018 Andreas Müller <schnitzeltony@gmail.com>
+# (c) Copyright 2020 Andreas Müller <schnitzeltony@gmail.com>
 # Licensed under terms of GPLv2
 #
 # This script updates checksums in recipes after version bump. It is supposed
 # to run run in same environment as bitbake:
 #
-# update-recipe-checksums.sh <recipe>
+# update-recipe-checksums.sh [-d <recipedir> <recipes>
 #
 # where <recipe> can be a single recipe, a packagegroup an image or...
 
 # Includes
 . `dirname $0`/include/common-helpers.inc
 
+echo
+if [ "$1" = "-d" ]; then
+    shift
+    _TOPDIR="$1"
+    echo -e "${style_bold}Use $1 as recipe directory...${style_normal}"
+    shift
+fi
+
 if [ -z "$1" ]; then
     ErrorOut "No fetch target set in first parameter!"
 fi
 
-# Ask bitbake for recipe directory
-GetBitbakeEnvVar "TOPDIR"
-_TOPDIR="$BitbakeEnvVar"
+if [ "x$_TOPDIR" = "x" ]; then
+    echo -e "${style_bold}Ask bitbake for recipe directory...${style_normal}"
+    GetBitbakeEnvVar "TOPDIR"
+    _TOPDIR="$BitbakeEnvVar"
+fi
 
 echo
 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 ::'`
-       # Extract checksums
-       newchecksum=`echo "$line" | awk '{print $1}'`
-       oldchecksum=`echo "$line" | awk '{print $3}'`
-       # Lazy way: just grep for old checksums to find recipes
-       for recipe in `grep -rl "$oldchecksum" "${_TOPDIR}"`; do
-           if [ -f "$recipe" ]; then
-               EvalExAuto "sed -i '"s:$oldchecksum:$newchecksum:"' "$recipe"" "Change checksum in $recipe to $newchecksum"
-           fi
-       done
-   fi
+while true; do
+    replaced=""
+    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 ::'`
+            # Extract checksums
+            newchecksum=`echo "$line" | awk '{print $1}'`
+            oldchecksum=`echo "$line" | awk '{print $3}'`
+            # Lazy way: just grep for old checksums to find recipes
+            for recipe in `grep -rl "$oldchecksum" "${_TOPDIR}"`; do
+                if [ -f "$recipe" ]; then
+                    replaced="1"
+                    EvalExAuto "sed -i '"s:$oldchecksum:$newchecksum:"' "$recipe"" "Change checksum in $recipe to $newchecksum"
+                fi
+            done
+        fi
+    done
+    if [ $replaced != "1" ]
+        break
+    fi
 done
+