multi-arch: Support vanilla Debian for 'amd64' and 'i386' architecture incl. loop_rootfs using grub (WIP)

- Generic packages: nn-packages[-RELEASE] (using the optional '-RELEASE' variant)

- System packages: nn-packages-sys-(raspi|debian)[-RELEASE] (using the optional '-RELEASE' variant),
  allow to distinguish not only for the RELEASE but the actual underlying distribution.

- On debian amd64, all required usb-storage etc modules are loaded for loop_rootfs/initrd

- loop_rootfs works on Raspi (Proprietary Bootloader) as well as on Debian (Grub Bootloader)

- loop_rootfs uses the first vfat block-device partition for /boot

- /boot will be mounted by loop_rootfs and handed over to new root-mount-point,
  this avoids issues of using an undefined /boot partition (but the first)

- rotatelog_init_rootfs: Rotates /boot/init_rootfs.log if having more than 500 lines

- FIX export-image: Copy the rootfs.img to the exported full image,
  which allows testing the image directly via qemu .. etc.

9 files changed, 82 insertions, 73 deletions

diff --git a/stage4/00-install-packages/00-packages-buster b/stage4/00-install-packages/00-packages
index d03d850..9a30477 100644
--- a/stage4/00-install-packages/00-packages-buster
+++ b/stage4/00-install-packages/00-packages
@@ -2,24 +2,17 @@ python python3-pygame python-pygame python-tk
 python3 python3-tk thonny
 python3-pgzero
 python-serial python3-serial
-#python-picamera python3-picamera
 debian-reference-en dillo
-raspberrypi-net-mods raspberrypi-ui-mods
 python-pip python3-pip
 python3-numpy
+pigpio python-pigpio python3-pigpio
 pypy
-alacarte rc-gui sense-hat
+alacarte
 tree
 libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
 geany
-piclone
-wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python3-rpi.gpio
-python-spidev python3-spidev
 python-twython python3-twython
 python-smbus python3-smbus
 python-flask python3-flask
-pprompt
-piwiz
-rp-prefapps
 ffmpeg
 vlc
diff --git a/stage4/00-install-packages/00-packages-bullseye b/stage4/00-install-packages/00-packages-bullseye
index 28322dc..1a186dc 100644
--- a/stage4/00-install-packages/00-packages-bullseye
+++ b/stage4/00-install-packages/00-packages-bullseye
@@ -4,22 +4,16 @@ python3-pgzero
 python3-serial
 #python3-picamera
 debian-reference-en dillo
-raspberrypi-net-mods raspberrypi-ui-mods
+pigpio python3-pigpio
 python3-pip
 python3-numpy
 pypy
-alacarte rc-gui sense-hat
+alacarte
 tree
 libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
 geany
-piclone
-wiringpi pigpio python3-pigpio raspi-gpio python3-rpi.gpio
-python3-spidev
 python3-twython
 python3-smbus
 python3-flask
-pprompt
-piwiz
-rp-prefapps
 ffmpeg
 vlc
