tags 356785 + patch thanks Martin Michlmayr <[EMAIL PROTECTED]> writes:
> * Martin Michlmayr <[EMAIL PROTECTED]> [2006-03-14 04:16]:
>> I get a "..doesn't appear to be a chroot" error from updatechroot for
>> oldstable-security while it works for oldstable - and they have the same
>> configuration.
>
> What happens is that /usr/share/sbuild/common_functions doesn't know
> about *-security, experimental or user-defined chroots.
This patch teaches it to allow arbitrary distributions, with a slight
syntax change (absolute distribution paths are no longer allowed).
Regards,
Roger
--
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.
Index: bin/README.bins
===================================================================
RCS file: /cvsroot/buildd-tools/sbuild/bin/README.bins,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 README.bins
--- bin/README.bins 17 Sep 2004 13:17:41 -0000 1.1.1.1
+++ bin/README.bins 18 Mar 2006 18:59:29 -0000
@@ -4,19 +4,21 @@
The <chroot> arg used by most scripts has two forms:
- . s,stable,-t,testing,-u,unstable
+ · s,stable,-t,testing,-u,unstable
- a symlink ~/build/chroot-{stable,testing,unstable} pointing
to the chroot must exist
- . an absolute path
+ · any other distribution name
- in this case the argument is parsed to try and determine
- the distribution, for those scripts that need it:
+ the distribution, for those scripts that need it, for example:
- checkchroot /usr/local/chroot/unstable-security
- - CHROOT=/usr/local/chroot/unstable
- - DIST=unstable so it can find the ref-unstable reference file
+ # checkchroot stable-security
+
+ - CHROOT=/usr/local/chroot/chroot-stable-security
+ - DIST=stable-security so it can find the ref-stable-security
+ reference file
The scripts:
@@ -107,12 +109,3 @@
ppack -r st -Lb pkg # urlified a package listing -> browser
- this is useful for browsing an installed packages contents. Try
"ppack -Lb sbuild" although it may be a little late for that now. :-)
-
- ------------------------------------------
-You may find other useful utilities in the wanna-build CVS,
-cvs.linux-m68k.org
-
-
-
-
- vim:et
Index: bin/common_functions
===================================================================
RCS file: /cvsroot/buildd-tools/sbuild/bin/common_functions,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 common_functions
--- bin/common_functions 17 Sep 2004 13:17:41 -0000 1.1.1.1
+++ bin/common_functions 18 Mar 2006 18:59:29 -0000
@@ -1,6 +1,6 @@
usage () {
echo >&2 "Usage: $USAGE_STRING"
- echo >&2 " chroot=-u|unstable|-t|testing|-s|stable|-o|oldstable or absolute path"
+ echo >&2 " chroot=-u|unstable|-t|testing|-s|stable|-o|oldstable|distribution"
exit 1
}
@@ -26,8 +26,8 @@
CHROOT=~/build/chroot-$DIST
;;
* )
- DIST=unstable
- CHROOT=$1
+ DIST=$1
+ CHROOT=~/build/chroot-$DIST
;;
esac
Index: debian/changelog
===================================================================
RCS file: /cvsroot/buildd-tools/sbuild/debian/changelog,v
retrieving revision 1.133
diff -u -r1.133 changelog
--- debian/changelog 18 Mar 2006 17:55:11 -0000 1.133
+++ debian/changelog 18 Mar 2006 18:59:30 -0000
@@ -30,6 +30,9 @@
- setup_options(): Remove unused call to tmpnam().
- check_dependencies(): Print kernel information along with the
toolchain package versions, in the same style as reportbug.
+ - bin/common_functions: Allow any chroot name to be specified
+ (Closes: #356785).
+ - bin/README.bins: Document changed chroot syntax.
* sbuild.1: Document schroot chroot naming.
--
pgpbPW8exhqp6.pgp
Description: PGP signature
