Bug#771687: debootstrap: Please add support for the Tanglu derivative
Package: debootstrap
Version: 1.0.66
Severity: wishlist
Tags: patch
Hi!
Could you please add support for the Tanglu[1] Debian derivative?
This includes three suites at time:
* Aequorea
* Bartholomea
* Chromodoris
I have a patch attached which adds Tanglu support.
I also attched a second patch which we apply at Tanglu, which just adds a nicer
message if debootstrap is failing to create device nodes.
You might want to consider that one as well (if wanted, I could also file a
separate bug for it).
Thank you for your work on Debootstrap!
Cheers,
Matthias
[1]: http://tanglu.org
-- System Information:
Debian Release: jessie/sid
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Versions of packages debootstrap depends on:
ii wget 1.16-1b1
Versions of packages debootstrap recommends:
ii gnupg 1.4.18-4
ii tanglu-archive-keyring 2013.02
debootstrap suggests no packages.
Author: Matthias Klumpp <matthias@tenstral.net>
Add Tanglu support
diff --git a/debian/rules b/debian/rules
index a7d5eee..d7274e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
ifeq (0,$(shell dpkg-vendor --derives-from Ubuntu; echo $$?))
KEYRING := ubuntu-keyring
+else ifeq (0,$(shell dpkg-vendor --derives-from Tanglu; echo $$?))
+ KEYRING := tanglu-archive-keyring
else
KEYRING := debian-archive-keyring
endif
@@ -14,10 +16,10 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_build
-
+
$(MAKE) install DESTDIR=$(CURDIR)/debian/debootstrap
$(MAKE) install DESTDIR=$(CURDIR)/debian/debootstrap-udeb
-
+
# remove scripts not needed by d-i
-rm -f debian/debootstrap-udeb/usr/share/debootstrap/scripts/potato \
debian/debootstrap-udeb/usr/share/debootstrap/scripts/woody \
@@ -30,6 +32,7 @@ override_dh_auto_install:
debian/debootstrap-udeb/usr/share/debootstrap/scripts/feisty \
debian/debootstrap-udeb/usr/share/debootstrap/scripts/*.buildd \
debian/debootstrap-udeb/usr/share/debootstrap/scripts/*.fakechroot \
+ debian/debootstrap-udeb/usr/share/debootstrap/scripts/staging \
debian/debootstrap-udeb/usr/share/debootstrap/scripts/stable \
debian/debootstrap-udeb/usr/share/debootstrap/scripts/testing \
debian/debootstrap-udeb/usr/share/debootstrap/scripts/unstable
diff --git a/scripts/aequorea b/scripts/aequorea
new file mode 100644
index 0000000..fddd777
--- /dev/null
+++ b/scripts/aequorea
@@ -0,0 +1,202 @@
+mirror_style release
+download_style apt
+finddebs_style from-indices
+variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/tanglu-archive-keyring.gpg
+default_mirror http://archive.tanglu.org/tanglu
+
+if doing_variant fakechroot; then
+ test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
+fi
+
+case $ARCH in
+ alpha|ia64) LIBC="libc6.1" ;;
+ kfreebsd-*) LIBC="libc0.1" ;;
+ hurd-*) LIBC="libc0.3" ;;
+ *) LIBC="libc6" ;;
+esac
+
+work_out_debs () {
+ required="$(get_debs Priority: required)"
+
+ 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)"
+
+ # we want the Tanglu minimal dependency set to be installed
+ base="$base tanglu-minimal"
+ elif doing_variant buildd || doing_variant scratchbox; then
+ base="apt build-essential"
+ elif doing_variant minbase; then
+ base="apt"
+ fi
+
+ if doing_variant fakechroot; then
+ # ldd.fake needs binutils
+ required="$required binutils"
+ fi
+
+ case $MIRRORS in
+ https://*)
+ base="$base apt-transport-https ca-certificates"
+ ;;
+ esac
+}
+
+first_stage_install () {
+ extract $required
+
+ mkdir -p "$TARGET/var/lib/dpkg"
+ : >"$TARGET/var/lib/dpkg/status"
+ : >"$TARGET/var/lib/dpkg/available"
+
+ setup_etc
+ if [ ! -e "$TARGET/etc/fstab" ]; then
+ echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
+ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
+ fi
+
+ x_feign_install () {
+ local pkg="$1"
+ local deb="$(debfor $pkg)"
+ local ver="$(extract_deb_field "$TARGET/$deb" Version)"
+
+ mkdir -p "$TARGET/var/lib/dpkg/info"
+
+ echo \
+"Package: $pkg
+Version: $ver
+Maintainer: unknown
+Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
+
+ touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
+ }
+
+ x_feign_install dpkg
+}
+
+second_stage_install () {
+ setup_devices
+
+ x_core_install () {
+ smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
+ }
+
+ p () {
+ baseprog="$(($baseprog + ${1:-1}))"
+ }
+
+ if doing_variant fakechroot; then
+ setup_proc_fakechroot
+ elif doing_variant scratchbox; then
+ true
+ else
+ setup_proc
+ in_target /sbin/ldconfig
+ fi
+
+ DEBIAN_FRONTEND=noninteractive
+ DEBCONF_NONINTERACTIVE_SEEN=true
+ export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
+
+ baseprog=0
+ bases=7
+
+ p; progress $baseprog $bases INSTCORE "Installing core packages" #1
+ info INSTCORE "Installing core packages..."
+
+ p; progress $baseprog $bases INSTCORE "Installing core packages" #2
+ ln -sf mawk "$TARGET/usr/bin/awk"
+ x_core_install base-passwd
+ x_core_install base-files
+ p; progress $baseprog $bases INSTCORE "Installing core packages" #3
+ x_core_install dpkg
+
+ if [ ! -e "$TARGET/etc/localtime" ]; then
+ ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
+ fi
+
+ if doing_variant fakechroot; then
+ install_fakechroot_tools
+ fi
+
+ p; progress $baseprog $bases INSTCORE "Installing core packages" #4
+ x_core_install $LIBC
+
+ p; progress $baseprog $bases INSTCORE "Installing core packages" #5
+ x_core_install perl-base
+
+ p; progress $baseprog $bases INSTCORE "Installing core packages" #6
+ rm "$TARGET/usr/bin/awk"
+ x_core_install mawk
+
+ p; progress $baseprog $bases INSTCORE "Installing core packages" #7
+ if doing_variant -; then
+ x_core_install debconf
+ fi
+
+ baseprog=0
+ bases=$(set -- $required; echo $#)
+
+ info UNPACKREQ "Unpacking required packages..."
+
+ exec 7>&1
+
+ smallyes '' |
+ (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \
+ dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) |
+ dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING
+
+ info CONFREQ "Configuring required packages..."
+
+ mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
+ echo \
+"#!/bin/sh
+echo
+echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
+ chmod 755 "$TARGET/sbin/start-stop-daemon"
+
+ setup_dselect_method apt
+
+ smallyes '' |
+ (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
+ dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) |
+ dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING
+
+ baseprog=0
+ bases="$(set -- $base; echo $#)"
+
+ info UNPACKBASE "Unpacking the base system..."
+
+ setup_available $required $base
+ done_predeps=
+ while predep=$(get_next_predep); do
+ # We have to resolve dependencies of pre-dependencies manually because
+ # dpkg --predep-package doesn't handle this.
+ predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
+ # XXX: progress is tricky due to how dpkg_progress works
+ # -- cjwatson 2009-07-29
+ p; smallyes '' |
+ in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
+ base=$(without "$base" "$predep")
+ done_predeps="$done_predeps $predep"
+ done
+
+ smallyes '' |
+ (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \
+ dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) |
+ dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING
+
+ info CONFBASE "Configuring the base system..."
+
+ smallyes '' |
+ (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \
+ dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
+ dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
+
+ mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
+
+ progress $bases $bases CONFBASE "Configuring base system"
+ info BASESUCCESS "Base system installed successfully."
+}
diff --git a/scripts/bartholomea b/scripts/bartholomea
new file mode 120000
index 0000000..aa62feb
--- /dev/null
+++ b/scripts/bartholomea
@@ -0,0 +1 @@
+aequorea
\ No newline at end of file
diff --git a/scripts/chromodoris b/scripts/chromodoris
new file mode 120000
index 0000000..aa62feb
--- /dev/null
+++ b/scripts/chromodoris
@@ -0,0 +1 @@
+aequorea
\ No newline at end of file
diff --git a/scripts/staging b/scripts/staging
new file mode 120000
index 0000000..aa62feb
--- /dev/null
+++ b/scripts/staging
@@ -0,0 +1 @@
+aequorea
\ No newline at end of file
Author: Matthias Klumpp <matthias@tenstral.net>
Exit with friendly error message when failing to create device nodes
diff --git a/functions b/functions
index 674d649..a0556d8 100644
--- a/functions
+++ b/functions
@@ -80,7 +80,7 @@ wgetprogress () {
wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3
ret=$?
else
- wget $QSWITCH "$@"
+ wget $QSWITCH "$@"
ret=$?
fi
return $ret
@@ -1050,7 +1050,8 @@ setup_devices () {
setup_devices_hurd ;;
*)
if [ -e "$DEVICES_TARGZ" ]; then
- zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -)
+ zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -) || \
+ error 1 DEVCREATE "Failed to create devices using %s." "$DEVICES_TARGZ"
else
if [ -e /dev/.devfsd ] ; then
in_target mount -t devfs devfs /dev
Reply to: