Merge pull request #35 from RandomCoderOrg/bump-debootstrap

Bump debootstrap

Author: SaicharanKandukuri

.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

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

core/debootstrap-scripts/functions

@@ -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/aequorea renamed to core/debootstrap-scripts/scripts/aequorea

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