Re: How do I include disk driver modules in a network installer image?

2015-08-20 Thread mrider 

On 2015-08-18 17:34, mri...@airmail.cc wrote:

In building debian-installer for jessie from source, I would like to
include disk driver modules in the network installer image. How might
I accomplish that?

I see that the installer normally loads sata-modules-3.16.0-4-amd64-di
from the mirror, and so I tried copying that file to
/home/user/debian-installer-20150422+deb8u1/build/localudebs/ before
building. But that did not work. Using the resulting installer, I
still cannot see /dev/sda in BusyBox before reaching the disk
partitioning step.

I typically SCP installer and initrd images to a remote server, set
the installer as default and update GRUB via SSH, and then reboot. But
if the installer hangs during network setup, I need to get IPMI access
in order to debug. I would rather add a script to the installer that
gives up after an hour, writes logs to the existing system, and then
reboots to it. But I cannot even begin to do that unless I can mount
/dev/sda.


Doh.

Adding sata-modules-${kernel:Version} to 
/home/user/debian-installer-20150422+deb8u1/build/pkg-lists/netboot/amd64.cfg 
did it. I obviously misinterpreted something.

Bug#796189: updated patch

2015-08-20 Thread Riku Voipio 
Sorry, wrong patch last time. This one with correct work_out_debs
if option.

From 44a05e04ae39a4a32ffd089f7e8c6be2624e0d5b Mon Sep 17 00:00:00 2001
From: Riku Voipio riku.voi...@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=Xuse variant X of the bootstrap scripts
  (currently supported variants: buildd, fakechroot,
-  scratchbox, minbase)
+  minbase)
   --keyring=Kcheck 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; 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

Bug#795231: marked as done (fails on cubietruck with FAT /boot)

2015-08-20 Thread Debian Bug Tracking System 
Your message dated Thu, 20 Aug 2015 10:58:34 +0100
with message-id 1440064714.3480.96.ca...@debian.org
and subject line Re: Bug#795231: fails on cubietruck with FAT /boot
has caused the Debian Bug report #795231,
regarding fails on cubietruck with FAT /boot
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
795231: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795231
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---
Package: flash-kernel
Version: 3.36
Severity: normal

A few places in flash-kernel try to ln -s, and this fails if /boot is 
a FAT filesystem. It should be possible to fall back to cp in this case.

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-- 
see shy jo


signature.asc
Description: Digital signature
---End Message---
---BeginMessage---
On Wed, 2015-08-12 at 16:34 -0400, Joey Hess wrote:
 Ian Campbell wrote:
  The cubietruck u-boot is more than capable of booting from an ext
  filesystem, so you should just do that, in fact everything should work
  in this mode out of the box, how did you end up with a FAT /boot?
 
 Haven't upgraded from default uboot yet, which does't even support
 ext2..

I wasn't aware that the CT came with a default u-boot, let alone such a
limited one. IIRC my one shipped with some Android/fastboot thing in
the nand flash and no SD card so I had to gather my own u-boot anyway.
Anyway, that's by the by I suppose.

  On platforms where u-boot is only capable of reading FAT the
  recommended approach is to use a dedicated FAT partition which is not
  normally mounted and use flash-kernel's Boot-Device option to cause the
  boot images to be copied to it.
 
 Ok, that's reasonable..

Thanks, I'm closing the bug on that basis then.

Ian.---End Message---

Re: gpgv udebs

2015-08-20 Thread Cyril Brulebois 
Hi,

Daniel Kahn Gillmor d...@fifthhorseman.net (2015-08-19):
 On Wed 2015-08-12 01:51:35 +0200, Daniel Kahn Gillmor wrote:
 
  i believe the installer relies on gpgv for archive manifest signature
  verification.  we have gpgv-udeb for that purpose, i think.
 
 One more followup about gnupg and udebs--
 
 The gnupg packaging currently makes a gnupg-udeb in addition to a
 gpgv-udeb.  This post is about gnupg-udeb, and not gpgv-udeb.

eh, thanks for the hint; mixing up those could easily happen.

 I'm proposing to drop the gnupg-udeb entirely.
 
 It looks like it was used at one point in the past for partman-crypto,
 but it is no longer used there.

ACK, removed in:
  
http://anonscm.debian.org/cgit/d-i/partman-crypto.git/commit/?id=4c53c1c57733154689b54bd5abb689f8720b4984

