tags 358668 + patch fixed-upstream pending thanks Martin Michlmayr <[EMAIL PROTECTED]> writes:
> * Michael Banck <[EMAIL PROTECTED]> [2006-03-24 00:58]: >> > s/crates/creates/ >> > s/debootstrap/cdebootstrap/ >> >> Is there any good reason we don't use the official debootstrap? > > Yeah, I think I later tried to ask rleigh on irc but he wasn't around. > > I think all reasons for cdebootstrap went away when debootstrap got > dependency handling. d-i uses debootstrap and has no plans to move, > so it woud be great if sbuild did too. The following patch has been applied to fix this: Index: sbuild-setup.7 =================================================================== RCS file: /cvsroot/buildd-tools/sbuild/sbuild-setup.7,v retrieving revision 1.4 diff -u -r1.4 sbuild-setup.7 --- sbuild-setup.7 9 Mar 2006 21:33:52 -0000 1.4 +++ sbuild-setup.7 27 Mar 2006 09:53:06 -0000 @@ -22,7 +22,7 @@ .SH DESCRIPTION \fBsbuild\fP uses chroots to build packages within, to provide a minimal and consistent build environment. This man page describes the procedure to create -a chroot by hand using cdebootstrap. These are only guidelines; depending upon +a chroot by hand using debootstrap. These are only guidelines; depending upon the setup required, several of the steps may be omitted entirely. .PP A number of the steps below are automatically run by the @@ -31,7 +31,7 @@ .SH CHROOT SETUP This guide sets up a sarge chroot on a powerpc machine. Adjust the names for other suites and architectures. -.SS 1. Run cdebootstrap to create the chroot +.SS 1. Run debootstrap to create the chroot \f[CR]# \f[CB]mkdir \-p /srv/chroot/sarge\fP\fP .br .PP @@ -42,9 +42,9 @@ .br .PP Add to /etc/fstab and mount (see next section for full fstab example). -Finally, run cdebootstrap to create the chroot: +Finally, run debootstrap to create the chroot: .PP -\f[CR]# \f[CB]cdebootstrap \-a powerpc \-f build sarge /srv/chroot/sarge http://ftp.uk.debian.org/debian/\fP\fP +\f[CR]# \f[CB]debootstrap \-\-variant=buildd /srv/chroot/sarge http://ftp.uk.debian.org/debian/\fP\fP .br .SS 2. Set up additional mounts An example \fI/etc/fstab\fP: @@ -211,7 +211,7 @@ This script, located in \fI/usr/share/sbuild\fP will automatically do a number of the steps described above, including: .IP \[bu] -Running cdebootstrap. +Running debootstrap. .IP \[bu] Setting up APT sources in \fI/etc/apt/sources.list\fP. .IP \[bu] @@ -267,7 +267,7 @@ .SH FILES .TP .I /usr/share/sbuild/buildd.chroot -A script to automatically create and configure a chroot using cdebootstrap. +A script to automatically create and configure a chroot using debootstrap. .SH AUTHORS Roger Leigh. .SH COPYRIGHT @@ -278,7 +278,7 @@ Software Foundation; either version 2 of the License, or (at your option) any later version. .SH SEE ALSO -.BR cdebootstrap (1), +.BR debootstrap (1), .BR sbuild (1). .\"# .\"# The following sets edit modes for GNU EMACS Index: chroot/README-buildd.chroot =================================================================== RCS file: /cvsroot/buildd-tools/sbuild/chroot/README-buildd.chroot,v retrieving revision 1.3 diff -u -r1.3 README-buildd.chroot --- chroot/README-buildd.chroot 15 Feb 2006 14:52:55 -0000 1.3 +++ chroot/README-buildd.chroot 27 Mar 2006 09:53:06 -0000 @@ -2,7 +2,7 @@ buildd.chroot (Sarge Edition) ============================= -This script crates the chroot environment for sbuild. It's written +This script creates the chroot environment for sbuild. It's written on the basis of current debootstrap --variant=buildd option by adding the few other files needed for a working environment. The pre-sarge script is broken in sarge, please ignore it. Index: chroot/buildd.chroot =================================================================== RCS file: /cvsroot/buildd-tools/sbuild/chroot/buildd.chroot,v retrieving revision 1.3 diff -u -r1.3 buildd.chroot --- chroot/buildd.chroot 15 Feb 2006 15:40:43 -0000 1.3 +++ chroot/buildd.chroot 27 Mar 2006 09:53:06 -0000 @@ -24,7 +24,7 @@ TARGET=$2 MIRROR=$3 -/usr/bin/cdebootstrap -a "$(dpkg-architecture -qDEB_HOST_ARCH)" -f build "$SUITE" "$TARGET" "$MIRROR" +/usr/sbin/debootstrap --variant=buildd "$SUITE" "$TARGET" "$MIRROR" cp /etc/hosts "$TARGET/etc/hosts" || true echo "# $SUITE" > "$TARGET/etc/apt/sources.list" Index: debian/changelog =================================================================== RCS file: /cvsroot/buildd-tools/sbuild/debian/changelog,v retrieving revision 1.137 diff -u -r1.137 changelog --- debian/changelog 21 Mar 2006 10:06:50 -0000 1.137 +++ debian/changelog 27 Mar 2006 09:53:07 -0000 @@ -33,6 +33,7 @@ - build(): Check for _all.udeb files which are built when they shouldn't (merge from upstream SVN cset 98). * sbuild.1: Document schroot chroot naming. + * sbuild-setup.7: Use debootstrap rather than cdebootstrap. * bin/common_functions: Allow any chroot name to be specified (Closes: #356785). * bin/README.bins: Document changed chroot syntax. @@ -41,6 +42,10 @@ * bin/common_functions, bin/README.bins: Remove ~/build/ from the chroot path, to match sbuild behaviour of searching in the current directory (Closes: #355034). + * chroot/README-buildd.chroot: Fix typo. + * chroot/buildd.chroot: Use debootstrap rather than cdebootstrap + (Closes: #358668). + * debian/control: Recommend debootstrap rather than cdebootstrap. -- Index: debian/control =================================================================== RCS file: /cvsroot/buildd-tools/sbuild/debian/control,v retrieving revision 1.11 diff -u -r1.11 control --- debian/control 8 Mar 2006 22:39:27 -0000 1.11 +++ debian/control 27 Mar 2006 09:53:07 -0000 @@ -9,7 +9,7 @@ Package: sbuild Architecture: all Depends: ${perl:Depends}, perl-modules, adduser, apt, exim4 | mail-transport-agent, sudo, dpkg-dev, grep-dctrl -Recommends: fakeroot, cdebootstrap, schroot (>= 0.2.7) +Recommends: fakeroot, debootstrap, schroot (>= 0.2.7) Suggests: wget, deborphan Description: Tool for building Debian binary packages from Debian sources sbuild is part of a suite of programs -- consisting of -- Roger Leigh Printing on GNU/Linux? http://gutenprint.sourceforge.net/ Debian GNU/Linux http://www.debian.org/ GPG Public Key: 0x25BFB848. Please sign and encrypt your mail.
signature.asc
Description: Digital signature
