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 <[email protected]>
diff -ur pbuilder-0.200/pbuilder-buildpackage pbuilder-0.200.new/pbuilder-buildpackage
--- pbuilder-0.200/pbuilder-buildpackage 2011-06-25 08:06:40.000000000 +0900
+++ pbuilder-0.200.new/pbuilder-buildpackage 2011-07-27 15:13:05.073598440 +0900
@@ -31,9 +31,6 @@
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 -ur pbuilder-0.200/pbuilder-buildpackage-funcs pbuilder-0.200.new/pbuilder-buildpackage-funcs
--- pbuilder-0.200/pbuilder-buildpackage-funcs 2011-06-25 08:06:40.000000000 +0900
+++ pbuilder-0.200.new/pbuilder-buildpackage-funcs 2011-07-27 15:13:05.073598440 +0900
@@ -30,25 +30,6 @@
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"