Confirmed by looking at apt-cache showpkg gnupg-udeb in a sid/amd64
chroot (with udeb support).

 I searched here:
 
   http://codesearch.debian.net/results/gnupg-udeb/
 
 and the only places it shows up are the changelong for partman-crypto,
 and a test case for python-debian.  the package isn't actually used any
 more.
 
 So i plan to drop the gnupg-udeb in a future release of the gnupg
 package, unless i hear a report that it's something people need.
 
 Anyone want to speak up in favor of keeping it?

Dropping looks good to me, thanks for asking!

Mraw,
KiBi.


signature.asc
Description: Digital signature

Re: Bits from the Debian Installer release manager

2015-08-20 Thread Cyril Brulebois 
Hi,

Regis Boudin re...@boudin.name (2015-08-14):
 Thanks a lot for your continuous work as release manager. I have a few
 patches pending for cdebconf ; but I don't want my changes to collide
 with the installer release process, especially if there's a release
 (even alpha) in preparation. Specifically, one of the patches changes
 the plugin API and ABI, so cdebconf-entropy and cdebconf-terminal
 would need to be rebuilt.

Thanks for your kind words. I would have to spend a few more time on
possible impact on reverse dependencies, but as long as we have
something limited to d-i/debian-boot-maintained packages, that should be
rather manageable.

 Bugs I would close in the process are :
 #666530: cups fails to configure under cdebconf
 #752002: Please run maintainer scripts in correct selinux context
 #700924,#720339: Please allow to show/hide characters typed in
 password field

Ooh, the last ones would really be awesome to have. This reminds me I
didn't mention that on my slides (been busy this week…).

 Anyway, can you let me know if it's ok for me to push these now, or if
 not when doing it would be the best for you ?

Please wait a bit so that I can check nothing would get entangled into
the big GCC5/libstdc++6 thing. I expect to give you a more detailed
answer in a few days.

 PS : Sadly, I can't be at Debconf this year, as I'm starting a new
 job. Ironically, I'll only be 1h drive away from Heidelberg...

Feel free to share the location in a private mail. An hour in the right
direction might make your paths cross at some point. ;)

Mraw,
KiBi.


signature.asc
Description: Digital signature

Re: cdimage?? What should we call it?

2015-08-20 Thread Lisandro Damián Nicanor Pérez Meyer 
On Wednesday 19 August 2015 09:45:36 Paul Wise wrote:
 On Wed, Aug 19, 2015 at 6:08 AM, Cyril Brulebois wrote:
  Looking at the various proposals, those caught my attention:
   - get.debian.org
   - download.debian.org
   - install.debian.org
   - installer.debian.org
 
 I kind-of like the idea of pointing all of these to the relevant service.

And having get.debian.org as canonical maybe? But indeed I like the idea.

-- 

Lisandro Damián Nicanor Pérez Meyer
http://perezmeyer.com.ar/
http://perezmeyer.blogspot.com/


signature.asc
Description: This is a digitally signed message part.

Processing of cdrom-detect_1.56_i386.changes

2015-08-20 Thread Debian FTP Masters 
cdrom-detect_1.56_i386.changes uploaded successfully to localhost
along with the files:
  cdrom-detect_1.56.dsc
  cdrom-detect_1.56.tar.xz
  cdrom-detect_1.56_all.udeb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

Processing of cdrom-detect_1.56_i386.changes

2015-08-20 Thread Debian FTP Masters 
cdrom-detect_1.56_i386.changes uploaded successfully to ftp-master.debian.org
along with the files:
  cdrom-detect_1.56.dsc
  cdrom-detect_1.56.tar.xz
  cdrom-detect_1.56_all.udeb

Greetings,

Your Debian queue daemon (running on host coccia.debian.org)

Processing of console-setup_1.132_i386.changes

2015-08-20 Thread Debian FTP Masters 
console-setup_1.132_i386.changes uploaded successfully to localhost
along with the files:
  console-setup_1.132.dsc
  console-setup_1.132.tar.xz
  bdf2psf_1.132_all.deb
  console-setup-amiga-ekmap_1.132_all.udeb
  console-setup-ataritt-ekmap_1.132_all.udeb
  console-setup-freebsd-charmaps-udeb_1.132_all.udeb
  console-setup-freebsd-fonts-udeb_1.132_all.udeb
  console-setup-freebsd_1.132_all.deb
  console-setup-linux-charmaps-udeb_1.132_all.udeb
  console-setup-linux-fonts-udeb_1.132_all.udeb
  console-setup-linux_1.132_all.deb
  console-setup-macintoshold-ekmap_1.132_all.udeb
  console-setup-mini_1.132_all.deb
  console-setup-pc-ekbd_1.132_all.udeb
  console-setup-pc-ekmap_1.132_all.udeb
  console-setup-sun4-ekmap_1.132_all.udeb
  console-setup-sun5-ekmap_1.132_all.udeb
  console-setup-udeb_1.132_all.udeb
  console-setup_1.132_all.deb
  keyboard-configuration_1.132_all.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

