diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rwxr-xr-x | pbuildd/buildd.sh | 44 |
3 files changed, 41 insertions, 24 deletions
@@ -1,3 +1,11 @@ +2004-08-08 Junichi Uekawa <dancer@debian.org> + + * pbuildd/buildd.sh: Applied patch from Roland Stigge. + 263987 264182 264182 + buildd.sh assumes to be in ${BASEDIRECTORY} + buildd.sh shouldn't try to build packages for wrong architectures + support DEPWAIT + 2004-07-29 Junichi Uekawa <dancer@debian.org> * debian/pbuilder-uml.files: add pbuilder-uml-checkparams diff --git a/debian/changelog b/debian/changelog index bc73f9b..c1aa523 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ -pbuilder (0.113) UNRELEASED; urgency=low +pbuilder (0.114) unstable; urgency=low - * pdebuild UML fix (closes: #250526) + * pbuildd.sh: Apply patches from Roland Stigge (closes: #263987, #264182, #264182) - -- Junichi Uekawa <dancer@debian.org> Thu, 29 Jul 2004 08:20:05 +0900 + -- Junichi Uekawa <dancer@debian.org> Sun, 8 Aug 2004 08:36:57 +0900 + +pbuilder (0.113) unstable; urgency=low + + * pdebuild UML variable handling fix; should treat more variables + more properly. May need more fixes later. (closes: #250526) + + -- Junichi Uekawa <dancer@debian.org> Fri, 30 Jul 2004 08:11:44 +0900 pbuilder (0.112) unstable; urgency=low diff --git a/pbuildd/buildd.sh b/pbuildd/buildd.sh index c12a0e5..e066c7c 100755 --- a/pbuildd/buildd.sh +++ b/pbuildd/buildd.sh @@ -9,11 +9,9 @@ NOBUILDDEP=${BASEDIRECTORY}/FAILED/NOBUILDDEP FAILED=${BASEDIRECTORY}/FAILED DEPWAIT=${BASEDIRECTORY}/DEPWAIT SUCCESS=${BASEDIRECTORY}/SUCCESS -DEPWAIT=${BASEDIRECTORY}/DEPWAIT mkdir "$FAILED" || true mkdir "$DEPWAIT" || true mkdir "$SUCCESS" || true -mkdir "$DEPWAIT" || true mkdir ${BASEDIRECTORY}/WORKING || true mkdir ${BASEDIRECTORY}/STATUS || true mkdir "$NOBUILDDEP" || true @@ -32,24 +30,6 @@ function buildone() { local PROGNAME="$1" local LOGFILE=${BASEDIRECTORY}/WORKING/"$PROGNAME.log" - - # this part needs to be atomic - status "considering $PROGNAME" - if grep "$PROGNAME" avoidlist; then - echo Skip. - return - fi - if echo "$PROGNAME" | grep "^kernel-image"; then - echo I hate kernel images. - return - fi - - if [ $(find -name $PROGNAME.log | wc -l ) = "1" ]; then - echo Already build tried for "$PROGNAME" - return - fi - # end of atomic. - status "building $PROGNAME" mkdir $BUILDTMP || true ( @@ -68,6 +48,9 @@ function buildone() { elif grep '^E: Could not satisfy build-dependency' "$LOGFILE" > /dev/null ; then echo "Build-dep wait" mv "$LOGFILE" "$DEPWAIT" + elif grep '^E: pbuilder-satisfydepends failed.' "$LOGFILE" > /dev/null ; then + echo "Build-dep satisfaction failed on other package's installation" + mv "$LOGFILE" "$DEPWAIT" else mv "$LOGFILE" "$FAILED" echo Build failed @@ -85,7 +68,26 @@ $ROOTCOMMAND pbuilder update tmpfile=$(tempfile) wget "${MIRROR}"/debian/dists/unstable/main/source/Sources.gz -O${tmpfile} -for A in $( zcat ${tmpfile} | sed -n 's/^Package: //p' | cut -d\ -f1|sort | uniq | bogosort -n ); do +for A in $( zcat ${tmpfile} | awk "BEGIN { RS = \"\" } + {if (match(\$0, /\nArchitecture: [^\n]*(all|any|`dpkg --print-architecture`)/)) print \$0}" | sed -n 's/^Package: //p' | cut -d\ -f1|sort | uniq | bogosort -n ); do + + # this part needs to be atomic + status "considering $A" + if grep "^$A$" $AVOIDLIST; then + echo Skip. + continue + fi + if echo "$A" | grep "^kernel-image"; then + echo I hate kernel images. + continue + fi + + if [ $(find ${BASEDIRECTORY} -name $A.log | wc -l ) = "1" ]; then + echo Already build tried for "$A" + continue + fi + # end of atomic. + waitingroutine buildone $A done |