Improved debootstrap hacking support with fixes for Ubuntu Noble (arm…

…bian#6076) * Remove extension for patching Deboostrap to support Ubuntu Noble * Integrate Deboostrap patching to the build script * fix problems related to Noble
rpardini · Dec 22, 2023 · f2e663f · f2e663f
1 parent b8cd5dc
commit f2e663f
Show file tree

Hide file tree

Showing 34 changed files with 35 additions and 19 deletions.
diff --git a/config/optional/architectures/amd64/_config/cli/_all_distributions/main/packages b/config/optional/architectures/amd64/_config/cli/_all_distributions/main/packages
diff --git a/config/optional/architectures/amd64/_config/cli/bookworm b/config/optional/architectures/amd64/_config/cli/bookworm
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/amd64/_config/cli/bullseye b/config/optional/architectures/amd64/_config/cli/bullseye
@@ -1 +1 @@
-jammy
+sid
diff --git a/config/optional/architectures/amd64/_config/cli/jammy b/config/optional/architectures/amd64/_config/cli/jammy
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/amd64/_config/cli/lunar b/config/optional/architectures/amd64/_config/cli/lunar
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/amd64/_config/cli/mantic b/config/optional/architectures/amd64/_config/cli/mantic
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/amd64/_config/cli/sid b/config/optional/architectures/amd64/_config/cli/sid
diff --git a/...y/main/config_desktop/packages.additional → ...tures/amd64/_config/cli/sid/main/packages b/...y/main/config_desktop/packages.additional → ...tures/amd64/_config/cli/sid/main/packages
@@ -1 +1,3 @@
+gpiod
+nocache
 firmware-sof-signed
diff --git a/...ll_distributions/main/packages.additional → .../_config/cli/sid/main/packages.additional b/...ll_distributions/main/packages.additional → .../_config/cli/sid/main/packages.additional
diff --git a/config/optional/architectures/amd64/_config/cli/trixie b/config/optional/architectures/amd64/_config/cli/trixie
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/arm64/_config/cli/bookworm b/config/optional/architectures/arm64/_config/cli/bookworm
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/arm64/_config/cli/bullseye b/config/optional/architectures/arm64/_config/cli/bullseye
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/arm64/_config/cli/buster b/config/optional/architectures/arm64/_config/cli/buster
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/arm64/_config/cli/focal b/config/optional/architectures/arm64/_config/cli/focal
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/arm64/_config/cli/jammy b/config/optional/architectures/arm64/_config/cli/jammy
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/arm64/_config/cli/kinetic b/config/optional/architectures/arm64/_config/cli/kinetic
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/arm64/_config/cli/lunar b/config/optional/architectures/arm64/_config/cli/lunar
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/arm64/_config/cli/mantic b/config/optional/architectures/arm64/_config/cli/mantic
@@ -0,0 +1 @@
+sid
diff --git a/...nfig/cli/_all_distributions/main/packages → ...tures/arm64/_config/cli/sid/main/packages b/...nfig/cli/_all_distributions/main/packages → ...tures/arm64/_config/cli/sid/main/packages
diff --git a/...ll_distributions/main/packages.additional → .../_config/cli/sid/main/packages.additional b/...ll_distributions/main/packages.additional → .../_config/cli/sid/main/packages.additional
diff --git a/config/optional/architectures/armhf/_config/cli/bookworm b/config/optional/architectures/armhf/_config/cli/bookworm
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/armhf/_config/cli/bullseye b/config/optional/architectures/armhf/_config/cli/bullseye
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/armhf/_config/cli/buster b/config/optional/architectures/armhf/_config/cli/buster
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/armhf/_config/cli/focal b/config/optional/architectures/armhf/_config/cli/focal
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/armhf/_config/cli/jammy b/config/optional/architectures/armhf/_config/cli/jammy
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/armhf/_config/cli/kinetic b/config/optional/architectures/armhf/_config/cli/kinetic
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/armhf/_config/cli/lunar b/config/optional/architectures/armhf/_config/cli/lunar
@@ -0,0 +1 @@
+sid
diff --git a/config/optional/architectures/armhf/_config/cli/mantic b/config/optional/architectures/armhf/_config/cli/mantic
@@ -0,0 +1 @@
+sid
diff --git a/...nfig/cli/_all_distributions/main/packages → ...tures/armhf/_config/cli/sid/main/packages b/...nfig/cli/_all_distributions/main/packages → ...tures/armhf/_config/cli/sid/main/packages
diff --git a/...ll_distributions/main/packages.additional → .../_config/cli/sid/main/packages.additional b/...ll_distributions/main/packages.additional → .../_config/cli/sid/main/packages.additional
diff --git a/config/optional/architectures/armhf/_config/cli/trixie b/config/optional/architectures/armhf/_config/cli/trixie
@@ -0,0 +1 @@
+sid
diff --git a/extensions/ubuntu-noble.sh b/extensions/ubuntu-noble.sh
diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
@@ -310,8 +310,10 @@ function do_extra_configuration() {
 
 	if [[ "$RELEASE" =~ ^(focal|jammy|kinetic|lunar|mantic|noble)$ ]]; then
 		DISTRIBUTION="Ubuntu"
+		DEBOOTSTRAP_SOURCE="gutsy"
 	else
 		DISTRIBUTION="Debian"
+		DEBOOTSTRAP_SOURCE="sid"
 	fi
 
 	DEBIAN_MIRROR='deb.debian.org/debian'

diff --git a/lib/functions/rootfs/rootfs-create.sh b/lib/functions/rootfs/rootfs-create.sh
@@ -72,6 +72,14 @@ function create_new_rootfs_cache_via_debootstrap() {
 		"'--components=${AGGREGATED_DEBOOTSTRAP_COMPONENTS_COMMA}'" # from aggregation.py
 	)
 
+	# Hacking debootstrap to support future releases as symlink is often the only change, so we don't need to bump host OS
+	# This functionality is coming with debootstrap v1.0.128 (Mantic)
+	local debootstrap_home="/usr/share/debootstrap/scripts"
+	if [[ ! -L "${debootstrap_home}/${RELEASE}" && ! -e "${debootstrap_home}/${RELEASE}" ]]; then
+		display_alert "Making symlink as host deboostrap is missing it" "" "wrn"
+		run_host_command_logged ln -s "${DEBOOTSTRAP_SOURCE}" "${debootstrap_home}/${RELEASE}"
+	fi
+
 	# Small detour for local apt caching option.
 	local_apt_deb_cache_prepare "before debootstrap" # sets LOCAL_APT_CACHE_INFO
 	if [[ "${LOCAL_APT_CACHE_INFO[USE]}" == "yes" ]]; then