public inbox for linux-kbuild@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] deb-pkg: fix cross-compile build
@ 2011-05-04  5:59 Nuno Subtil
  2011-05-04 20:48 ` Michal Marek
  0 siblings, 1 reply; 12+ messages in thread
From: Nuno Subtil @ 2011-05-04  5:59 UTC (permalink / raw)
  To: Michal Marek, linux-kbuild; +Cc: linux-kernel, Nuno Subtil

When generating the header package, scripts/package/builddeb was inferring the
target architecture by looking at the output of dpkg --print-architecture. This
allows KBUILD_DEBARCH to override that.

Signed-off-by: Nuno Subtil <subtil@gmail.com>
---
 scripts/package/builddeb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index f6cbc3d..9372145 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -246,7 +246,12 @@ 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)
+
+if [ -n "$KBUILD_DEBARCH" ] ; then
+	arch="$KBUILD_DEBARCH"
+else
+	arch=$(dpkg --print-architecture)
+fi
 
 cat <<EOF >> debian/control
 
-- 
1.7.4.4

Please Cc me on any replies related to this patch.

Thanks,
Nuno


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 1/1] deb-pkg: fix cross-compile build
@ 2011-05-10  5:25 Nuno Subtil
  0 siblings, 0 replies; 12+ messages in thread
From: Nuno Subtil @ 2011-05-10  5:25 UTC (permalink / raw)
  To: Michal Marek, maximilian attems, Robert Gordon, linux-kbuild
  Cc: linux-kernel, Nuno Subtil

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 <subtil@gmail.com>
---
 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 <<EOF >> 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


^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-05-13  2:50 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-04  5:59 [PATCH 1/1] deb-pkg: fix cross-compile build Nuno Subtil
2011-05-04 20:48 ` Michal Marek
2011-05-05  9:07   ` maximilian attems
2011-05-05 15:42     ` Robert Gordon
2011-05-05 17:10       ` Nuno Subtil
     [not found]         ` <4DC2EB2B.1050203@greenroomsoftware.com>
2011-05-05 18:34           ` Robert Gordon
2011-05-10  5:29           ` Nuno Subtil
2011-05-10 12:41             ` maximilian attems
2011-05-12 14:01               ` Robert Gordon
2011-05-12 19:45                 ` Nuno Subtil
2011-05-13  2:50                   ` Robert Gordon
  -- strict thread matches above, loose matches on Subject: below --
2011-05-10  5:25 Nuno Subtil

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox