launchpad-reviewers team mailing list archive

[Adam Conrad <adconrad@xxxxxxx>]

Adam Conrad has proposed merging lp:~adconrad/launchpad-buildd/kernel-3.x-fix into lp:launchpad-buildd.

Requested reviews:
  William Grant (wgrant)

For more details, see:
https://code.launchpad.net/~adconrad/launchpad-buildd/kernel-3.x-fix/+merge/90187

This change is necessary to allow us to build pre-oneiric on precise systems.  There's also a small cosmetic fix to make the build logs stop claiming we have 0 CPUs when we actually have 1.

This change also restores the use of /usr/bin/check-implicit-pointer-functions on all 64-bit builds, that logic got messed up a bit in a previous fiddling of linux32 madness.
-- 
https://code.launchpad.net/~adconrad/launchpad-buildd/kernel-3.x-fix/+merge/90187
Your team Launchpad code reviewers is subscribed to branch lp:launchpad-buildd.

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-22 14:39:55 +0000
+++ debian/changelog	2012-01-25 18:50:28 +0000
@@ -1,9 +1,18 @@
-launchpad-buildd (112) UNRELEASED; urgency=low
+launchpad-buildd (112) hardy; urgency=low
 
+  [ Jelmer Vernooij ]
   * Prevent slave from blowing up when it is aborted before a job has
     started. LP: #497772
 
- -- Jelmer Vernooij <jelmer@xxxxxxxxxx>  Thu, 22 Dec 2011 15:34:33 +0100
+  [ Adam Conrad ]
+  * Update sbuild-package and update-debian-chroot to use linux32/64
+    universally, and to pass --uname-2.6 when available, so we can
+    use 3.x.x kernels to build older releases on the buildds.
+  * Fix sbuild-package to report the correct number of cores/jobs.
+  * Make sure /usr/bin/check-implicit-pointer-functions is called for
+    all 64-bit builds on lucid and above, this logic got broken.
+
+ -- Adam Conrad <adconrad@xxxxxxxxxx>  Wed, 25 Jan 2012 11:27:55 -0700
 
 launchpad-buildd (111) hardy; urgency=low
 

=== modified file 'sbuild-package'
--- sbuild-package	2011-11-28 17:27:17 +0000
+++ sbuild-package	2012-01-25 18:50:28 +0000
@@ -24,9 +24,10 @@
 
 shift 3
 
-export NR_PROCESSORS=$(grep ^processor /proc/cpuinfo | wc -l)
+ACTUAL_NR_PROCESSORS=$(grep -c ^processor /proc/cpuinfo | sed 's/^0$/1/')
+export NR_PROCESSORS=$ACTUAL_NR_PROCESSORS
 
-echo "Initiating build $BUILDID with $NR_PROCESSORS processor cores."
+echo "Initiating build $BUILDID with $NR_PROCESSORS jobs across $ACTUAL_NR_PROCESSORS processor cores."
 
 if [ $NR_PROCESSORS -lt 2 ]; then
         unset NR_PROCESSORS
@@ -36,25 +37,20 @@
 
 hostarch=$(dpkg --print-architecture)
 
+if setarch --help | grep -q uname-2.6; then
+  UNAME26="--uname-2.6"
+else
+  UNAME26=""
+fi
+
 WARN=""
-case $hostarch in
-  hppa|powerpc|sparc)
-    SBUILD="linux32 $SBUILD"
-    WARN="--warnonly"
-    ;;
-  i386|lpia|arm*)
-    # SBUILD is already correct
-    WARN="--warnonly"
-    ;;
-  amd64)
-    case "$ARCHITECTURETAG" in
-      i386|lpia)
-        SBUILD="linux32 $SBUILD"
-      ;;
-    esac
-    WARN="--warnonly"
-    ;;
-  ia64)
+case $ARCHITECTURETAG in
+  armel|armhf|hppa|i386|lpia|mips|mipsel|powerpc|s390|sparc)
+    SBUILD="linux32 $UNAME26 $SBUILD"
+    WARN="--warnonly"
+    ;;
+  alpha|amd64|arm64|hppa64|ia64|ppc64|s390x|sparc64)
+    SBUILD="linux64 $UNAME26 $SBUILD"
     ;;
 esac
 

=== modified file 'update-debian-chroot'
--- update-debian-chroot	2011-11-29 11:09:15 +0000
+++ update-debian-chroot	2012-01-25 18:50:28 +0000
@@ -25,16 +25,18 @@
 
 hostarch=$(dpkg --print-architecture)
 
-case $hostarch in
-  hppa|powerpc|sparc)
-    CHROOT="linux32 $CHROOT"
+if setarch --help | grep -q uname-2.6; then
+  UNAME26="--uname-2.6"
+else
+  UNAME26=""
+fi
+
+case $ARCHITECTURETAG in
+  armel|armhf|hppa|i386|lpia|mips|mipsel|powerpc|s390|sparc)
+    CHROOT="linux32 $UNAME26 $CHROOT"
     ;;
-  amd64)
-    case "$ARCHITECTURETAG" in
-      i386|lpia)
-        CHROOT="linux32 $CHROOT"
-        ;;
-    esac
+  alpha|amd64|arm64|hppa64|ia64|ppc64|s390x|sparc64)
+    CHROOT="linux64 $UNAME26 $CHROOT"
     ;;
 esac