Merge branch 'master' into arm64

This commit is contained in:
Serge Schneider
2024-01-17 17:37:07 +00:00
7 changed files with 36 additions and 5 deletions

View File

@@ -14,8 +14,13 @@ fi
cat files/raspberrypi.gpg.key | gpg --dearmor > "${STAGE_WORK_DIR}/raspberrypi-archive-stable.gpg"
install -m 644 "${STAGE_WORK_DIR}/raspberrypi-archive-stable.gpg" "${ROOTFS_DIR}/etc/apt/trusted.gpg.d/"
on_chroot << EOF
dpkg --add-architecture armhf
apt-get update
apt-get dist-upgrade -y
on_chroot <<- \EOF
ARCH="$(dpkg --print-architecture)"
if [ "$ARCH" = "armhf" ]; then
dpkg --add-architecture arm64
elif [ "$ARCH" = "arm64" ]; then
dpkg --add-architecture armhf
fi
apt-get update
apt-get dist-upgrade -y
EOF

View File

@@ -1,3 +1,10 @@
#!/bin/bash -e
sed -i 's/^update_initramfs=.*/update_initramfs=no/' "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf"
if [ -f "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf" ]; then
sed -i 's/^update_initramfs=.*/update_initramfs=no/' "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf"
fi
if [ ! -f "${ROOTFS_DIR}/etc/kernel-img.conf" ]; then
echo "do_symlinks=0" > "${ROOTFS_DIR}/etc/kernel-img.conf"
fi
rm -f "${ROOTFS_DIR}/"{vmlinuz,initrd.img}*