Skip to content

Commit c5e318f

Browse files
bwhacksmichal42
authored andcommitted
deb-pkg: Fix building for MIPS big-endian or ARM OABI
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: 10f26fa ('build, deb-pkg: select userland architecture based on UTS_MACHINE') Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Michal Marek <[email protected]>
1 parent f8ce239 commit c5e318f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/package/builddeb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ create_package() {
4141
parisc*)
4242
debarch=hppa ;;
4343
mips*)
44-
debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el) ;;
44+
debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
4545
arm*)
46-
debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el) ;;
46+
debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
4747
*)
4848
echo "" >&2
4949
echo "** ** ** WARNING ** ** **" >&2

0 commit comments

Comments
 (0)