diff options
| author | Riku Voipio <riku.voipio@iki.fi> | 2016-11-14 02:11:41 (GMT) |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2016-11-14 02:11:58 (GMT) |
| commit | 03ca07abffcad15007ca2e8d0cd99d4b811c738e (patch) | |
| tree | ab0072b535e523e24fa3bdc883c99316ddc789d2 /scripts | |
| parent | 988c5ca36a4cb44e0ba3a143f70b6ae8a7e5afdc (diff) | |
| download | debootstrap-03ca07abffcad15007ca2e8d0cd99d4b811c738e.zip debootstrap-03ca07abffcad15007ca2e8d0cd99d4b811c738e.tar.gz debootstrap-03ca07abffcad15007ca2e8d0cd99d4b811c738e.tar.bz2 | |
remove scratchbox2 support (closes: #796189)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/aequorea | 6 | ||||
| -rw-r--r-- | scripts/sid | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/scripts/aequorea b/scripts/aequorea index d55eee0..1ae17d8 100644 --- a/scripts/aequorea +++ b/scripts/aequorea @@ -1,7 +1,7 @@ mirror_style release download_style apt finddebs_style from-indices -variants - buildd fakechroot minbase scratchbox +variants - buildd fakechroot minbase keyring /usr/share/keyrings/tanglu-archive-keyring.gpg default_mirror http://archive.tanglu.org/tanglu @@ -26,7 +26,7 @@ work_out_debs () { # we want the Tanglu minimal dependency set to be installed base="$base tanglu-minimal" - elif doing_variant buildd || doing_variant scratchbox; then + elif doing_variant buildd; then base="apt build-essential" elif doing_variant minbase; then base="apt" @@ -91,8 +91,6 @@ second_stage_install () { if doing_variant fakechroot; then setup_proc_fakechroot - elif doing_variant scratchbox; then - true else setup_proc in_target /sbin/ldconfig diff --git a/scripts/sid b/scripts/sid index 0b289f9..1d96477 100644 --- a/scripts/sid +++ b/scripts/sid @@ -1,7 +1,7 @@ mirror_style release download_style apt finddebs_style from-indices -variants - buildd fakechroot minbase scratchbox +variants - buildd fakechroot minbase keyring /usr/share/keyrings/debian-archive-keyring.gpg if doing_variant fakechroot; then @@ -22,7 +22,7 @@ work_out_debs () { #required="$required $(get_debs Priority: important)" # ^^ should be getting debconf here somehow maybe base="$(get_debs Priority: important)" - elif doing_variant buildd || doing_variant scratchbox; then + elif doing_variant buildd; then base="apt build-essential" elif doing_variant minbase; then base="apt" @@ -95,8 +95,6 @@ Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" if doing_variant fakechroot; then setup_proc_fakechroot - elif doing_variant scratchbox; then - true else setup_proc in_target /sbin/ldconfig |