Processing of console-setup_1.132_i386.changes

2015-08-20 Thread Debian FTP Masters 
console-setup_1.132_i386.changes uploaded successfully to ftp-master.debian.org
along with the files:
  console-setup_1.132.dsc
  console-setup_1.132.tar.xz
  bdf2psf_1.132_all.deb
  console-setup-amiga-ekmap_1.132_all.udeb
  console-setup-ataritt-ekmap_1.132_all.udeb
  console-setup-freebsd-charmaps-udeb_1.132_all.udeb
  console-setup-freebsd-fonts-udeb_1.132_all.udeb
  console-setup-freebsd_1.132_all.deb
  console-setup-linux-charmaps-udeb_1.132_all.udeb
  console-setup-linux-fonts-udeb_1.132_all.udeb
  console-setup-linux_1.132_all.deb
  console-setup-macintoshold-ekmap_1.132_all.udeb
  console-setup-mini_1.132_all.deb
  console-setup-pc-ekbd_1.132_all.udeb
  console-setup-pc-ekmap_1.132_all.udeb
  console-setup-sun4-ekmap_1.132_all.udeb
  console-setup-sun5-ekmap_1.132_all.udeb
  console-setup-udeb_1.132_all.udeb
  console-setup_1.132_all.deb
  keyboard-configuration_1.132_all.deb

Greetings,

Your Debian queue daemon (running on host coccia.debian.org)

console-setup_1.132_i386.changes ACCEPTED into unstable

2015-08-20 Thread Debian FTP Masters 


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Thu, 20 Aug 2015 15:46:33 +0200
Source: console-setup
Binary: keyboard-configuration console-setup console-setup-mini 
console-setup-linux console-setup-freebsd bdf2psf console-setup-udeb 
console-setup-amiga-ekmap console-setup-ataritt-ekmap 
console-setup-macintoshold-ekmap console-setup-pc-ekmap 
console-setup-sun4-ekmap console-setup-sun5-ekmap console-setup-pc-ekbd 
console-setup-linux-fonts-udeb console-setup-freebsd-fonts-udeb 
console-setup-linux-charmaps-udeb console-setup-freebsd-charmaps-udeb
Architecture: source all
Version: 1.132
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team debian-boot@lists.debian.org
Changed-By: Christian Perrier bubu...@debian.org
Description:
 bdf2psf- font converter to generate console fonts from BDF source fonts
 console-setup - console font and keymap setup program
 console-setup-amiga-ekmap - encoded Linux keyboard layouts for Amiga keyboards 
(udeb)
 console-setup-ataritt-ekmap - encoded Linux keyboard layouts for Atari TT 
keyboards (udeb)
 console-setup-freebsd - FreeBSD specific part of console-setup
 console-setup-freebsd-charmaps-udeb - FreeBSD 8-bit charmaps for 
console-setup-udeb (udeb)
 console-setup-freebsd-fonts-udeb - FreeBSD console fonts for Debian Installer 
(udeb)
 console-setup-linux - Linux specific part of console-setup
 console-setup-linux-charmaps-udeb - Linux 8-bit charmaps for 
console-setup-udeb (udeb)
 console-setup-linux-fonts-udeb - Linux console fonts for Debian Installer 
(udeb)
 console-setup-macintoshold-ekmap - encoded Linux keyboard layouts for 
old-style Macintosh keyboards (udeb)
 console-setup-mini - console font and keymap setup program - reduced version 
for Linux
 console-setup-pc-ekbd - encoded FreeBSD keyboard layouts for PC keyboards 
(udeb)
 console-setup-pc-ekmap - encoded Linux keyboard layouts for PC keyboards (udeb)
 console-setup-sun4-ekmap - encoded Linux keyboard layouts for Sun4 keyboards 
(udeb)
 console-setup-sun5-ekmap - encoded Linux keyboard layouts for Sun5 keyboards 
(udeb)
 console-setup-udeb - Configure the keyboard (udeb)
 keyboard-configuration - system-wide keyboard preferences
Changes:
 console-setup (1.132) unstable; urgency=medium
 .
   [ Updated translations ]
   * Hebrew (he.po) by Lior Kaplan
Checksums-Sha1:
 47187ec2233435f1c89161525a251cca15fb6046 3259 console-setup_1.132.dsc
 2830a666523bcae9276dde6efd4e5cd0d9a87f34 1809948 console-setup_1.132.tar.xz
 8c8980028bfc5f90cff1efb74a87120afa7d6b53 50570 bdf2psf_1.132_all.deb
 73db7dcfb0ca605e36945afeb9b27b6c22e51190 41418 
