From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jan 2011 16:28:38 +0000 (-0800)
Subject: Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek... 
X-Git-Tag: firefly_0821_release~7613^2~3084
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=1693ed284f14a288c29f7265f9d71103e4c10821

Merge branch 'packaging' of git://git./linux/kernel/git/mmarek/kbuild-2.6

* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/
  deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb
  kbuild: create linux-headers package in deb-pkg
  kbuild, deb-pkg: support overriding userland architecture
  kbuild, deb-pkg: select userland architecture based on UTS_MACHINE
  kbuild, deb-pkg: Fix build with paranoid umask
---

1693ed284f14a288c29f7265f9d71103e4c10821
diff --cc Documentation/kbuild/kbuild.txt
index 1e5165aa9e4e,b146eb86e498..4a990317b84a
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
@@@ -70,9 -48,17 +70,17 @@@ Using "M=..." will always override the 
  KBUILD_OUTPUT
  --------------------------------------------------
  Specify the output directory when building the kernel.
 -The output directory can also be specificed using "O=...".
 +The output directory can also be specified using "O=...".
  Setting "O=..." takes precedence over KBUILD_OUTPUT.
  
+ KBUILD_DEBARCH
+ --------------------------------------------------
+ For the deb-pkg target, allows overriding the normal heuristics deployed by
+ deb-pkg. Normally deb-pkg attempts to guess the right architecture based on
+ the UTS_MACHINE variable, and on some architectures also the kernel config.
+ The value of KBUILD_DEBARCH is assumed (not checked) to be a valid Debian
+ architecture.
+ 
  ARCH
  --------------------------------------------------
  Set ARCH to the architecture to be built.