Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752738Ab1EJF0Y (ORCPT ); Tue, 10 May 2011 01:26:24 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:47567 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750775Ab1EJF0X (ORCPT ); Tue, 10 May 2011 01:26:23 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=FtLb3vvi5r8Fq/aib3LqGcdE8qI+u31hmEz13Kio/XEtK83M+mQnuQm52t7wAFN2Y3 bCMWfczDEFxddC6X3XybD+TElCxLfpGpeg9Qh5EamI4ftky9AM4ylaOzCFAH6hZJn4Rx IkPrIj0cmtgtTTt8kxROMSnSDNryUxdcDu2Pk= From: Nuno Subtil To: Michal Marek , maximilian attems , Robert Gordon , linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nuno Subtil Subject: [PATCH 1/1] deb-pkg: fix cross-compile build Date: Mon, 9 May 2011 22:25:14 -0700 Message-Id: <1305005114-25810-1-git-send-email-subtil@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2991 Lines: 91 When generating the header package, scripts/package/builddeb was inferring the target architecture by looking at the output of dpkg --print-architecture. This makes it go instead through the same detection sequence that was previously implemented in create_package. Signed-off-by: Nuno Subtil --- scripts/package/builddeb | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index f6cbc3d..67a72d2 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -12,21 +12,10 @@ set -e -create_package() { - local pname="$1" pdir="$2" - - cp debian/copyright "$pdir/usr/share/doc/$pname/" - cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian" - gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian" - sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \ - | xargs -r0 md5sum > DEBIAN/md5sums" - - # Fix ownership and permissions - chown -R root:root "$pdir" - chmod -R go-w "$pdir" - +infer_debian_architecture() { # Attempt to find the correct Debian architecture - local forcearch="" debarch="" + forcearch="" + debarch="" case "$UTS_MACHINE" in i386|ia64|alpha) debarch="$UTS_MACHINE" ;; @@ -60,6 +49,22 @@ create_package() { if [ -n "$debarch" ] ; then forcearch="-DArchitecture=$debarch" fi +} + +create_package() { + local pname="$1" pdir="$2" + + cp debian/copyright "$pdir/usr/share/doc/$pname/" + cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian" + gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian" + sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \ + | xargs -r0 md5sum > DEBIAN/md5sums" + + # Fix ownership and permissions + chown -R root:root "$pdir" + chmod -R go-w "$pdir" + + infer_debian_architecture # Create the package dpkg-gencontrol -isp $forcearch -p$pname -P"$pdir" @@ -246,15 +251,16 @@ mkdir -p "$destdir" (cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -) (cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -) rm -f /tmp/files$$ /tmp/objfiles$$ -arch=$(dpkg --print-architecture) + +infer_debian_architecture cat <> debian/control Package: $kernel_headers_packagename Provides: linux-headers, linux-headers-2.6 -Architecture: $arch -Description: Linux kernel headers for $KERNELRELEASE on $arch - This package provides kernel header files for $KERNELRELEASE on $arch +Architecture: $debarch +Description: Linux kernel headers for $KERNELRELEASE on $debarch + This package provides kernel header files for $KERNELRELEASE on $debarch . This is useful for people who need to build external modules EOF -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/