diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 21:11:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 21:11:58 -0800 |
| commit | 5dfe5b2c714a5bea0908c1e00da0e8e00535f55c (patch) | |
| tree | 421470738aac64e438218da770c2775d1041ca01 /scripts/package | |
| parent | 152813e6e4bbb5f017e33eba7eb01bbda4b389b8 (diff) | |
| parent | 67afc2110a84872aa6aae44ce6b2ea6534db1438 (diff) | |
| download | linux-5dfe5b2c714a5bea0908c1e00da0e8e00535f55c.tar.gz | |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull misc kbuild updates from Michal Marek: "This is the non-critical part of kbuild: - several coccinelle updates - make deb-pkg creates an armhf package if CONFIG_VFP=y - make tags understands some more powerpc macros" * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: coccinelle: Improve checking for missing NULL terminators coccinelle: ifnullfree: handle various destroy functions coccinelle: ifnullfree: various cleanups cocinelle: iterators: semantic patch to delete unneeded of_node_put deb-pkg: Add automatic support for armhf architecture scripts/coccinelle: fix typos coccinelle: misc: remove "complex return code" warnings Coccinelle: fix incorrect -include option transformation coccinelle: tests: improve odd_ptr_err.cocci coccinelle: misc: move constants to the right scripts/tags.sh: Teach tags about some powerpc macros
Diffstat (limited to 'scripts/package')
| -rwxr-xr-x | scripts/package/builddeb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index b967e4f9fed2..6c3b038ef40d 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -52,7 +52,16 @@ set_debarch() { arm64) debarch=arm64 ;; arm*) - debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;; + if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then + if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then + debarch=armhf + else + debarch=armel + fi + else + debarch=arm + fi + ;; *) debarch=$(dpkg --print-architecture) echo "" >&2 |