Merge pull request #35 from RandomCoderOrg/bump-debootstrap

Bump debootstrap

.github/scripts/build-jammy.sh

@@ -60,9 +60,12 @@ EOF
 
 # set up pv
 lshout "Setting up pv..."
-cp $ROOT_DIR/core/pv/pv-${t_arch}.deb $chroot_dir
-run_cmd "dpkg -i /pv-${t_arch}.deb"
-run_cmd "rm /pv-${t_arch}.deb"
+# cp $ROOT_DIR/core/pv/pv-${t_arch}.deb $chroot_dir
+# run_cmd "dpkg -i /pv-${t_arch}.deb"
+# run_cmd "rm /pv-${t_arch}.deb"
+run_cmd "apt update"
+run_cmd "apt install pv -y"
+run_cmd "apt clean"
 
 # clean any archive if exits
 apt-get clean

.github/workflows/build-udroid.yml

@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: checkout repo
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Docker Setup QEMU
         uses: docker/setup-qemu-action@v2

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "core/debootstrap"]
+	path = core/debootstrap
+	url = https://git.launchpad.net/ubuntu/+source/debootstrap
+	branch = ubuntu/devel

build-jammy.sh

@@ -54,9 +54,9 @@ EOF
 
 # set up pv
 lshout "Setting up pv..."
-cp $ROOT_DIR/core/pv/pv-${t_arch}.deb $chroot_dir
-run_cmd "dpkg -i /pv-${t_arch}.deb"
-run_cmd "rm /pv-${t_arch}.deb"
+run_cmd "apt update"
+run_cmd "apt install pv -y"
+run_cmd "apt clean"
 
 }
 

core/debootstrap-scripts/functions

@@ -0,0 +1 @@
+../debootstrap/functions

core/debootstrap/scripts/amber → core/debootstrap-scripts/scripts/amber

@@ -1,6 +1,6 @@
 
 # For PureOS "amber"
-# PureOS: https://www.pureos.net/ 
+# PureOS: https://www.pureos.net/
 # Contact: https://tracker.pureos.net/
 
 mirror_style release
