summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@debian.org>2009-07-22 15:09:27 (GMT)
committerOtavio Salvador <otavio@debian.org>2009-07-22 15:09:27 (GMT)
commitcc2786d9dadf108f067554ed908307611e954859 (patch)
tree2cbed6ade3413b62478cc211d701eee6a44c6861 /scripts
parent1a5b695b4e2334cbd6746b200aa78e863a591e54 (diff)
downloaddebootstrap-cc2786d9dadf108f067554ed908307611e954859.zip
debootstrap-cc2786d9dadf108f067554ed908307611e954859.tar.gz
debootstrap-cc2786d9dadf108f067554ed908307611e954859.tar.bz2
Apply patch from Riku Voipio <riku.voipio@iki.fi> to add support for scratchbox variant. Closes: #536820.
r59598
Diffstat (limited to 'scripts')
-rw-r--r--scripts/debian/sid6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/debian/sid b/scripts/debian/sid
index 565ab92..239b0c4 100644
--- a/scripts/debian/sid
+++ b/scripts/debian/sid
@@ -1,7 +1,7 @@
mirror_style release
download_style apt
finddebs_style from-indices
-variants - buildd fakechroot minbase
+variants - buildd fakechroot minbase scratchbox
if doing_variant fakechroot; then
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -21,7 +21,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; then
+ elif doing_variant buildd || doing_variant scratchbox; then
base="$(get_debs Build-Essential: yes)"
elif doing_variant minbase; then
base="apt"
@@ -89,6 +89,8 @@ second_stage_install () {
if doing_variant fakechroot; then
setup_proc_fakechroot
+ elif doing_variant scratchbox; then
+ true
else
setup_proc
in_target /sbin/ldconfig