Hi Wouter,
seems your patch is broken:
from #debian-qa:
< KGB-1> | 08:39:35> d-i_build_flash-kernel: Build failed in Jenkins. See <http://jenkins.debian.net/job/d-i_build_flash-kernel/48/changes>
< ijc> | Not sure about that jenkins failure, looks like infra rather than the pkg: dpkg-genchanges: error: cannot read files list file: No such file or directory
< h01ger> | hm. 47 "worked", but only because it thought it could not be build on amd64
< h01ger> | ijc: is that package to be build on amd64?
< ijc> ah, no, its an arm thing. That would explain it!
< h01ger> | wouter recently added a patch to fix the architecture check
< ijc> a patch to the infra, not flash-kernel, right?
< h01ger> | ijc: yes
< h01ger> | 81051c4fc1 in git.debian.org/git/users/holger/jenkins.debian.net.git
Looking at it, I assume this
"if ! dpkg-architecture -i$ARCH ; then"
needs to be corrected to
"if ! dpkg-architecture -i$MYARCH ; then"
but I need to wake up more first before applying this...
$ git show 81051c4fc12865b61759801ab2aa5ad00fe9b432
commit 81051c4fc12865b61759801ab2aa5ad00fe9b432
Author: Wouter Verhelst <w@uter.be>
Date: Tue Feb 25 08:28:04 2014 +0100
Fix architecture check
d-i_build.sh checks the architecture by parsing a hardcoded list of
architecture wildcards. It misses the wildcards of the form <os>-any and
any-<cpu>, however, which have been supported since a fair while now.
This has caused jenkins to (incorrectly) skip the builds for partman-nbd
up until partman-nbd 0.22 (which reverted back to Architecture: all).
Rather than trying to expand the hardcoded list, instead use
dpkg-architecture's -i option, which checks if the current architecture
matches the wildcard architecture specified as an argument to -i. This
option has been available since dpkg 1.13.13, i.e., pre-oldstable.
diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh
index 3a5f602..f5dc063 100755
--- a/bin/d-i_build.sh
+++ b/bin/d-i_build.sh
@@ -36,12 +36,14 @@ pdebuild_package() {
echo "Warning: A source package without debian/control, so no build will be tried."
return
fi
- ARCH=$(dpkg --print-architecture)
- EGREP_PATTERN="( all| any| $ARCH)"
- if [ ! $(grep "Architecture:" debian/control | egrep "$EGREP_PATTERN" | wc -l ) -gt 0 ] ; then
- echo "This package is not to be supposed to be build on $ARCH:"
- grep "Architecture:" debian/control
- return
+ ARCH=$(grep 'Architecture:' debian/control | cut -d' ' -f 2)
+ MYARCH=$(dpkg --print-architecture)
+ if [ $ARCH != "all" ] ; then
+ if ! dpkg-architecture -i$ARCH ; then
+ echo "This package is not to be supposed to be build on $MYARCH:"
+ grep "Architecture:" debian/control
+ return
+ fi
fi
#
# prepare build
cheers,
Holger
Attachment:
signature.asc
Description: This is a digitally signed message part.