From 81b10dcef0f497e0f0bf4f0542cffd8789ee7aee Mon Sep 17 00:00:00 2001
From: Anupam Basak <anupam.basak27@gmail.com>
Date: Thu, 6 Jun 2024 17:18:51 +0530
Subject: [PATCH] Update kernels with rpi-update

---
 .gitlab-ci.yml | 46 ++++++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdfb7a6..c0149c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,41 +31,30 @@ build-zynthbox-image-armhf:
     - sudo curl -L --output /usr/bin/rpi-update https://raw.githubusercontent.com/raspberrypi/rpi-update/master/rpi-update && sudo chmod +x /usr/bin/rpi-update
 
     # Build custom base image with Low Latency Kernel
-    - wget -c --trust-server-names 'https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2024-03-15/2024-03-15-raspios-bookworm-armhf-lite.img.xz' -O ./raspios-${debian_release_name}-armhf-lite.img.xz
-    - xz -dv ./raspios-${debian_release_name}-armhf-lite.img.xz
+    # - wget -c --trust-server-names 'https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2024-03-15/2024-03-15-raspios-bookworm-armhf-lite.img.xz' -O ./raspios-${debian_release_name}-armhf-lite.img.xz
+    # - xz -dv ./raspios-${debian_release_name}-armhf-lite.img.xz
     - sudo mount -o loop,offset=$(get_partition_start_offset root ./raspios-${debian_release_name}-armhf-lite.img),sizelimit=$(get_partition_size root ./raspios-${debian_release_name}-armhf-lite.img) ./raspios-${debian_release_name}-armhf-lite.img $mountdir
     - sudo mount -o loop,offset=$(get_partition_start_offset boot ./raspios-${debian_release_name}-armhf-lite.img),sizelimit=$(get_partition_size boot ./raspios-${debian_release_name}-armhf-lite.img) ./raspios-${debian_release_name}-armhf-lite.img $mountdir/boot
     - sudo mount --bind /dev $mountdir/dev
     - sudo mount --bind /dev/pts $mountdir/dev/pts
     - sudo mount --bind /proc $mountdir/proc
     - sudo mount --bind /sys $mountdir/sys
-    # - |
-    #   set -x
-    #   cat << EOF | sudo chroot $mountdir
-    #   cd /boot
-    #   rm -rf ./*
-    #   wget https://www.opencode.net/zynthbox/zynthbox-image-builder/uploads/c8e820c544b0fc0e90be8db4f6d247e7/rpi5-miko-firmware.zip
-    #   unzip rpi5-miko-firmware.zip
-    #   rm rpi5-miko-firmware.zip
-    #   ls -al ./
-    #   EOF
-    # - echo "# Cleaning up old and unused kernels"
-    # - sudo chroot $mountdir apt -yy remove "linux-headers-6.6.2*" "linux-image-6.6.2*" "linux-headers-rpi-v*" "linux-image-rpi-v*" "linux-kbuild-6.6.2*"
+    - echo "# Cleaning up old and unused kernels"
+    - sudo chroot $mountdir apt -yy remove "linux-headers-6.6.2*" "linux-image-6.6.2*" "linux-headers-rpi-v*" "linux-image-rpi-v*" "linux-kbuild-6.6.2*"
     # - echo "# Updating firmware and bootloader"
-    # - sudo SKIP_WARNING=1 SKIP_BACKUP=1 ROOT_PATH=$mountdir BOOT_PATH=$mountdir/boot WANT_32BIT=1 WANT_64BIT=0 WANT_PI4=0 WANT_PI5=1 rpi-update
-    - echo "# Installing kernel ${KERN}"
-    - sudo chroot $mountdir wget https://github.com/kdoren/linux/releases/download/rpi_6.1.54/linux-headers-6.1.54-llat-v7l+_6.1.54-1_armhf.deb
-    - sudo chroot $mountdir wget https://github.com/kdoren/linux/releases/download/rpi_6.1.54/linux-image-6.1.54-llat-v7l+_6.1.54-1_armhf.deb
-    - sudo chroot $mountdir wget https://github.com/kdoren/linux/releases/download/rpi_6.1.54/linux-libc-dev_6.1.54-1_armhf.deb
-    - sudo chroot $mountdir bash -c 'dpkg -i *.deb'
-    - sudo chroot $mountdir bash -c 'rm -v *.deb'
-    - sudo chroot $mountdir mkdir -p /boot/$KERN/overlays/
-    - sudo chroot $mountdir bash -c "cp -d /usr/lib/linux-image-$KERN/overlays/* /boot/$KERN/overlays/"
-    - sudo chroot $mountdir bash -c "cp -dr /usr/lib/linux-image-$KERN/* /boot/$KERN/"
-    - sudo chroot $mountdir touch /boot/$KERN/overlays/README
-    - sudo chroot $mountdir mv /boot/vmlinuz-$KERN /boot/$KERN/
-    - sudo chroot $mountdir mv /boot/System.map-$KERN /boot/$KERN/
-    - sudo chroot $mountdir cp /boot/config-$KERN /boot/$KERN/
+    # - echo "# Installing kernel ${KERN}"
+    # - sudo chroot $mountdir wget https://github.com/kdoren/linux/releases/download/rpi_6.1.54/linux-headers-6.1.54-llat-v7l+_6.1.54-1_armhf.deb
+    # - sudo chroot $mountdir wget https://github.com/kdoren/linux/releases/download/rpi_6.1.54/linux-image-6.1.54-llat-v7l+_6.1.54-1_armhf.deb
+    # - sudo chroot $mountdir wget https://github.com/kdoren/linux/releases/download/rpi_6.1.54/linux-libc-dev_6.1.54-1_armhf.deb
+    # - sudo chroot $mountdir bash -c 'dpkg -i *.deb'
+    # - sudo chroot $mountdir bash -c 'rm -v *.deb'
+    # - sudo chroot $mountdir mkdir -p /boot/$KERN/overlays/
+    # - sudo chroot $mountdir bash -c "cp -d /usr/lib/linux-image-$KERN/overlays/* /boot/$KERN/overlays/"
+    # - sudo chroot $mountdir bash -c "cp -dr /usr/lib/linux-image-$KERN/* /boot/$KERN/"
+    # - sudo chroot $mountdir touch /boot/$KERN/overlays/README
+    # - sudo chroot $mountdir mv /boot/vmlinuz-$KERN /boot/$KERN/
+    # - sudo chroot $mountdir mv /boot/System.map-$KERN /boot/$KERN/
+    # - sudo chroot $mountdir cp /boot/config-$KERN /boot/$KERN/
     - sudo umount $mountdir/boot/ $mountdir/dev/pts $mountdir/dev/ $mountdir/proc/ $mountdir/sys/
     - sudo umount $mountdir
     - zip ./raspios-${debian_release_name}-armhf-lite.img.zip ./raspios-${debian_release_name}-armhf-lite.img
@@ -122,6 +111,7 @@ build-zynthbox-image-armhf:
       cd zyncoder/build
       ZYNTHIAN_WIRING_LAYOUT="Z2_V3" cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
       make -j4 install
+      SKIP_WARNING=1 SKIP_BACKUP=1 rpi-update
       EOF
     - sudo chroot $mountdir apt -y clean
     - sudo chroot $mountdir rm -rf /var/lib/apt/lists/*
-- 
GitLab