@@ -24,17 +24,18 @@ esac
 work_out_debs () {
 	required="$(get_debs Priority: required)"
 
+	base="pureos-archive-keyring"
 	if doing_variant - || doing_variant fakechroot; then
 		#required="$required $(get_debs Priority: important)"
 		#  ^^ should be getting debconf here somehow maybe
-		base="$(get_debs Priority: important)"
+		base="$base $(get_debs Priority: important)"
 
 		# we want the PureOS minimal dependency set to be installed
 		base="$base pureos-minimal"
 	elif doing_variant buildd; then
-		base="apt build-essential"
+		base="$base apt build-essential"
 	elif doing_variant minbase; then
-		base="apt"
+		base="$base apt"
 	fi
 
 	if doing_variant fakechroot; then
@@ -53,8 +54,8 @@ first_stage_install () {
 	MERGED_USR="yes"
 	EXTRACT_DEB_TAR_OPTIONS="$EXTRACT_DEB_TAR_OPTIONS -k"
 
-	setup_merged_usr
 	extract $required
+	merge_usr
 
 	mkdir -p "$TARGET/var/lib/dpkg"
 	: >"$TARGET/var/lib/dpkg/status"

core/debootstrap-scripts/scripts/aramo

@@ -0,0 +1 @@
+robur

core/debootstrap-scripts/scripts/awen

@@ -0,0 +1 @@
+robur

core/debootstrap-scripts/scripts/belenos

@@ -0,0 +1 @@
+robur

core/debootstrap-scripts/scripts/brigantia

@@ -0,0 +1 @@
+robur

core/debootstrap-scripts/scripts/byzantium

@@ -0,0 +1 @@
+amber

core/debootstrap-scripts/scripts/crimson

@@ -0,0 +1 @@
+amber

core/debootstrap-scripts/scripts/dagda

@@ -0,0 +1 @@
+robur

core/debootstrap/scripts/debian-common → core/debootstrap-scripts/scripts/debian-common

@@ -10,14 +10,33 @@ case $ARCH in
 esac
 
 work_out_debs () {
-	required="$(get_debs Priority: required)"
+	case "$CODENAME" in
+		etch*|lenny|squeeze|wheezy|jessie*|stretch|buster|bullseye|bookworm)
+			# always compute for bookworm and earlier
+			required="$(get_debs Priority: required)"
+			;;
+		*)
+			# only compute when variant is not buildd for trixie and later
+			if ! doing_variant buildd; then
+				required="$(get_debs Priority: required)"
+			fi
+	esac
 
 	if doing_variant - || doing_variant fakechroot; then
 		#required="$required $(get_debs Priority: important)"
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd; then
 		base="apt build-essential"
+		# do not install Priority:required for the buildd variant
+		# explicitly add mawk because we cannot resolve base-files's
+		# virtual pre-depends on awk
+		case "$CODENAME" in
+			etch*|lenny|squeeze|wheezy|jessie*|stretch|buster|bullseye|bookworm)
+				# only apply this for trixie and later
+				;;
+			*) required="mawk $(get_debs Essential: yes)";;
+		esac
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -40,6 +59,21 @@ work_out_debs () {
 		esac
 		;;
 	esac
+
+	# On suites >= bookworm, either we set up a merged-/usr system
+	# via merge_usr, or we deliberately avoid that migration by creating
+	# the flag file. This means there's no need for the live migration
+	# 'usrmerge' package and its extra dependencies:
+	# we can install the empty 'usr-is-merged' metapackage to indicate
+	# that the transition has been done.
+	case "$CODENAME" in
+		etch*|lenny|squeeze|wheezy|jessie*|stretch|buster|bullseye)
+			;;
+		*)
+			required="$required usr-is-merged"
+			EXCLUDE_DEPENDENCY="$EXCLUDE_DEPENDENCY usrmerge"
+			;;
+	esac
 }
 
 first_stage_install () {
@@ -57,9 +91,9 @@ first_stage_install () {
 	if [ "$CODENAME" = "stretch" ] && [ -z "$MERGED_USR" ]; then
 		MERGED_USR="no"
 	fi
-
-	setup_merged_usr
+
 	extract $required
+	merge_usr
 
 	mkdir -p "$TARGET/var/lib/dpkg"
 	: >"$TARGET/var/lib/dpkg/status"

core/debootstrap-scripts/scripts/dwyn

@@ -0,0 +1 @@
+robur

core/debootstrap-scripts/scripts/etiona

@@ -0,0 +1 @@
+robur

core/debootstrap-scripts/scripts/flidas

@@ -0,0 +1 @@
+robur

core/debootstrap/scripts/gutsy → core/debootstrap-scripts/scripts/gutsy

@@ -45,7 +45,7 @@ case $SUITE in
 	*)
 		# impish+ will use zstd compression, check if supported
 		dpkg_zstd="$(dpkg-deb --help 2>/dev/null | grep ' zstd,' || :)"
-		if [ -z "$EXTRACTOR_OVERRIDE" ] && [ -z "$dpkg_zstd" ]; then
+		if [ -z "${EXTRACTOR_OVERRIDE-}" ] && [ -z "$dpkg_zstd" ]; then
 			info CHOSENEXTRACTOR "%s uses zstd compression, setting --extractor=ar option" "$SUITE"
 			export EXTRACTOR_OVERRIDE=ar
 		fi
@@ -138,8 +138,8 @@ first_stage_install () {
 			;;
 	esac
 
-	setup_merged_usr
 	extract $required
+	merge_usr
 
 	mkdir -p "$TARGET/var/lib/dpkg"
 	: >"$TARGET/var/lib/dpkg/status"

core/debootstrap-scripts/scripts/nabia

@@ -0,0 +1 @@
+robur

core/debootstrap-scripts/scripts/ondokuz

@@ -0,0 +1 @@
+pardus

core/debootstrap-scripts/scripts/onyedi

@@ -0,0 +1 @@
+pardus

core/debootstrap-scripts/scripts/pardus

@@ -0,0 +1,17 @@
+mirror_style release
+download_style apt
+finddebs_style from-indices
+variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/pardus-archive-keyring.gpg
+default_mirror http://depo.pardus.org.tr/pardus
+
+# include common settings
+if [ -e "$DEBOOTSTRAP_DIR/scripts/debian-common" ]; then
+ . "$DEBOOTSTRAP_DIR/scripts/debian-common"
+elif [ -e /debootstrap/debian-common ]; then
+ . /debootstrap/debian-common
+elif [ -e "$DEBOOTSTRAP_DIR/debian-common" ]; then
+ . "$DEBOOTSTRAP_DIR/debian-common"
+else
+ error 1 NOCOMMON "File not found: debian-common"
+fi