[Dev] [PATCH 4/4] debootstrap: use more recent Trisquel script

Denis 'GNUtoo' Carikli GNUtoo at cyberdimension.org
Wed Oct 24 23:50:53 GMT 2018


Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at cyberdimension.org>
---
 libre/debootstrap/PKGBUILD |  12 ++-
 libre/debootstrap/trisquel | 199 -------------------------------------
 2 files changed, 8 insertions(+), 203 deletions(-)
 delete mode 100644 libre/debootstrap/trisquel

diff --git a/libre/debootstrap/PKGBUILD b/libre/debootstrap/PKGBUILD
index eb561c852..f7fc18b65 100644
--- a/libre/debootstrap/PKGBUILD
+++ b/libre/debootstrap/PKGBUILD
@@ -5,12 +5,15 @@
 pkgname=debootstrap
 
 pkgver=1.0.107
-pkgrel=2.parabola1
+pkgrel=3.parabola1
 arch=(any)
 
 _pureospkgver=1.0.108
 _pureospkgrel=pureos1
 
+_trisquelpkgver=1.0.78
+_trisquelpkgrel=+nmu1ubuntu1.6+8.0trisquel1
+
 pkgdesc="Bootstrap a basic gNewSense and Trisquel system, without Debian support"
 url="https://tracker.debian.org/pkg/debootstrap"
 license=(GPL)
@@ -20,6 +23,7 @@ makedepends=(git)
 optdepends=(
   'gnupg: check release signatures'
   'pureos-archive-keyring: check PureOS release signatures'
+  'trisquel-keyring: check Trisquel release signatures'
 )
 replaces=(${pkgname}-libre)
 conflicts=(${pkgname}-libre)
@@ -29,13 +33,13 @@ source=("git+https://anonscm.debian.org/git/d-i/debootstrap.git#tag=$pkgver"
         debootstrap.8
         gnewsense
         https://repo.puri.sm/pureos/pool/main/d/debootstrap/debootstrap_$_pureospkgver$_pureospkgrel.tar.gz
-        trisquel)
+        http://archive.trisquel.info/trisquel/pool/main/d/debootstrap/debootstrap_$_trisquelpkgver$_trisquelpkgrel.tar.gz)
 sha512sums=('SKIP'
             'fb1101bcbbb2525e12c717ef0dbb4652b8c98e167b538127f0735690d588aa63d864115eca43a109b2b4305540b45a97ca410b5ea8265ec724af33ec11071e2a'
             '0b3507756b8f29d19146df3201143ccbd71cfd1f7ef865d184079180612b90c046cabab59fe42d246bfe476ae8fd5c43e81ee2fc3ee06bbc1fc3e75d9f1382ca'
             '968ef005bf1f399b3400080b2ba65f1b32c067c49faadc1caa7ee524a85980f0a6625c7b06838e01bbd8b99a496492da77a38f0e17f0a81fc029ee611fe639b6'
             '0eccd31d4dea343ba64dab4948da5d2de519773dfe37c8a16755f5a8bb5fc6278840ec20113629d899745c69eef694e4c8e24918e8d2c375253eb2a6eb9acfcd'
-            'b192dcbd0d85923ddd97d1094bbcf36edb36a095bfe06e0971707651524f6712c7ab21f733ba6f24e5cbc2e977aec7c52645e41b78d04e45fca65971f89a47a7')
+            '45064c031b8ec1a8ece7336e7d6665f8ddabb6abad39dfc9d894c71bf8b2257d5f4883f7f59583dcc811fae9a3e0f64a0aa2d3741ca5c4ab621e3ee56c05223d')
 
 prepare() {
   cd debootstrap
@@ -64,7 +68,7 @@ prepare() {
   install -m644 $srcdir/debootstrap-$_pureospkgver$_pureospkgrel/scripts/green scripts/pureos
 
   # Add Trisquel script
-  install -m644 $srcdir/trisquel scripts
+  install -m644 $srcdir/debootstrap-$_trisquelpkgver$_trisquelpkgrel/scripts/trisquel scripts
 
   # Enter to scripts dir
   cd scripts
diff --git a/libre/debootstrap/trisquel b/libre/debootstrap/trisquel
deleted file mode 100644
index 7efa062f9..000000000
--- a/libre/debootstrap/trisquel
+++ /dev/null
@@ -1,199 +0,0 @@
-default_mirror http://archive.trisquel.info/trisquel
-mirror_style release
-download_style apt
-finddebs_style from-indices
-variants - buildd fakechroot minbase
-
-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" ;;
-  *)          LIBC="libc6" ;;
-esac
-
-work_out_debs () {
-    required="$(get_debs Priority: required)"
-
-    if doing_variant -; 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="$(get_debs Build-Essential: yes)"
-    elif doing_variant fakechroot || doing_variant minbase; then
-      base="apt"
-    fi
-}
-
-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
-
-    if doing_variant fakechroot; then
-        setup_devices_fakechroot
-    else
-        setup_devices
-    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
-Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
-
-        touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
-    }
-
-    x_feign_install dpkg
-}
-
-second_stage_install () {
-    x_core_install () {
-	smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
-    }
-
-    p () {
-	baseprog="$(($baseprog + ${1:-1}))"
-    }
-
-    if doing_variant fakechroot; then
-	setup_proc_fakechroot
-    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-files base-passwd
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #3
-    x_core_install dpkg
-
-    if [ ! -e "$TARGET/etc/localtime" ]; then
-        ln -sf /usr/share/zoneinfo/Etc/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..."
-
-    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 |
-      dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
-
-    info CONFREQ "Configuring required packages..."
-
-    if doing_variant fakechroot; then
-	# fix initscripts postinst (no mounting possible, and wrong if condition)
-	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"
-    fi
-
-    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"
-
-    if [ -x "$TARGET/sbin/initctl" ]; then
-      mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL"
-      echo \
-"#!/bin/sh
-echo
-echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl"
-      chmod 755 "$TARGET/sbin/initctl"
-    fi
-
-    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 |
-      dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
-
-    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 |
-      dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
-
-    info CONFBASE "Configuring the base system..."
-
-    smallyes '' |
-      (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
-      dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
-
-    if [ -x "$TARGET/sbin/initctl.REAL" ]; then
-      mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl"
-    fi
-    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."
-}
-- 
2.19.0




More information about the Dev mailing list