From 73d99a9a9aa0dcae4736e07b5d3813b5ddf24674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Wed, 19 Oct 2022 18:30:23 +0000
Subject: [PATCH] base-installer: integrate udeb from debian upstream

---
 .../DATA/base-installer/{ => archs}/amd64.sh  |  0
 .../DATA/base-installer/{ => archs}/i386.sh   |  0
 .../base-installer/kernel_update_list.patch   | 21 ++++++
 helpers/make-base-installer                   | 73 ++++++++++++++++++-
 4 files changed, 90 insertions(+), 4 deletions(-)
 rename helpers/DATA/base-installer/{ => archs}/amd64.sh (100%)
 rename helpers/DATA/base-installer/{ => archs}/i386.sh (100%)
 create mode 100644 helpers/DATA/base-installer/kernel_update_list.patch

diff --git a/helpers/DATA/base-installer/amd64.sh b/helpers/DATA/base-installer/archs/amd64.sh
similarity index 100%
rename from helpers/DATA/base-installer/amd64.sh
rename to helpers/DATA/base-installer/archs/amd64.sh
diff --git a/helpers/DATA/base-installer/i386.sh b/helpers/DATA/base-installer/archs/i386.sh
similarity index 100%
rename from helpers/DATA/base-installer/i386.sh
rename to helpers/DATA/base-installer/archs/i386.sh
diff --git a/helpers/DATA/base-installer/kernel_update_list.patch b/helpers/DATA/base-installer/kernel_update_list.patch
new file mode 100644
index 0000000..76d4175
--- /dev/null
+++ b/helpers/DATA/base-installer/kernel_update_list.patch
@@ -0,0 +1,21 @@
+--- source/library.sh	2022-07-14 15:09:08.482389439 -0500
++++ source/library.sh_upd	2022-07-14 15:19:40.056073944 -0500
+@@ -345,9 +345,15 @@
+ 
+ kernel_update_list () {
+ 	# Use 'uniq' to avoid listing the same kernel more then once
+-	chroot /target apt-cache search "^(kernel|$KERNEL_NAME)-image" | \
+-	cut -d" " -f1 | grep -v "linux-image-2.6" | uniq > "$KERNEL_LIST.unfiltered"
+-	kernels=`sort -r "$KERNEL_LIST.unfiltered" | tr '\n' ' ' | sed -e 's/ $//'`
++	(set +e;
++	# Hack to get the metapackages in the right order; should be
++	# replaced by something better at some point.
++	chroot /target apt-cache search ^linux- | grep '^linux-\(amd64\|686\|k7\|generic\|lowlatency\|server\|virtual\|preempt\|rt\|xen\|oem-20.04\|power\|cell\|omap\|omap4\|keystone\)';
++	chroot /target apt-cache search ^linux-image- | grep -v '^linux-image-[2-9]\.';
++	chroot /target apt-cache search ^kfreebsd-image;
++	chroot /target apt-cache search ^gnumach-image) | \
++	cut -d" " -f1 | uniq > "$KERNEL_LIST.unfiltered"
++	kernels=`< "$KERNEL_LIST.unfiltered" tr '\n' ' ' | sed -e 's/ $//'`
+ 	for candidate in $kernels; do
+ 		if [ -n "$FLAVOUR" ]; then
+ 			if arch_check_usable_kernel "$candidate" "$FLAVOUR"; then
diff --git a/helpers/make-base-installer b/helpers/make-base-installer
index b105b07..7a9eb27 100644
--- a/helpers/make-base-installer
+++ b/helpers/make-base-installer
@@ -18,16 +18,81 @@
 #
 
 VERSION=3
+EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+REPOKEY=648ACFD622F3D138
 NETINST=true
 
 . ./config
 
-cp $DATA/* kernel/
+cp $DATA/archs/* kernel/
 
-sed s/KERNEL_PRIO=medium/KERNEL_PRIO=high/g library.sh -i
+#sed s/KERNEL_PRIO=medium/KERNEL_PRIO=high/g library.sh -i #already high
 
-sed 's/main,restricted/main/; s/ubuntu/trisquel/' -i library.sh ./debian/bootstrap-base.postinst
-sed 's/ubuntu-keyring/trisquel-keyring/' -i ./debian/control
+#sed 's/main,restricted/main/; s/ubuntu/trisquel/' -i library.sh ./debian/bootstrap-base.postinst
+sed 's/archive.gpg/trisquel-archive-keyring.gpg/' -i ./debian/bootstrap-base.postinst
+sed 's/debian-archive-keyring/trisquel-archive-keyring/' -i ./debian/control
+
+#Fix kernel detection
+patch -p1 < $DATA/kernel_update_list.patch
+cat << EOF > kernel/tests/amd64/cittagazze.test
+cpuinfo cittagazze.cpuinfo
+majors 2.6
+flavour amd64
+kernel-2.6 \
+  linux-generic \
+  linux-image-generic \
+  linux-generic-hwe-20.04 \
+  linux-image-generic-hwe-20.04 \
+  linux-lowlatency \
+  linux-image-lowlatency \
+  linux-lowlatency-hwe-20.04 \
+  linux-image-lowlatency-hwe-20.04 \
+  linux-oem-20.04 \
+  linux-image-oem-20.04 \
+  linux-virtual \
+  linux-image-virtual \
+  linux-image-extra-virtual \
+  linux-virtual-hwe-20.04 \
+  linux-image-virtual-hwe-20.04 \
+  linux-image-extra-virtual-hwe-20.04
+usable \
+  linux-generic \
+  linux-server \
+  linux-image-generic \
+  linux-image-server \
+  linux-image-2.6.20-15-generic \
+  linux-image-2.6.20-15-server
+EOF
+
+cat << EOF > kernel/tests/i386/cittagazze.test
+cpuinfo cittagazze.cpuinfo
+majors 2.6
+flavour 686-pae 686 586
+kernel-2.6 \
+  linux-generic \
+  linux-image-generic \
+  linux-virtual \
+  linux-image-virtual
+usable \
+  linux-generic \
+  linux-image-generic \
+  linux-image-586 \
+  linux-image-686 \
+  linux-image-686-pae \
+  linux-image-3.16-4-586 \
+  linux-image-2.6.25-1-686 \
+  linux-image-2.6.36-1-generic \
+  linux-image-2.6.38-1-686-pae
+unusable \
+  linux-image-amd64 \
+  linux-image-2.6.25-1-amd64 \
+  linux-image-686-pae-dbg \
+  linux-image-3.16-4-686-pae-dbg
+env KERNEL_FLAVOUR generic
+EOF
+
+#Temporary disable i386
+sed -i "/ARCHES =/s|i386 ||" kernel/Makefile
 
 changelog "Rebranded and adapted for Trisquel"
 compile