aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpbuilder-buildpackage.sh8
-rwxr-xr-xpbuilder-updatebuildenv11
2 files changed, 11 insertions, 8 deletions
diff --git a/pbuilder-buildpackage.sh b/pbuilder-buildpackage.sh
index bd56ae2..7f0a5c0 100755
--- a/pbuilder-buildpackage.sh
+++ b/pbuilder-buildpackage.sh
@@ -5,12 +5,14 @@ export LC_ALL=C
function copydsc () {
local DSCFILE=$1
local TARGET=$2
- cp \
+ for FILE in
"$DSCFILE" \
$(echo "$DSCFILE" | sed 's/^\(.*\)\.dsc$/\1/' ).diff.gz \
$(echo "$DSCFILE" | sed 's/^\(.*\)\.dsc$/\1/').tar.gz \
- $(echo "$DSCFILE" | sed 's/\(.*\)-[^-.]*\.dsc$/\1/').orig.tar.gz \
- $TARGET
+ $(echo "$DSCFILE" | sed 's/\(.*\)-[^-.]*\.dsc$/\1/').orig.tar.gz ; do
+ cp $FILE $TARGET ;
+ done
+
}
function checkbuilddep () {
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 6b347de..a5f8d07 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -2,12 +2,13 @@
export LANG=C
export LC_ALL=C
-PACKAGENAME=$1
-
+DISTRIBUTION=$1
+test -z "$DISTRIBUTION" && DISTRIBUTION=woody
. /etc/pbuilderrc
-
CHROOTEXEC="chroot $BUILDPLACE "
+echo "Upgrading for distribution $DISTRIBUTION"
+
cd $MYREPOSITORY
echo Initializing repository
dpkg-scanpackages . . | gzip > Packages.gz
@@ -29,8 +30,8 @@ echo Installing apt-lines
cat > $BUILDPLACE/etc/apt/sources.list << EOF
deb $MYREPOSITORYHTTP ./
deb-src $MYREPOSITORYHTTP ./
-deb http://www.jp.debian.org/debian unstable main contrib non-free
-deb-src http://www.jp.debian.org/debian unstable main contrib non-free
+deb http://www.jp.debian.org/debian $DISTRIBUTION main contrib non-free
+deb-src http://www.jp.debian.org/debian $DISTRIBUTION main contrib non-free
EOF
echo Refreshing the base.tgz