summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-04-21 14:54:04 +0200
committerX2go Administrator <x2go-admin@ymir.das-netzwerkteam.de>2011-04-21 14:54:04 +0200
commit07491ab854acf986f58e68d916137acbfb83b329 (patch)
treed7ca9b281a83469fce20b8f3d82e01505769fe53
parent144e6e5922bcffbf5706c972ac12b3ef1b625a3c (diff)
downloadbuildscripts-07491ab854acf986f58e68d916137acbfb83b329.tar.gz
buildscripts-07491ab854acf986f58e68d916137acbfb83b329.tar.bz2
buildscripts-07491ab854acf986f58e68d916137acbfb83b329.zip
making sure the $ARCHITECTURE var gets set
-rwxr-xr-xbin/pdebuild-user-mode-linux1
-rw-r--r--home/.pbuilderrc9
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/pdebuild-user-mode-linux b/bin/pdebuild-user-mode-linux
index 42b118b..6e8f468 100755
--- a/bin/pdebuild-user-mode-linux
+++ b/bin/pdebuild-user-mode-linux
@@ -34,7 +34,6 @@ export PBCURRENTCOMMANDLINEOPERATION="pdebuild"
PKG_SOURCENAME=$(dpkg-parsechangelog|sed -n 's/^Source: //p')
PKG_VERSION=$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p')
ARCHITECTURE=${ARCHITECTURE-$(dpkg-architecture -qDEB_HOST_ARCH)}
-DEBOOTSTRAPOPTS="--arch=$ARCHITECTURE"
if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
if [ ! readlink -f .. ]; then
diff --git a/home/.pbuilderrc b/home/.pbuilderrc
index eb92cc7..cf3b343 100644
--- a/home/.pbuilderrc
+++ b/home/.pbuilderrc
@@ -12,11 +12,11 @@ APTCACHEHARDLINK="no"
USE_DEBUILD_INTERNAL="yes"
PRESERVE_BUILDPLACE="yes"
-if [ "x$ARCH" = "xi386" ]; then
- DEBBUILDOPTS="-B"
-fi
-
if [ -n "${DIST}" ] && [ -n "${CODENAME}" ] && [ -n "${ARCH}" ]; then
+ if [ "x$ARCH" = "xi386" ]; then
+ DEBBUILDOPTS="-B"
+ fi
+
if [ "x${DIST}" = "xubuntu" ]; then
MIRRORSITE="http://de.archive.ubuntu.com/ubuntu"
else
@@ -27,6 +27,7 @@ if [ -n "${DIST}" ] && [ -n "${CODENAME}" ] && [ -n "${ARCH}" ]; then
DISTRIBUTION="$CODENAME"
BUILDRESULT="$BASEDIRECTORY/$DIST-$CODENAME-$ARCH/result/"
APTCACHE="$BASEDIRECTORY/$DIST-$CODENAME-$ARCH/aptcache/"
+ ARCHITECTURE="$ARCH"
fi
export OTHERMIRROR