From e980d0a03bf1548eaab4d8a521ea8e2b0c722c75 Mon Sep 17 00:00:00 2001
From: Anupam Basak <anupam.basak27@gmail.com>
Date: Tue, 4 Jun 2024 11:50:34 +0530
Subject: [PATCH] Adjust rpi-update parameters and minor fixes
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c88549b..ef67bd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,7 @@ build-zynthbox-image-armhf:
- echo "# Update and install dependencies"
- apt-get update
- apt-get install -y coreutils p7zip-full qemu-user-static sudo git wget curl python3 lsof fdisk xz-utils openssh-client jq zip binutils kmod
+ - 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
@@ -38,11 +39,10 @@ build-zynthbox-image-armhf:
- sudo mount --bind /dev/pts $mountdir/dev/pts
- sudo mount --bind /proc $mountdir/proc
- sudo mount --bind /sys $mountdir/sys
+ - 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 curl -L --output /usr/bin/rpi-update https://raw.githubusercontent.com/raspberrypi/rpi-update/master/rpi-update && sudo chmod +x /usr/bin/rpi-update
- - sudo SKIP_WARNING=1 ROOT_PATH=$mountdir BOOT_PATH=$mountdir/boot WANT_32BIT=1 WANT_64BIT=0 WANT_PI4=0 WANT_PI5=1 rpi-update
- # - 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*"
+ - 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
@@ -100,21 +100,21 @@ build-zynthbox-image-armhf:
- sudo mount --bind /proc $mountdir/proc
- sudo mount --bind /sys $mountdir/sys
- sudo chroot $mountdir apt install zynthbox-z2-setup
- - sudo chroot $mountdir apt -y clean
- - sudo chroot $mountdir rm -rf /var/lib/apt/lists/*
- |
set -x
cat << EOF | sudo chroot $mountdir
cd /zynthian
rm -rf zynthbox-qml
git clone https://github.com/zynthbox/zynthbox-qml.git -b dev-rpi5
- apt install libgpiod-dev
+ apt -yy install libgpiod-dev
git clone https://github.com/zynthbox/zyncoder.git -b dev-rpi5-libgpiod
mkdir -p zyncoder/build
cd zyncoder/build
ZYNTHIAN_WIRING_LAYOUT="Z2_V2" cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
make -j4 install
EOF
+ - sudo chroot $mountdir apt -y clean
+ - sudo chroot $mountdir rm -rf /var/lib/apt/lists/*
- sudo umount $mountdir/boot/ $mountdir/dev/pts $mountdir/dev/ $mountdir/proc/ $mountdir/sys/
- sudo umount $mountdir
# Compress miko image
--
GitLab