Update to build a bookworm image (#2)

* updated to bookworm builder

* Install correct build process deps for bookworm (read deps from file)

* Update allow downgrades patch for recent pi-gen

* Switch used cloudsmith repo to bookwork

* Changed used base package (php version, wayfire and drop libsgutils2)

* Update moode specific packages where need and temp commented moode-player package

* Disabled driver install until those are available

* Aslong as no moode-player package is available temporary rename image to moode9-dev

Author: bitkeeper

build.sh

@@ -6,6 +6,10 @@
 # (C) bitkeeper 2022 http://moodeaudio.org
 # License: GPLv3
 #
+# 2023:
+# updated for bookworm
+# auto depend install from depends file
+#
 #########################################################################
 
 ROOT_PATH=`pwd`
@@ -22,8 +26,10 @@ echo "$IS_ARM64"
 if [ -z "$IS_ARM64" ]
 then
     PI_GEN="$ROOT_PATH/pi-gen"
+    echo "building 32 bit"
 else
     PI_GEN="$ROOT_PATH/pi-gen-64"
+    echo "building 64 bit"
 fi
 PI_GEN_UTILS="$ROOT_PATH/pi-gen-utils"
 
@@ -33,22 +39,34 @@ PI_GEN_CONFIG_DIR="moode-cfg"
 PP=$PI_GEN
 
 function prepare_environment {
-    array=( git coreutils quilt parted qemu-user-static debootstrap zerofree zip dosfstools libcap2-bin grep rsync xz-utils file git curl bc libarchive-tools qemu-utils kpartx )
+    # read deps for this build and strip categories
+    readarray -t DEPENDS <  $PI_GEN/depends
+    count=0
+    for d in "${DEPENDS[@]}"
+    do
+    DEPENDS["$count"]=`echo $d | cut -d ":" -f2`
+    count=$((count + 1))
+    done
+    echo ${DEPENDS[@]}
+
+    # check if present
     missing=0
-    for i in "${array[@]}"
+    for i in "${DEPENDS[@]}"
     do
         dpkg -s $i 2>&1 | grep Status | grep "installed" > /dev/null 2>&1
         if [[ ! $? -eq 0 ]]
         then
+            echo "missing $i"
             missing=1
             break
         fi
 
     done
 
+    #if not install the deps
     if [ $missing -eq 1 ]
     then
-        sudo apt-get -y install coreutils quilt parted qemu-user-static debootstrap zerofree zip dosfstools libcap2-bin grep rsync xz-utils file git curl bc libarchive-tools qemu-utils kpartx
+        echo ${DEPENDS[@]} | xargs sudo apt-get -y install
     fi
 
     git submodule init

moode-cfg/config

@@ -1,8 +1,8 @@
-IMG_NAME=moode-r839
-RELEASE=bullseye
+IMG_NAME=moode-r900-dev~pre1
+RELEASE=bookworm
 DEPLOY_ZIP=1
 LOCALE_DEFAULT=en_US.UTF-8
-TARGET_HOSTNAME=moode
+TARGET_HOSTNAME=moode9dev
 KEYBOARD_KEYMAP=us
 KEYBOARD_LAYOUT="English (US)"
 TIMEZONE_DEFAULT=America/Detroit

moode-cfg/stage2_04-moode-install_01-packages

@@ -27,7 +27,7 @@ libgudev-1.0-0
 libmediainfo0v5
 libmms0
 libnss-winbind
-libsgutils2-2
+# libsgutils2
 libtool-bin
 libzen0v5
 lsb-release
@@ -38,7 +38,7 @@ ntfs-3g
 php-fpm
 php-sqlite3
 php-yaml
-php7.4-gd
+php8.2-gd
 pi-bluetooth
 python3-dbus
 python3-matplotlib
@@ -58,7 +58,8 @@ systemd-timesyncd
 telnet
 triggerhappy
 winbind
+wayfire
 xfsprogs
-xinit
-xorg
+# xinit
+# xorg
 zip

moode-cfg/stage3_00-moode-install-prereq_00-run-chroot.sh

@@ -12,7 +12,7 @@ echo "Installing cloudsmith repository"
 
 curl -1sLf \
 'https://dl.cloudsmith.io/public/moodeaudio/m8y/setup.deb.sh' \
-| sudo -E distro=raspbian codename=bullseye bash
+| sudo -E distro=raspbian codename=bookworm bash
 
 echo "Update package lists"
 apt-get update

moode-cfg/stage3_01-moode-install_01-packages

@@ -4,10 +4,11 @@
 # The deps of moode-player are automatic installed
 # But by mentioning those explicit we can set an exact version
 #
-moode-player=8.3.9-1moode1
+# TODO: add moode-player package
+# moode-player=9.0.0-1moode1~pre1
 alsa-cdsp=1.2.0-1moode1
 alsacap=1.0.1-1moode1
-ashuffle=3.12.8-1moode1
+ashuffle=3.14.1-1moode1
 bluez-alsa-utils=4.1.0-2moode2
 boss2-oled-p3=1.0.0-1moode1
 camilladsp=2.0.1-1moode1

moode-cfg/stage3_02-moode-install-post_00-run-chroot.sh

@@ -8,36 +8,17 @@
 #
 #########################################################################
 
-# Kernel hashes for rpi-update
-# r810p: 5.15.32 stock raspberrypi-kernel1:1.20220331-1
-# r801: 5.15.28 87c6654a59e0ae6d09869fffceb44c5c698a7d83
-# r800: 5.15.23 9e99d81910722b6f2e086f6d14e592f292bcbb8b
-
-# Install kernel from rpi-update
-#echo "y" | sudo PRUNE_MODULES=1 rpi-update 87c6654a59e0ae6d09869fffceb44c5c698a7d83
-
-# Install kernel from package
-# uname -r| grep 5.15.32
-# if [ -n $? ]
-# then
-    # Expected it to be te current kernel else abort
-    # exit 1
-    # TODO:
-    # Make it more flex then just an abort.
-    # Installing kernel like below wouldn't be enough:
-    # apt install raspberrypi-kernel1:1.20220331-1
-    # Also other kernels should be removed and purged.
-    # Will write that code when we actually run in this situation.
-# fi
-
 # Install matching kernel drivers
 # NOTE: Starting with kernel 6.1.y the custom Allo ASIX ax88179 driver is no longer installed
 # due to build breakage in the driver which has been unmaintained since mid-2022. Instead the
 # stock ASIX ax88179 driver is used.
-KERNEL_VER=$(basename `ls -d /lib/modules/*-v8+` | sed -r "s/([0-9.]*)[-].*/\1/")
-echo "Kernel $KERNEL_VER detected, try to install drivers"
-apt-get install -y "aloop-$KERNEL_VER" "pcm1794a-$KERNEL_VER" "rtl88xxau-$KERNEL_VER"
+
+#TODO: fix driver install
+# KERNEL_VER=$(basename `ls -d /lib/modules/*-v8+` | sed -r "s/([0-9.]*)[-].*/\1/")
+# echo "Kernel $KERNEL_VER detected, try to install drivers"
+# apt-get install -y "aloop-$KERNEL_VER" "pcm1794a-$KERNEL_VER" "rtl88xxau-$KERNEL_VER"
 
 # Lock important package from upgrades etc
 echo "Post moode-player install"
-sudo moode-apt-mark hold
+#TODO: uncomment moode-apt-mark when moode-player package is also installed
+# sudo moode-apt-mark hold

pi-gen

@@ -6,17 +6,17 @@ index f743e2a..4072fa1 100755
  			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")"
  			if [ -n "$PACKAGES" ]; then
  				on_chroot << EOF
--apt-get -o APT::Acquire::Retries=3 install --no-install-recommends -y $PACKAGES
-+apt-get -o APT::Acquire::Retries=3 install --no-install-recommends --allow-downgrades -y $PACKAGES
+-apt-get -o Acquire::Retries=3 install --no-install-recommends -y $PACKAGES
++apt-get -o Acquire::Retries=3 install --no-install-recommends --allow-downgrades -y $PACKAGES
  EOF
  				if [ "${USE_QCOW2}" = "1" ]; then
  					on_chroot << EOF
 @@ -36,7 +36,7 @@ EOF
  			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")"
  			if [ -n "$PACKAGES" ]; then
  				on_chroot << EOF
--apt-get -o APT::Acquire::Retries=3 install -y $PACKAGES
-+apt-get -o APT::Acquire::Retries=3 install --allow-downgrades -y $PACKAGES
+-apt-get -o Acquire::Retries=3 install -y $PACKAGES
++apt-get -o Acquire::Retries=3 install --allow-downgrades -y $PACKAGES
  EOF
  				if [ "${USE_QCOW2}" = "1" ]; then
  					on_chroot << EOF