tags 355034 + patch thanks Martin Michlmayr <[EMAIL PROTECTED]> writes:
> sbuilt itself works fine when my build dir with the chroot-<suite>
> symlink is in ~/debian/build rather than ~/build. However, it seems
> that all the helper programs, such as gochroot and updatechroot,
> hardcode ~/build. Given that you have to be in the directory with the
> symlink anyway, there no need to hardcode ~/build.
The attached patch should fix this for you. This removes the
"~/build/" from the chroot path in bin/common_functions. However, the
full fix for this would be to use the chroot code from sbuild itself,
which involves moving the chroot handling logic out into Sbuild.pm so
we can reuse it. This is a bigger job, so this patch will fix things
sufficiently in the meantime.
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.2
diff -u -r1.2 README.bins
--- bin/README.bins 18 Mar 2006 19:10:32 -0000 1.2
+++ bin/README.bins 20 Mar 2006 21:25:49 -0000
@@ -6,8 +6,8 @@
· s,stable,-t,testing,-u,unstable
- - a symlink ~/build/chroot-{stable,testing,unstable} pointing
- to the chroot must exist
+ - a symlink in the current directory, chroot-{stable,testing,unstable}
+ pointing to the chroot must exist
· any other distribution name
Index: bin/common_functions
===================================================================
RCS file: /cvsroot/buildd-tools/sbuild/bin/common_functions,v
retrieving revision 1.2
diff -u -r1.2 common_functions
--- bin/common_functions 18 Mar 2006 19:10:32 -0000 1.2
+++ bin/common_functions 20 Mar 2006 21:25:49 -0000
@@ -11,25 +11,21 @@
;;
-u|unstable )
DIST=unstable
- CHROOT=~/build/chroot-$DIST
;;
-t|testing )
DIST=testing
- CHROOT=~/build/chroot-$DIST
;;
-s|stable )
DIST=stable
- CHROOT=~/build/chroot-$DIST
;;
-o|oldstable )
DIST=oldstable
- CHROOT=~/build/chroot-$DIST
;;
* )
DIST=$1
- CHROOT=~/build/chroot-$DIST
;;
esac
+ CHROOT=$(pwd)/chroot-$DIST
if [ ! -d $CHROOT/etc ]; then
echo >&2 "..doesn't appear to be a chroot: $CHROOT"
Index: debian/changelog
===================================================================
RCS file: /cvsroot/buildd-tools/sbuild/debian/changelog,v
retrieving revision 1.135
diff -u -r1.135 changelog
--- debian/changelog 18 Mar 2006 19:14:09 -0000 1.135
+++ debian/changelog 20 Mar 2006 21:25:50 -0000
@@ -36,6 +36,9 @@
* bin/README.bins: Document changed chroot syntax.
* bin/checkchroot: Set LC_COLLATE=POSIX to prevent collation issues
(mismatches with the reference file; Closes: #294883).
+ * bin/common_functions, bin/README.bins: Remove ~/build/ from the
+ chroot path, to match sbuild behaviour of searching in the
+ current directory (Closes: #355034).
--
pgpt3P6hDyvyx.pgp
Description: PGP signature
