base-installer: TESTING release
This commit is contained in:
Luis Guzmán
parent
ad5b3debda
commit
ac94a07ee2
7 changed files with 383 additions and 29 deletions
|
|
@ -0,0 +1,21 @@
|
|||
--- a/library.sh 2022-07-14 15:09:08.482389439 -0500
|
||||
+++ b/library.sh 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
|
||||
|
|
@ -0,0 +1,108 @@
|
|||
diff --git a/kernel/arm64.sh b/kernel/arm64.sh
|
||||
index a5a5ec4a..9d5e07b4 100644
|
||||
--- a/kernel/arm64.sh
|
||||
+++ b/kernel/arm64.sh
|
||||
@@ -1,5 +1,8 @@
|
||||
+# Adjusted for Trisquel: use 'generic' flavour on all supported architectures,
|
||||
+# matching Ubuntu's kernel packaging.
|
||||
+
|
||||
arch_get_kernel_flavour () {
|
||||
- echo "arm64"
|
||||
+ echo "generic"
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -15,5 +18,5 @@ arch_check_usable_kernel () {
|
||||
}
|
||||
|
||||
arch_get_kernel () {
|
||||
- echo "linux-image-arm64"
|
||||
+ echo "linux-image-generic"
|
||||
}
|
||||
diff --git a/kernel/armhf.sh b/kernel/armhf.sh
|
||||
index 389a416d..b998770e 100644
|
||||
--- a/kernel/armhf.sh
|
||||
+++ b/kernel/armhf.sh
|
||||
@@ -1,3 +1,6 @@
|
||||
+# Adjusted for Trisquel: use 'generic' flavour on all supported architectures,
|
||||
+# matching Ubuntu's kernel packaging.
|
||||
+
|
||||
arch_has_lpae () {
|
||||
if grep -q '^Features.*\blpae\b' "$CPUINFO"; then
|
||||
echo y
|
||||
@@ -8,16 +11,13 @@ arch_has_lpae () {
|
||||
|
||||
arch_get_kernel_flavour () {
|
||||
case "$SUBARCH" in
|
||||
- omap|mx5|vexpress)
|
||||
- echo "$SUBARCH armmp"
|
||||
- return 0 ;;
|
||||
generic|efi)
|
||||
case `arch_has_lpae` in
|
||||
y)
|
||||
- echo "armmp-lpae armmp"
|
||||
+ echo "generic-lpae generic"
|
||||
;;
|
||||
n)
|
||||
- echo "armmp"
|
||||
+ echo "generic"
|
||||
;;
|
||||
esac
|
||||
return 0 ;;
|
||||
diff --git a/kernel/ppc64el.sh b/kernel/ppc64el.sh
|
||||
index f21bdab2..2a5a0c5a 100644
|
||||
--- a/kernel/ppc64el.sh
|
||||
+++ b/kernel/ppc64el.sh
|
||||
@@ -1,5 +1,8 @@
|
||||
+# Adjusted for Trisquel: use 'generic' flavour on all supported architectures,
|
||||
+# matching Ubuntu's kernel packaging.
|
||||
+
|
||||
arch_get_kernel_flavour () {
|
||||
- echo powerpc64le
|
||||
+ echo generic
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -8,5 +11,5 @@ arch_check_usable_kernel () {
|
||||
}
|
||||
|
||||
arch_get_kernel () {
|
||||
- echo "linux-image-powerpc64le"
|
||||
+ echo "linux-image-generic"
|
||||
}
|
||||
diff --git a/kernel/riscv64.sh b/kernel/riscv64.sh
|
||||
index 9fa410e0..982555ef 100644
|
||||
--- a/kernel/riscv64.sh
|
||||
+++ b/kernel/riscv64.sh
|
||||
@@ -4,10 +4,13 @@
|
||||
|
||||
# The riscv64 architecture has only a single unified multiplatform kernel
|
||||
# (which uses "riscv64" as its flavour name). Therefore we don't need to
|
||||
-# differentiate between multiple flavours here.
|
||||
+# differentiate between multiple flavours here. (Debian)
|
||||
+
|
||||
+## Adjusted for Trisquel: use 'generic' flavour on all supported architectures,
|
||||
+## matching Ubuntu's kernel packaging.
|
||||
|
||||
arch_get_kernel_flavour () {
|
||||
- echo riscv64
|
||||
+ echo generic
|
||||
}
|
||||
|
||||
arch_check_usable_kernel () {
|
||||
@@ -17,7 +20,7 @@ arch_check_usable_kernel () {
|
||||
# Don't show debug packages in the kernel selection list.
|
||||
return 1
|
||||
;;
|
||||
- *-riscv64 | *-riscv64-*)
|
||||
+ *-generic | *-generic-*)
|
||||
return 0
|
||||
;;
|
||||
*)
|
||||
@@ -28,5 +31,5 @@ arch_check_usable_kernel () {
|
||||
|
||||
arch_get_kernel () {
|
||||
# parameters: $1=flavour
|
||||
- echo "linux-image-riscv64"
|
||||
+ echo "linux-image-generic"
|
||||
}
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff --git a/kernel/tests/arm64/foundation.test b/kernel/tests/arm64/foundation.test
|
||||
index 30027845..882eb192 100644
|
||||
--- a/kernel/tests/arm64/foundation.test
|
||||
+++ b/kernel/tests/arm64/foundation.test
|
||||
@@ -1,12 +1,12 @@
|
||||
subarch generic
|
||||
cpuinfo foundation.cpuinfo
|
||||
-flavour arm64
|
||||
+flavour generic
|
||||
majors 3.10
|
||||
machine aarch64
|
||||
kernel-3.10 \
|
||||
- linux-image-arm64
|
||||
+ linux-image-generic
|
||||
usable \
|
||||
- linux-image-arm64 \
|
||||
- linux-image-3.14-1-arm64
|
||||
+ linux-image-generic \
|
||||
+ linux-image-3.14-1-generic
|
||||
unusable \
|
||||
- linux-image-3.14-1-arm64-dbg
|
||||
+ linux-image-3.14-1-generic-dbg
|
||||
diff --git a/kernel/tests/arm64/mustang.test b/kernel/tests/arm64/mustang.test
|
||||
index 80ab19f7..e58c06aa 100644
|
||||
--- a/kernel/tests/arm64/mustang.test
|
||||
+++ b/kernel/tests/arm64/mustang.test
|
||||
@@ -1,12 +1,12 @@
|
||||
subarch generic
|
||||
cpuinfo mustang.cpuinfo
|
||||
-flavour arm64
|
||||
+flavour generic
|
||||
majors 3.10
|
||||
machine aarch64
|
||||
kernel-3.10 \
|
||||
- linux-image-arm64
|
||||
+ linux-image-generic
|
||||
usable \
|
||||
- linux-image-arm64 \
|
||||
- linux-image-3.14-1-arm64
|
||||
+ linux-image-generic \
|
||||
+ linux-image-3.14-1-generic
|
||||
unusable \
|
||||
- linux-image-3.14-1-arm64-dbg
|
||||
+ linux-image-3.14-1-generic-dbg
|
||||
diff --git a/kernel/tests/arm64/qemu-virt.test b/kernel/tests/arm64/qemu-virt.test
|
||||
index 87c39c47..2d880f5c 100644
|
||||
--- a/kernel/tests/arm64/qemu-virt.test
|
||||
+++ b/kernel/tests/arm64/qemu-virt.test
|
||||
@@ -1,12 +1,12 @@
|
||||
subarch generic
|
||||
cpuinfo qemu-virt.cpuinfo
|
||||
-flavour arm64
|
||||
+flavour generic
|
||||
majors 3.10
|
||||
machine aarch64
|
||||
kernel-3.10 \
|
||||
- linux-image-arm64
|
||||
+ linux-image-generic
|
||||
usable \
|
||||
- linux-image-arm64 \
|
||||
- linux-image-3.14-1-arm64
|
||||
+ linux-image-generic \
|
||||
+ linux-image-3.14-1-generic
|
||||
unusable \
|
||||
- linux-image-3.14-1-arm64-dbg
|
||||
+ linux-image-3.14-1-generic-dbg
|
||||
|
|
@ -0,0 +1,143 @@
|
|||
diff --git a/kernel/tests/armhf/efikamx.test b/kernel/tests/armhf/efikamx.test
|
||||
deleted file mode 100644
|
||||
index 3fa4eeef..00000000
|
||||
--- a/kernel/tests/armhf/efikamx.test
|
||||
+++ /dev/null
|
||||
@@ -1,19 +0,0 @@
|
||||
-subarch mx5
|
||||
-cpuinfo efikamx.cpuinfo
|
||||
-majors 5.7
|
||||
-flavour mx5 armmp
|
||||
-kernel-5.7 linux-image-mx5 linux-image-armmp
|
||||
-usable \
|
||||
- linux-image-mx5 \
|
||||
- linux-image-5.7.0-1-mx5 \
|
||||
- linux-image-armmp \
|
||||
- linux-image-5.7.0-1-armmp
|
||||
-unusable \
|
||||
- linux-image-armmp-lpae \
|
||||
- linux-image-netwinder \
|
||||
- linux-image-orion5x \
|
||||
- linux-image-rpc \
|
||||
- linux-image-s3c2410 \
|
||||
- linux-image-kirkwood \
|
||||
- linux-image-vexpress \
|
||||
- linux-image-5.7.0-1-armmp-dbg
|
||||
diff --git a/kernel/tests/armhf/highbank.test b/kernel/tests/armhf/highbank.test
|
||||
index 1f68d466..37a42821 100644
|
||||
--- a/kernel/tests/armhf/highbank.test
|
||||
+++ b/kernel/tests/armhf/highbank.test
|
||||
@@ -1,14 +1,14 @@
|
||||
subarch generic
|
||||
cpuinfo highbank.cpuinfo
|
||||
majors 5.7
|
||||
-flavour armmp
|
||||
+flavour generic
|
||||
kernel-5.7 \
|
||||
- linux-image-armmp
|
||||
+ linux-image-generic
|
||||
usable \
|
||||
- linux-image-armmp \
|
||||
- linux-image-5.7.0-1-armmp
|
||||
+ linux-image-generic \
|
||||
+ linux-image-5.7.0-1-generic
|
||||
unusable \
|
||||
- linux-image-armmp-lpae \
|
||||
+ linux-image-generic-lpae \
|
||||
linux-image-netwinder \
|
||||
linux-image-orion5x \
|
||||
linux-image-rpc \
|
||||
@@ -16,4 +16,4 @@ unusable \
|
||||
linux-image-kirkwood \
|
||||
linux-image-mx5 \
|
||||
linux-image-vexpress \
|
||||
- linux-image-5.7.0-1-armmp-dbg
|
||||
+ linux-image-5.7.0-1-generic-dbg
|
||||
diff --git a/kernel/tests/armhf/midway-no-lpae.test b/kernel/tests/armhf/midway-no-lpae.test
|
||||
index 04db5356..056ff08f 100644
|
||||
--- a/kernel/tests/armhf/midway-no-lpae.test
|
||||
+++ b/kernel/tests/armhf/midway-no-lpae.test
|
||||
@@ -1,14 +1,14 @@
|
||||
subarch generic
|
||||
cpuinfo midway-no-lpae.cpuinfo
|
||||
majors 5.7
|
||||
-flavour armmp
|
||||
+flavour generic
|
||||
kernel-5.7 \
|
||||
- linux-image-armmp
|
||||
+ linux-image-generic
|
||||
usable \
|
||||
- linux-image-armmp \
|
||||
- linux-image-5.7.0-1-armmp
|
||||
+ linux-image-generic \
|
||||
+ linux-image-5.7.0-1-generic
|
||||
unusable \
|
||||
- linux-image-armmp-lpae \
|
||||
+ linux-image-generic-lpae \
|
||||
linux-image-netwinder \
|
||||
linux-image-orion5x \
|
||||
linux-image-rpc \
|
||||
@@ -16,4 +16,4 @@ unusable \
|
||||
linux-image-kirkwood \
|
||||
linux-image-mx5 \
|
||||
linux-image-vexpress \
|
||||
- linux-image-5.7.0-1-armmp-dbg
|
||||
+ linux-image-5.7.0-1-generic-dbg
|
||||
diff --git a/kernel/tests/armhf/midway.test b/kernel/tests/armhf/midway.test
|
||||
index 6a789a1b..a5213a4a 100644
|
||||
--- a/kernel/tests/armhf/midway.test
|
||||
+++ b/kernel/tests/armhf/midway.test
|
||||
@@ -1,15 +1,15 @@
|
||||
subarch generic
|
||||
cpuinfo midway.cpuinfo
|
||||
majors 5.7
|
||||
-flavour armmp-lpae armmp
|
||||
+flavour generic-lpae generic
|
||||
kernel-5.7 \
|
||||
- linux-image-armmp-lpae \
|
||||
- linux-image-armmp
|
||||
+ linux-image-generic-lpae \
|
||||
+ linux-image-generic
|
||||
usable \
|
||||
- linux-image-armmp \
|
||||
- linux-image-5.7.0-1-armmp \
|
||||
- linux-image-armmp-lpae \
|
||||
- linux-image-5.7.0-1-armmp-lpae
|
||||
+ linux-image-generic \
|
||||
+ linux-image-5.7.0-1-generic \
|
||||
+ linux-image-generic-lpae \
|
||||
+ linux-image-5.7.0-1-generic-lpae
|
||||
unusable \
|
||||
linux-image-netwinder \
|
||||
linux-image-orion5x \
|
||||
@@ -18,4 +18,4 @@ unusable \
|
||||
linux-image-kirkwood \
|
||||
linux-image-mx5 \
|
||||
linux-image-vexpress \
|
||||
- linux-image-5.7.0-1-armmp-dbg
|
||||
+ linux-image-5.7.0-1-generic-dbg
|
||||
diff --git a/kernel/tests/armhf/vexpress.test b/kernel/tests/armhf/vexpress.test
|
||||
deleted file mode 100644
|
||||
index 19d38dd4..00000000
|
||||
--- a/kernel/tests/armhf/vexpress.test
|
||||
+++ /dev/null
|
||||
@@ -1,19 +0,0 @@
|
||||
-subarch vexpress
|
||||
-cpuinfo vexpress.cpuinfo
|
||||
-majors 5.7
|
||||
-flavour vexpress armmp
|
||||
-kernel-5.7 linux-image-vexpress linux-image-armmp
|
||||
-usable \
|
||||
- linux-image-vexpress \
|
||||
- linux-image-3.2.0-4-vexpress \
|
||||
- linux-image-armmp \
|
||||
- linux-image-5.7.0-1-armmp
|
||||
-unusable \
|
||||
- linux-image-armmp-lpae \
|
||||
- linux-image-netwinder \
|
||||
- linux-image-orion5x \
|
||||
- linux-image-rpc \
|
||||
- linux-image-s3c2410 \
|
||||
- linux-image-kirkwood \
|
||||
- linux-image-mx5 \
|
||||
- linux-image-5.7.0-1-armmp-dbg
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
diff --git a/kernel/tests/ppc64el/postal.test b/kernel/tests/ppc64el/postal.test
|
||||
index 9878d14f..33f7c0e3 100644
|
||||
--- a/kernel/tests/ppc64el/postal.test
|
||||
+++ b/kernel/tests/ppc64el/postal.test
|
||||
@@ -1,9 +1,9 @@
|
||||
subarch chrp_ibm
|
||||
cpuinfo postal.cpuinfo
|
||||
majors 5.7
|
||||
-flavour powerpc64le
|
||||
+flavour generic
|
||||
kernel-5.7 \
|
||||
- linux-image-powerpc64le
|
||||
+ linux-image-generic
|
||||
usable \
|
||||
- linux-image-powerpc64le \
|
||||
- linux-image-3.14-1-powerpc64le
|
||||
+ linux-image-generic \
|
||||
+ linux-image-3.14-1-generic
|
||||
diff --git a/kernel/tests/ppc64el/powernv.test b/kernel/tests/ppc64el/powernv.test
|
||||
index 3e7d2250..77b5505a 100644
|
||||
--- a/kernel/tests/ppc64el/powernv.test
|
||||
+++ b/kernel/tests/ppc64el/powernv.test
|
||||
@@ -1,9 +1,9 @@
|
||||
subarch chrp_ibm
|
||||
cpuinfo powernv.cpuinfo
|
||||
majors 5.7
|
||||
-flavour powerpc64le
|
||||
+flavour generic
|
||||
kernel-5.7 \
|
||||
- linux-image-powerpc64le
|
||||
+ linux-image-generic
|
||||
usable \
|
||||
- linux-image-powerpc64le \
|
||||
- linux-image-3.14-1-powerpc64le
|
||||
+ linux-image-generic \
|
||||
+ linux-image-3.14-1-generic
|
||||
Loading…
Add table
Add a link
Reference in a new issue