Card write all supported machines: Show progress

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

raspi-image-test-and-setup

@@ -7,8 +7,6 @@ Setup new image:
 * copy this file to /home/morona / open with gedit / setup colour theme
 
 As root:
-* systemctl disable systemd-networkd-wait-online.service
-* TODO systemctl disable brcm43438
 * systemctl disable serial-getty@ttyS0
 * systemctl disable serial-getty@ttyAMA0
 * create /home/<user>/.asoundrc with (soundcards can be sndrpihifiberry/audioinjectorpi...)

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

@@ -34,6 +34,8 @@ RDEPENDS_${PN} = " \
     chrpath \
     nodejs nodejs-npm nodejs-systemtap \
     \
+    ruby ruby-dev \
+    \
     libeigen-dev \
     \
     wireshark \
@@ -42,7 +44,7 @@ RDEPENDS_${PN} = " \
     \
     pulseview qtiohelper \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-microcontroller', 'meta-microcontroller-world', '', d)} \
 "
 

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

@@ -37,7 +37,7 @@ RDEPENDS_${PN} = " \
     \
     ${MACHINE_SPECIFICS_FULL} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox dosbox-x cage cass80 z80 vice stella opentyrian d1x-rebirth', '', d)} \
     \

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

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

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

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

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

@@ -12,7 +12,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # Feel free to add more...
 
 BOOTPARTSPEC = "boot,vfat BOOT,vfat"
-BOOTPARTSPEC_rpi = "raspberrypi,vfat"
+BOOTPARTSPEC_rpi = "rpi*,vfat"
 
 do_install () {
 	install -d ${D}${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,16 +99,24 @@ SelectCardDevice() {
 # DeployFileDir: Path of the file selected
 SelectDeployedFile() {
     if [ -z "$DeployedFile" ]; then
-        GetBitbakeEnvVar "TMPDIR"
+        if [ -z "$BITBAKE_TMPDIR" ]; then
-        _TMPDIR="$BitbakeEnvVar"
+            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
-        for FilePath in `find ${_TMPDIR}/deploy/images/${Machine} $FindString | sort` ; do
+        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?"
+        fi
+        
+        for FilePath in `find ${DeployPath} $FindString | sort` ; do
             iCount=`expr $iCount + 1`
             RootFileNameArr[${iCount}]="$FilePath"
-            FileSize=`du -Dh "$FilePath" | cut -f1`
+            FileSize=`du -Dbh "$FilePath" | cut -f1`
             menuitems+=( "$iCount" "`basename $FilePath` / size: $FileSize" )
         done
 

scripts/include/machine-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

@@ -18,7 +18,7 @@ RootCardWriteCallback() {
         # evt. write partition table
         CheckPartitionTable "$DevicePath"
         # write
-        EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "\nWrite $DeployedFile to $DevicePath..."
+        EvalExAuto "dd of=$DevicePath status=progress oflag=nocache if=$DeployedFile bs=1024K" "\nWrite $DeployedFile to $DevicePath..."
         # resize I
         EvalExAuto "parted -s $DevicePath -- resizepart 2 -0" "\nResize I ${DevicePath}2..."
         # resize II