aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYOSHINO Yoshihito <yy.y.ja.jp@gmail.com>2011-07-27 15:29:05 +0900
committerJunichi Uekawa <dancer@netfort.gr.jp>2011-08-07 14:37:25 +0900
commit4867dd6acbdb052257922161fb850b099496d77b (patch)
treec5765138509615f27bcc59bb2e84c00fe2b06ea7
parent68dec0e0023e71ffd1293a30f856e028e68c73cc (diff)
downloadpbuilder-4867dd6acbdb052257922161fb850b099496d77b.tar
pbuilder-4867dd6acbdb052257922161fb850b099496d77b.tar.gz
cannot cross build i386 only package on amd64 host (closes: #624530)
Followup-For: Bug #624530 Package: pbuilder Version: 0.200 found 624530 0.199+nmu2 severity 624530 important tags 624530 patch thanks Hi, The changes introduced in 0.199+nmu2 (arch-wildcard-part2.patch in Message #159 of Bug#363193) breaks the cross building of packages (not only i386 packages on amd64, but also amd64 ones on i386 running on amd64 kernel). The checkarchitecture must be done inside the build place. That patch does not actually check anything, and what's worse, breaks the cross building. So I propose reverting back the changes. Thanks, -- YOSHINO Yoshihito <yy.y.ja.jp@gmail.com>
-rwxr-xr-xpbuilder-buildpackage3
-rw-r--r--pbuilder-buildpackage-funcs19
2 files changed, 0 insertions, 22 deletions
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 8b42b6d..b8e2446 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -31,9 +31,6 @@ if [ ! -f "$PACKAGENAME" ]; then
exit 1;
fi;
-# check if this package should be built at all
-checkarchitecture "$PACKAGENAME"
-
if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then
SUTOUSER="env LOGNAME=$BUILDUSERNAME su -p $BUILDUSERNAME"
DEBBUILDOPTS="${DEBBUILDOPTS:+$DEBBUILDOPTS }-rfakeroot"
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index fedbfc4..0c19dc7 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -30,25 +30,6 @@ function copydsc () {
done
}
-function checkarchitecture () {
- local DSCFILE="$1"
- local ARCHES="$(cat $DSCFILE | grep Architecture | sed 's/^[^:]\+:\s*//')"
- local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
- local VALID_ARCH
- for d in $ARCHES; do
- if dpkg-architecture -a$ARCH -i$d; then
- VALID_ARCH="yes"
- break
- fi
- done
- if [ ! $VALID_ARCH ] && [ ! "$ARCHES" = "all" ]; then
- local msg="E: $ARCH not in arch list or does not match any "
- msg="$msg arch wildcards: $ARCHES"
- log $msg
- exit 2
- fi
-}
-
function checkbuilddep () {
# call satisfydepends
local BUILDOPT="--binary-all"