Merge pull request #23 from RandomCoderOrg/maintenance

Maintenance

Author: SaicharanKandukuri

.github/scripts/build-jammy.sh

@@ -57,6 +57,13 @@ deb $MIRROR $SUITE-backports main restricted universe multiverse
 # deb-src $MIRROR $SUITE-backports main restricted universe multiverse
 
 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"
+
 # clean any archive if exits
 apt-get clean
 

.github/scripts/build-kinetic.sh

@@ -57,6 +57,13 @@ deb $MIRROR $SUITE-backports main restricted universe multiverse
 # deb-src $MIRROR $SUITE-backports main restricted universe multiverse
 
 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"
+
 # clean any archive if exits
 apt-get clean
 

.vscode/configurationCache.log

@@ -1 +1 @@
-{"buildTargets":[],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[]},"fileIndex":[]}}
+{"buildTargets":[],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}

build-jammy.sh

@@ -52,6 +52,12 @@ deb $MIRROR $SUITE-backports main restricted universe multiverse
 # deb-src $MIRROR $SUITE-backports main restricted universe multiverse
 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"
+
 }
 
 shout "Bootstrapping $SUITE...."

build-kinetic.sh

@@ -53,6 +53,13 @@ deb $MIRROR $SUITE-backports main restricted universe multiverse
 EOF
 
 # TODO: FOLLOW latest udroid version system ( Add props to /etc/os-release )
+
+# 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"
+
 }
 
 shout "Bootstrapping $SUITE...."

core/debootstrap/debian/changelog

@@ -1,3 +1,51 @@
+debootstrap (1.0.126+nmu1ubuntu0.2) jammy; urgency=medium
+
+  * Add (Ubuntu) lunar as a symlink to gutsy (LP: #1995612).
+
+ -- Nick Rosbrook <[email protected]>  Thu, 03 Nov 2022 10:28:51 -0400
+
+debootstrap (1.0.126+nmu1ubuntu0.1) jammy; urgency=medium
+
+  * Add (Ubuntu) kinetic as a symlink to gutsy (LP: #1970454).
+
+ -- Graham Inggs <[email protected]>  Tue, 26 Apr 2022 16:56:23 +0000
+
+debootstrap (1.0.126+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Undo the changes of the last upload. (Closes: #998867)
+
+ -- Johannes Schauer Marin Rodrigues <[email protected]>  Sun, 28 Nov 2021 12:38:15 +0100
+
+debootstrap (1.0.126) unstable; urgency=low
+
+  * Ensure bookworm+ suites are set up with merged-usr. (Closes: #978636)
+
+ -- Dimitri John Ledkov <[email protected]>  Mon, 08 Nov 2021 14:40:06 +0000
+
+debootstrap (1.0.125) unstable; urgency=medium
+
+  [ Samuel Thibault ]
+  * functions (download_main): Let the loops try the different components and
+    suites when the checksum doesn't match. This is needed when several of
+    them contain the same package name.
+
+  [ Arnaud Rebillout ]
+  * Fix auto proxy discovery (Closes: #985811)
+  * Fix detection of docker container for cgroup v2 (Closes: #985481)
+
+  [ Johannes 'josch' Schauer ]
+  * functions: define link_dir before using it.
+
+  [ Hideki Yamane ]
+  * Add (Debian) trixie as a symlink to sid.
+
+  [ Dimitri John Ledkov ]
+  * Add (Ubuntu) jammy as a symlink to gutsy.
+  * Upload to unstable.
+
+ -- Dimitri John Ledkov <[email protected]>  Tue, 02 Nov 2021 11:35:00 +0000
+
 debootstrap (1.0.124) experimental; urgency=medium
 
   [ Colin Watson ]

core/debootstrap/debian/control

@@ -1,7 +1,8 @@
 Source: debootstrap
 Section: admin
 Priority: optional
-Maintainer: Debian Install System Team <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Debian Install System Team <[email protected]>
 Uploaders: Colin Watson <[email protected]>, Steve McIntyre <[email protected]>,
            Hideki Yamane <[email protected]>,
 Build-Depends: debhelper-compat (= 12)

core/debootstrap/debootstrap

@@ -456,7 +456,10 @@ fi
 # do auto proxy discovery
 AUTOPROXY=""
 if ! doing_variant fakechroot && command -v apt-config >/dev/null; then
+    eval "$(apt-config shell AUTOPROXY Acquire::http::Proxy-Auto-Detect)"
+    if [ -z "$AUTOPROXY" ]; then
     eval "$(apt-config shell AUTOPROXY Acquire::http::ProxyAutoDetect)"
+    fi
     if [ -z "$http_proxy" ] && [ -x "$AUTOPROXY" ]; then
         http_proxy="$($AUTOPROXY)"
         if [ -n "$http_proxy" ]; then

core/debootstrap/functions

@@ -237,7 +237,7 @@ detect_container () {
 		CONTAINER="lxc-libvirt"
 	elif grep -qs ^systemd-nspawn$ /run/systemd/container || grep -qs systemd-nspawn /proc/1/environ || [ "$container" = "systemd-nspawn" ]; then
 		CONTAINER="systemd-nspawn"
-	elif grep -qs '[[:space:]]/docker/.*/sys/fs/cgroup' /proc/1/mountinfo; then
+	elif grep -qs '[[:space:]]/docker/.*/sys/fs/cgroup' /proc/1/mountinfo || [ -e "/.dockerenv" ]; then
 		CONTAINER="docker"
 	else
 		CONTAINER=""
@@ -922,6 +922,8 @@ download_main () {
 						echo >>"$TARGET/debootstrap/debpaths" "$p $debdest"
 						details="done"
 						break
+					else
+						details=""
 					fi
 				done
 				if [ "$details" != "" ]; then
@@ -1364,7 +1366,7 @@ setup_merged_usr() {
 
 	if [ "$MERGED_USR" = "no" ]; then return 0; fi
 
-	local link_dir
+	local link_dir=""
 	case $ARCH in
 	    hurd-*)	return 0 ;;
 	    amd64)	link_dir="lib32 lib64 libx32" ;;

core/debootstrap/scripts/lunar

@@ -0,0 +1 @@
+gutsy