console-setup-amiga-ekmap_1.132_all.udeb
 a5675dc15dd922eef4afba5b1d5876369c6d0926 40966 
console-setup-ataritt-ekmap_1.132_all.udeb
 a7aa8a734f7a34ae85d013c6c83a143e7ec36dee 7182 
console-setup-freebsd-charmaps-udeb_1.132_all.udeb
 3c6d1a59b78886e0c16f7281178f03d458abed95 11068 
console-setup-freebsd-fonts-udeb_1.132_all.udeb
 0ede07beb2bf86078d67e1b6684bf207157d7455 98494 
console-setup-freebsd_1.132_all.deb
 f4f2590d42209b3b311c8d89e0e0a9c38398705c 22610 
console-setup-linux-charmaps-udeb_1.132_all.udeb
 39eec45c9e59b4441b70b72598d044ff763df1a7 17970 
console-setup-linux-fonts-udeb_1.132_all.udeb
 2382c8c7638777167a775e3fae3eb878d00d173f 983466 
console-setup-linux_1.132_all.deb
 b4f6874111b36cc39b0577f8839c038a6cd47a2a 41080 
console-setup-macintoshold-ekmap_1.132_all.udeb
 5186b3c28f30c555283dbe3ab6d93a18495908d7 23034 console-setup-mini_1.132_all.deb
 dcdb1afb7b8b24f791cf4cbd5f0ee9e1d9977bd5 30622 
console-setup-pc-ekbd_1.132_all.udeb
 7a37683e1308b8495fcee7a4dba66d7497aec348 43158 
console-setup-pc-ekmap_1.132_all.udeb
 e162c25ffc13bd24d56cdd13cf2bb33aaeab9b5d 43432 
console-setup-sun4-ekmap_1.132_all.udeb
 3e2dde26e68b2b38ba6b93986dd1708714131d64 43128 
console-setup-sun5-ekmap_1.132_all.udeb
 c8917218dfc25126c833836c1d6a847e841983d1 212084 
console-setup-udeb_1.132_all.udeb
 b3e1d22158e90ca4b20ff25c2c7bb87518d9ce26 116124 console-setup_1.132_all.deb
 3bbbc7f45942a6bb28fbb7bcf5ec1acd55042ec5 659194 
keyboard-configuration_1.132_all.deb
Checksums-Sha256:
 42555a28bfc89fe57eded6078a23e9ddd742c45f6899274fcfa948ce6dc576a4 3259 
console-setup_1.132.dsc
 09487a3d40d83a9c37badbbb38ced1e118869d651ba8d86e5eba8f822c12e546 1809948 
console-setup_1.132.tar.xz
 ff436cfaebda8ed3020832d5cc7d4560fcc6d06106356a4c7c9a4e13b1d92807 50570 
bdf2psf_1.132_all.deb
 8ad86c888c19c60f9fbd75abe200f677ebebed5d677a89ba64a813473f98c617 41418 
console-setup-amiga-ekmap_1.132_all.udeb
 d0899ded81453253e07e48a1c044bd97135b1b2160b137c78e5c4dd08bc539af 40966 
console-setup-ataritt-ekmap_1.132_all.udeb
 3c7001b86215edcbf2c36f413decd9b7081acf26d38fc2542b0bfbe73a2ba79b 7182 
console-setup-freebsd-charmaps-udeb_1.132_all.udeb
 a3e6d84a70eec0020650b12fa3a2375bcc18730c4f709931e70226eafe7d1856 11068 
console-setup-freebsd-fonts-udeb_1.132_all.udeb
 6b83da732c7de50b939f8dce2200fbd93037f35806753238523757b050180a20 98494

Re: 8.2 and 7.9 planning

2015-08-20 Thread Cyril Brulebois 
Hi,

Adam D. Barratt a...@adam-barratt.org.uk (2015-08-18):
 We're somewhat overdue for both 8.2 and 7.9 now (in that order). Some
 potential September dates:
 
 5/6th - okay for me
 12/13th - the 12th doesn't work for me until at least mid-afternoon
 19th/20th - looks okay
 26th/27th - looks okay
 
 From a quick chat, it appears that the CD team are okay with us doing
 the two releases back-to-back or on the same weekend, as long as we're
 okay with the media sets being produced at a slight delay,
 particularly for Wheezy; what are others thoughts on that?

As september is so far away from me, I don't have any preferences for
any dates, so please pick whatever you see fit, and I'll (try to)
follow.