diff --git a/stage4/00-install-packages/00-packages-sys-raspi b/stage4/00-install-packages/00-packages-sys-raspi
new file mode 100644
index 0000000..03657ee
--- /dev/null
+++ b/stage4/00-install-packages/00-packages-sys-raspi
@@ -0,0 +1,9 @@
+raspberrypi-net-mods raspberrypi-ui-mods
+#python-picamera python3-picamera
+piclone
+wiringpi raspi-gpio python3-rpi.gpio
+python-spidev python3-spidev
+alacarte rc-gui sense-hat
+pprompt
+piwiz
+rp-prefapps
diff --git a/stage4/00-install-packages/00-packages-sys-raspi-bullseye b/stage4/00-install-packages/00-packages-sys-raspi-bullseye
new file mode 100644
index 0000000..167f269
--- /dev/null
+++ b/stage4/00-install-packages/00-packages-sys-raspi-bullseye
@@ -0,0 +1,9 @@
+raspberrypi-net-mods raspberrypi-ui-mods
+#python-picamera python3-picamera
+piclone
+wiringpi raspi-gpio python3-rpi.gpio
+python3-spidev
+alacarte rc-gui sense-hat
+pprompt
+piwiz
+rp-prefapps
diff --git a/stage4/00-install-packages/01-packages b/stage4/00-install-packages/01-packages
new file mode 100644
index 0000000..fdf5e73
--- /dev/null
+++ b/stage4/00-install-packages/01-packages
@@ -0,0 +1,22 @@
+python-automationhat python3-automationhat
+python-blinkt python3-blinkt
+python-cap1xxx python3-cap1xxx
+python-drumhat python3-drumhat
+python-envirophat python3-envirophat
+python-explorerhat python3-explorerhat
+python-fourletterphat python3-fourletterphat
+python-microdotphat python3-microdotphat
+python-mote python3-mote
+python-motephat python3-motephat
+python-phatbeat python3-phatbeat
+python-pianohat python3-pianohat
+python-piglow python3-piglow
+python-rainbowhat python3-rainbowhat
+python-scrollphat python3-scrollphat
+python-scrollphathd python3-scrollphathd
+python-sn3218 python3-sn3218
+python-skywriter python3-skywriter
+python-touchphat python3-touchphat
+python-buttonshim python3-buttonshim
+python-unicornhathd  python3-unicornhathd
+python-pantilthat python3-pantilthat
diff --git a/stage4/00-install-packages/01-packages-bullseye b/stage4/00-install-packages/01-packages-bullseye
index fdf5e73..5441d9d 100644
--- a/stage4/00-install-packages/01-packages-bullseye
+++ b/stage4/00-install-packages/01-packages-bullseye
@@ -1,22 +1,22 @@
-python-automationhat python3-automationhat
-python-blinkt python3-blinkt
-python-cap1xxx python3-cap1xxx
-python-drumhat python3-drumhat
-python-envirophat python3-envirophat
-python-explorerhat python3-explorerhat
-python-fourletterphat python3-fourletterphat
-python-microdotphat python3-microdotphat
-python-mote python3-mote
-python-motephat python3-motephat
-python-phatbeat python3-phatbeat
-python-pianohat python3-pianohat
-python-piglow python3-piglow
-python-rainbowhat python3-rainbowhat
-python-scrollphat python3-scrollphat
-python-scrollphathd python3-scrollphathd
-python-sn3218 python3-sn3218
-python-skywriter python3-skywriter
-python-touchphat python3-touchphat
-python-buttonshim python3-buttonshim
-python-unicornhathd  python3-unicornhathd
-python-pantilthat python3-pantilthat
+python3-automationhat
+python3-blinkt
+python3-cap1xxx
+python3-drumhat
+python3-envirophat
+python3-explorerhat
+python3-fourletterphat
+python3-microdotphat
+python3-mote
+python3-motephat
+python3-phatbeat
+python3-pianohat
+python3-piglow
+python3-rainbowhat
+python3-scrollphat
+python3-scrollphathd
+python3-sn3218
+python3-skywriter
+python3-touchphat
+python3-buttonshim
+python3-unicornhathd
+python3-pantilthat
diff --git a/stage4/00-install-packages/01-packages-buster b/stage4/00-install-packages/01-packages-buster
deleted file mode 100644
index 5441d9d..0000000
--- a/stage4/00-install-packages/01-packages-buster
+++ /dev/null
@@ -1,22 +0,0 @@
-python3-automationhat
-python3-blinkt
-python3-cap1xxx
-python3-drumhat
-python3-envirophat
-python3-explorerhat
-python3-fourletterphat
-python3-microdotphat
-python3-mote
-python3-motephat
-python3-phatbeat
-python3-pianohat
-python3-piglow
-python3-rainbowhat
-python3-scrollphat
-python3-scrollphathd
-python3-sn3218
-python3-skywriter
-python3-touchphat
-python3-buttonshim
-python3-unicornhathd
-python3-pantilthat
diff --git a/stage4/03-bookshelf/00-run.sh b/stage4/03-bookshelf/00-run.sh
index 8244568..8f485f5 100755
--- a/stage4/03-bookshelf/00-run.sh
+++ b/stage4/03-bookshelf/00-run.sh
@@ -1,15 +1,17 @@
 #!/bin/sh -e
 
-BOOKSHELF_URL="https://magpi.raspberrypi.org/bookshelf.xml"
-GUIDE_URL="$(curl -s "$BOOKSHELF_URL" | awk -F '[<>]' "/<TITLE>Raspberry Pi Beginner's Guide 4th Edition<\/TITLE>/ {f=1; next} f==1 && /PDF/ {print \$3; exit}")"
-OUTPUT="$(basename "$GUIDE_URL" | cut -f1 -d'?')"
+if [ "${TARGET_RASPI}" = "1" ]; then
+    BOOKSHELF_URL="https://magpi.raspberrypi.org/bookshelf.xml"
+    GUIDE_URL="$(curl -s "$BOOKSHELF_URL" | awk -F '[<>]' "/<TITLE>Raspberry Pi Beginner's Guide 4th Edition<\/TITLE>/ {f=1; next} f==1 && /PDF/ {print \$3; exit}")"
+    OUTPUT="$(basename "$GUIDE_URL" | cut -f1 -d'?')"
 
-if [ ! -f "files/$OUTPUT" ]; then
-	rm files/*.pdf -f
-	curl -s "$GUIDE_URL" -o "files/$OUTPUT"
-fi
+    if [ ! -f "files/$OUTPUT" ]; then
+        rm files/*.pdf -f
+        curl -s "$GUIDE_URL" -o "files/$OUTPUT"
+    fi
 
-file "files/$OUTPUT" | grep -q "PDF document"
+    file "files/$OUTPUT" | grep -q "PDF document"
 
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf"
-install -v -o 1000 -g 1000 -m 644 "files/$OUTPUT" "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf/"
+    install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf"
+    install -v -o 1000 -g 1000 -m 644 "files/$OUTPUT" "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf/"
+fi
diff --git a/stage4/04-enable-xcompmgr/00-run.sh b/stage4/04-enable-xcompmgr/00-run.sh
index 6a56a82..74b912c 100755
--- a/stage4/04-enable-xcompmgr/00-run.sh
+++ b/stage4/04-enable-xcompmgr/00-run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -e
  
-on_chroot << EOF
-       raspi-config nonint do_xcompmgr 0
+if [ "${TARGET_RASPI}" = "1" ]; then
+    on_chroot << EOF
+           raspi-config nonint do_xcompmgr 0
 EOF
+fi