[PATCH 2/2] deb-pkg: Fix building for MIPS big-endian or ARM OABI

[PATCH 2/2] deb-pkg: Fix building for MIPS big-endian or ARM OABI

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]

These commands will mysteriously fail:

$ make ARCH=arm versatile_defconfig
[...]
$ make ARCH=arm deb-pkg
[...]
make[1]: *** [deb-pkg] Error 1
make: *** [deb-pkg] Error 2

The Debian architecture selection for these kernel architectures does
'grep FOO=y $KCONFIG_CONFIG && echo bar', and after 'set -e' this
aborts the script if grep does not find the given config symbol.

Fixes: 10f26fa64200 ('build, deb-pkg: select userland architecture based on UTS_MACHINE')
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 scripts/package/builddeb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 301acdc..c1bb9be 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -41,9 +41,9 @@ create_package() {
 	parisc*)
 		debarch=hppa ;;
 	mips*)
-		debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el) ;;
+		debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
 	arm*)
-		debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el) ;;
+		debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
 	*)
 		echo "" >&2
 		echo "** ** **  WARNING  ** ** **" >&2

-- 
Ben Hutchings
Knowledge is power.  France is bacon.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH 2/2] deb-pkg: Fix building for MIPS big-endian or ARM OABI

[Michal Marek]

On 2013-12-05 15:39, Ben Hutchings wrote:
> These commands will mysteriously fail:
> 
> $ make ARCH=arm versatile_defconfig
> [...]
> $ make ARCH=arm deb-pkg
> [...]
> make[1]: *** [deb-pkg] Error 1
> make: *** [deb-pkg] Error 2
> 
> The Debian architecture selection for these kernel architectures does
> 'grep FOO=y $KCONFIG_CONFIG && echo bar', and after 'set -e' this
> aborts the script if grep does not find the given config symbol.
> 
> Fixes: 10f26fa64200 ('build, deb-pkg: select userland architecture based on UTS_MACHINE')
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
>  scripts/package/builddeb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to kbuild.git#misc, thanks.

Michal