projects
/
git-tools-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid --keyring opt for debootstrap. Fixes bug 4122
[git-tools-moved-to-github.git]
/
id-deb-build
/
pbuilderrc
diff --git
a/id-deb-build/pbuilderrc
b/id-deb-build/pbuilderrc
index
933fbe1
..
8d16d2b
100644
(file)
--- a/
id-deb-build/pbuilderrc
+++ b/
id-deb-build/pbuilderrc
@@
-7,7
+7,8
@@
: ${ARCH:=$(dpkg --print-architecture)}
NAME="$DIST-$ARCH"
DISTRIBUTION="$DIST"
: ${ARCH:=$(dpkg --print-architecture)}
NAME="$DIST-$ARCH"
DISTRIBUTION="$DIST"
-DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")
+# We avoid keyring in assignment below. bug 4122
+DEBOOTSTRAPOPTS=("--arch" "$ARCH" --variant=buildd)
BASETGZ="`dirname $BASETGZ`/$NAME-base.tgz"
#BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
BUILDRESULT="$NAME"
BASETGZ="`dirname $BASETGZ`/$NAME-base.tgz"
#BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
BUILDRESULT="$NAME"