Mraw,
KiBi.


signature.asc
Description: Digital signature

Re: cdimage?? What should we call it?

2015-08-20 Thread Hideki Yamane 
On Thu, 20 Aug 2015 22:40:32 -0300
Lisandro Damián Nicanor Pérez Meyer perezme...@gmail.com wrote:
 And having get.debian.org as canonical maybe? But indeed I like the idea.

 Not only canonical but also gentoo does. 
 https://get.gentoo.org redirects https://www.gentoo.org/downloads/ 
 (and I like their newer website design...)

 
-- 
Hideki Yamane henr...@debian.or.jp

cdrom-detect_1.56_i386.changes ACCEPTED into unstable

2015-08-20 Thread Debian FTP Masters 


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Thu, 20 Aug 2015 15:19:02 +0200
Source: cdrom-detect
Binary: cdrom-detect
Architecture: source all
Version: 1.56
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team debian-boot@lists.debian.org
Changed-By: Christian Perrier bubu...@debian.org
Description:
 cdrom-detect - Detect CDROM devices and mount the CD (udeb)
Changes:
 cdrom-detect (1.56) unstable; urgency=medium
 .
   [ Updated translations ]
   * Hebrew (he.po) by Lior Kaplan
Checksums-Sha1:
 52bc249c9f12512c6212b7dd22a8d7c32f8d5a64 1652 cdrom-detect_1.56.dsc
 6682000c5b3af8cbedc3c69f8e4f66982fedcaad 120952 cdrom-detect_1.56.tar.xz
 8b265b8613bdd3134630e22ad77a967beff02462 112042 cdrom-detect_1.56_all.udeb
Checksums-Sha256:
 746823726709b94c2a67d9e52e819e86ea562f71516dc9ce91cd61ae4f6a396f 1652 
cdrom-detect_1.56.dsc
 c6e15b840d1e6d9a7f5fc1f7c1a2db478918b84daa30cae891b295088acdf001 120952 
cdrom-detect_1.56.tar.xz
 f3d1fae927b45e354b04d51b5b5e287847818ace09c7089d7b532d163219558b 112042 
cdrom-detect_1.56_all.udeb
Files:
 a3ae0e091edfc012dd6cd772dacb74fd 1652 debian-installer optional 
cdrom-detect_1.56.dsc
 50b5ea74e28fd568640be12f7ecf93b3 120952 debian-installer optional 
cdrom-detect_1.56.tar.xz
 01d261934aa660540d44e5aa5cfb098f 112042 debian-installer optional 
cdrom-detect_1.56_all.udeb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBCAAGBQJV1doPAAoJEIcvcCxNbiWoDnsP/RW6O99SDrvbiycORRh0eehL
Z/wEZaa6jkblLzznQ3wOLa0eQ8orWQ7KzTs11PwYIy0JZVpRem4AuSEm+LSxIL5u
SqOhRV8Ys9GSMVwOGNHUpmyN9dEQS/QraSFEIiXuynzIMLBBkOr14OlPMb1tRZQL
wpI2/hFLTLKiHs8eOuJwCOYbrEOq7OzBKV6AdJfrzALASruzuGqVojDG1KFafSV6
+t0FctQxchnuZ4cZwSvfuqisK21PlNFncJ0zRkzmo2+xWrnCyib2uheyeg0bXCDe
TZ97kinEKJQ1gwux5mKBZUKvmAAAh8m4IgNFd7hkIpyGe2IGo37EMnPSCGprHl8p
QdobcgeJIA7L2afQH4ndPRcavPUwaTNf8qaDpbwe/0zXTEHl17kCjb+ToFfZlidq
VXSLbA9qnkyaRMs0NYg3e7kBebTL3dbav77gmu1mO9EaLYiM1MD1ocRlISwxP0de
Pwcizh9kqvndRjySAAAoHMiZZWEn+5au+wCJzdOjf6RocyMTIn2rzcwD79Jrst8Z
B20Y7PVBs6u/rv0nFwmYEu7bBjB0ikzWDIlPH3+syEyryFySjoOVglZMWf76yJyT
tHCyaQoYm3qs/+zRhREn1L15JF/Wu6r3BPexzPbFXB4Cwwinb/8IWvxe/ShN31/e
rr5dSFWgFjruiHuZPL6K
=vGVS
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

Bug#796189: patch: remove scratchbox2 support

2015-08-20 Thread Riku Voipio 
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.voi...@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=Xuse variant X of the bootstrap scripts
  (currently supported variants: buildd, fakechroot,
-  scratchbox, minbase)
+  minbase)
   --keyring=Kcheck 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