From 69fca6709e16005ecba6a6ebb5b12bdc1d4ca040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Sat, 3 Dec 2022 08:03:58 +0000
Subject: [PATCH] debian-installer: set arm to u-boot loader
---
helpers/make-debian-installer | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer
index cb19dec3..8f6eade5 100644
--- a/helpers/make-debian-installer
+++ b/helpers/make-debian-installer
@@ -54,13 +54,18 @@ LASTKERNEL=$(apt-cache show -c ${LOCAL_APT}/etc/apt_${CODENAME}.conf linux-libc-
#sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" ./build/config/amd64.cfg
##Optional
#sed -i '/KERNELNAME = vmlinuz/a #KERNELIMAGEVERSION = $(KERNELVERSION)' ./build/config/amd64.cfg
-for i in amd64 arm64 ppc64el
+for i in amd64 arm64 armhf ppc64el
do
find build/config/ -name $i.cfg | xargs sed -i "/# The version of the kernel to use./a BASEVERSION = $LASTKERNEL"
find build/config/ -name $i.cfg | xargs sed -i "s/^KERNELVERSION = .*/KERNELVERSION = \$(BASEVERSION)-generic/g"
find build/config/ -name $i.cfg | xargs sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g"
find build/config/ -name $i.cfg | xargs sed -i '/KERNELNAME = vmlinuz/a #KERNELIMAGEVERSION = $(KERNELVERSION)'
done
+#Limit arm to u-boot
+for i in arm64 armhf
+do
+find build/config/ -name $i.cfg | xargs sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = u-boot/g"
+done
##TODO: fix the EFI bootloader image
sed -i '/shim/s|signed|unsigned|g' debian/control
@@ -128,7 +133,7 @@ grep -rl TRISQUEL_VERSION |xargs sed -i "s|TRISQUEL_VERSION =.*|TRISQUEL_VERSION
# Disable proposed-updates patch
patch -p1 < $DATA/remove-proposed-updates.patch
-echo "# (Test) Remove gtk related packages, not looking for graphical installer"
+echo "# Remove gtk related packages, not looking for graphical installer"
rm $(find build/pkg-lists -type f -path "*/gtk/*")
echo "Remove unused modules from d-i pkg-list"
grep -rl acpi-modules- build/pkg-lists/ |xargs sed -i '/acpi-modules-/d'
@@ -150,6 +155,13 @@ sed -i '/Build-Depends:/a\\tliblzma5, liblz4-1,' debian/control
sed 's|/debian|/trisquel|' -i ./build/util/efi-image
sed 's|EFI/debian|EFI/trisquel|' -i ./build/config/arm.cfg ./build/config/x86.cfg
+## Set modules as optional
+### no arm support for netboot (yet?).
+#sed -i "/i2c-modules-/s|$| \?|" build/pkg-lists/netboot/armhf.cfg
+#sed -i "/mtd-modules-/s|$| \?|" build/pkg-lists/netboot/armhf.cfg
+
+#Fix u-boot naming debian>ubuntu
+sed -i 's|.imx|-dtb.imx|g' build/boot/arm/u-boot-image-config
+
changelog "Rebranded and adapted for Trisquel"
compile
-
--
GitLab