--- Begin Message ---
Package: debootstrap
Version: 1.0.72
Severity: wishlist
Tags: patch
Since #795786 was acted on and scratchbox2 was removed from
debian, you may now remove the support from debootstrap also.
The attached patch should do the job (the code was quite self
contained)
Thanks,
Riku
>From 44a05e04ae39a4a32ffd089f7e8c6be2624e0d5b Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@linaro.org>
Date: Thu, 20 Aug 2015 10:39:02 +0300
Subject: [PATCH] Remove scratchbox2 support
Since scratchbox2 was removed from Debian, remove this special
case from debootstrap. scratchbox2 has been abandoned upstream,
and even within scratchbox users using this debootstrap option
was rare. Thus I think it makes sense to clean up this option
away.
---
debootstrap | 12 +-----------
debootstrap.8 | 4 +---
scripts/sid | 6 ++----
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/debootstrap b/debootstrap
index 86e9c15..70a8e04 100755
--- a/debootstrap
+++ b/debootstrap
@@ -102,7 +102,7 @@ usage()
archive
--variant=X use variant X of the bootstrap scripts
(currently supported variants: buildd, fakechroot,
- scratchbox, minbase)
+ minbase)
--keyring=K check Release files against keyring K
--no-check-gpg avoid checking Release file signatures
--force-check-gpg force checking Release file signatures
@@ -457,16 +457,6 @@ fi
if [ "$TARGET" = "/" ]; then
CHROOT_CMD=""
-elif doing_variant scratchbox; then
- for config in ~/.scratchbox2/*/sb2.config;
- do
- export `grep ^SBOX_TARGET_ROOT= $config`
- if [ "x$SBOX_TARGET_ROOT" = "x$TARGET" ]; then
- SB2_TARGET=$(basename $(dirname $config))
- fi
- done
- [ "x$SB2_TARGET" != "x" ] || error 1 SBOXTARGETREQ "No scratchbox target configured for $TARGET"
- CHROOT_CMD="sb2 -eR -t $SB2_TARGET"
else
CHROOT_CMD="chroot $TARGET"
fi
diff --git a/debootstrap.8 b/debootstrap.8
index 5864148..a7c9ff0 100644
--- a/debootstrap.8
+++ b/debootstrap.8
@@ -71,15 +71,13 @@ or apt, and that it is far better to specify the entire base system than
rely on this option.
With this option set, this behaviour is disabled.
.IP
-.IP "\fB\-\-variant=minbase|buildd|fakechroot|scratchbox\fP"
+.IP "\fB\-\-variant=minbase|buildd|fakechroot\fP"
Name of the bootstrap script variant to use.
Currently, the variants supported are minbase, which only includes
essential packages and apt; buildd, which installs the build-essential
packages into
.IR TARGET ;
and fakechroot, which installs the packages without root privileges.
-Finally there is variant scratchbox, which is for creating targets
-for scratchbox usage.
The default, with no \fB\-\-variant=X\fP argument, is to create a base
Debian installation in
.IR TARGET .
diff --git a/scripts/sid b/scripts/sid
index bf3404f..c2092ed 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 || doing_variant; then
base="apt build-essential"
elif doing_variant minbase; then
base="apt"
@@ -85,8 +85,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
--
2.1.4
--- End Message ---
--- Begin Message ---
Source: debootstrap
Source-Version: 1.0.87
We believe that the bug you reported is fixed in the latest version of
debootstrap, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 796189@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Christian Perrier <bubulle@debian.org> (supplier of updated debootstrap package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 16 Nov 2016 06:47:27 +0100
Source: debootstrap
Binary: debootstrap debootstrap-udeb
Architecture: source all
Version: 1.0.87
Distribution: unstable
Urgency: high
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Christian Perrier <bubulle@debian.org>
Description:
debootstrap - Bootstrap a basic Debian system
debootstrap-udeb - Bootstrap the Debian system (udeb)
Closes: 796189 844221
Changes:
debootstrap (1.0.87) unstable; urgency=high
.
[ Julien Cristau ]
* Default to split /usr again, as merged-/usr breaks dpkg-shlibdeps
(closes: #844221).
.
[ Riku Voipio ]
* remove scratchbox2 support (closes: #796189)
Checksums-Sha1:
e817e83772e37f11dc9b63fb10ba10fb6e96d416 1777 debootstrap_1.0.87.dsc
1869a70482119c1616e0332117d21735b3384909 65875 debootstrap_1.0.87.tar.gz
a4a6b11c7411a23e4fb18790d92f5b2961c6da2f 18924 debootstrap-udeb_1.0.87_all.udeb
1c1f4b42cfdf6a972061f94bb7e8cf2ffce72447 4791 debootstrap_1.0.87_20161116T055108z-355da9aa.buildinfo
deb9e849da6ab5d9461f2673193cfb6f04474cba 66220 debootstrap_1.0.87_all.deb
Checksums-Sha256:
e6161875b958b9e1133a32ec734eb7e54e4d48ed3dceccefd8c815ce34f19d80 1777 debootstrap_1.0.87.dsc
e48c931b8c0a4981c580db1a85418177bf62f18320a376aefbc7910e1f1fb3aa 65875 debootstrap_1.0.87.tar.gz
784f5754f3287ae80715d9100a4ed04e7895be5f7b81b7b2295d335dd69d79fb 18924 debootstrap-udeb_1.0.87_all.udeb
96000167397211d0f33e4b5bfb0ae2572cf40b053cb498c2a82c9c0f4b558919 4791 debootstrap_1.0.87_20161116T055108z-355da9aa.buildinfo
a5f2d34a8f7bd28bb983024409a08f78725be8cddaef9af4734993e78df3b1fb 66220 debootstrap_1.0.87_all.deb
Files:
7fbbf28549a3d76e5072b2850fa755ff 1777 admin extra debootstrap_1.0.87.dsc
50c04a3f08b146c210d61721b4cf4284 65875 admin extra debootstrap_1.0.87.tar.gz
a784b02ef9f04a6706201fecb141a8e3 18924 debian-installer extra debootstrap-udeb_1.0.87_all.udeb
355da9aa28b909d5659eb5bf7b2de786 4791 admin extra debootstrap_1.0.87_20161116T055108z-355da9aa.buildinfo
36dfb524118e75581441d644b525f4ba 66220 admin extra debootstrap_1.0.87_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJYLA0rAAoJEIcvcCxNbiWomwoP/19UlZVqH2eHxilg8DhNWBXu
EsU45cRATxu+BXQAoGe9uE/gUqva9nJ3JNhCB45Nxz9liqlZPtbgBhObMxGTpdve
I55RqOl9+f4f6Gabl3Hwc6cI/NqVw5pAkAgaMrGl8XTm1RWjCwuYPlWBhpy2SEku
TUvclrsLE9Jnw+7GbgPMR7/XvP8nLzUqCojgOWspFrL/0UtXfMw64t6HLRAfBRlN
8wUtD3vIfqkyoTrQXUakJXwMqvjne9fmWDumg6iRd6Jne3lj76br99adirlAjDqA
jerd5Sm/uaY2W9z+SAgsYg6wIo2c0oEra/l+EbUYneF1yAvFEHr2KyqI4FqSkUXZ
GhEKKf1CMFgfFOEqyl81HAqCWvmJVGvnudCs9sS5BDptkfp/GiN0jsiGERnyG2tE
8lIFchZxYueO5i6oI3r+YBdTSX/jdBVLF+hT8n3edIJVE+7ryoRc2hnSLHt6sAiP
ewSj6DA3GEooPeAcycqV3vfLc/YLL/btduCxIbHnyFTRQW8zFJ01GYWzboT41B+m
AA8LQEp6MIrKhY8hjClu9ZVie5HT+FyxtNUh7IPlhq6xCWSWwDXpXuAU0leUeCQq
KxOB3fEuw2XTYYXGgUEeh6L0BPd1VAPwNq1hY1Ko9IPPYY8xIZjGCq17wAlBnCrv
QTox4oWfIfDB5NSJHkEu
=+GuZ
-----END PGP SIGNATURE-----
--- End Message ---