# git rev-parse -q --verify 60bef52c7a68257048f34ce32b8300def71a3de0^{commit} 60bef52c7a68257048f34ce32b8300def71a3de0 already have revision, skipping fetch # git checkout -q -f -B kisskb 60bef52c7a68257048f34ce32b8300def71a3de0 # git clean -qxdf # < git log -1 # commit 60bef52c7a68257048f34ce32b8300def71a3de0 # Author: Guillaume Tucker # Date: Mon Sep 2 16:18:36 2019 +0100 # # merge_config.sh: ignore unwanted grep errors # # The merge_config.sh script verifies that all the config options have # their expected value in the resulting file and prints any issues as # warnings. These checks aren't intended to be treated as errors given # the current implementation. However, since "set -e" was added, if the # grep command to look for a config option does not find it the script # will then abort prematurely. # # Handle the case where the grep exit status is non-zero by setting # ACTUAL_VAL to an empty string to restore previous functionality. # # Fixes: cdfca821571d ("merge_config.sh: Check error codes from make") # Signed-off-by: Guillaume Tucker # Acked-by: Jon Hunter # Tested-by: Jon Hunter # Signed-off-by: Masahiro Yamada # < /opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux-ld --version # < git log --format=%s --max-count=1 60bef52c7a68257048f34ce32b8300def71a3de0 # < make -s -j 120 ARCH=s390 O=/kisskb/build/kbuild_s390-defconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- defconfig # make -s -j 120 ARCH=s390 O=/kisskb/build/kbuild_s390-defconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- cc1: error: unrecognized command line option '-mtune=zEC12' cc1: error: unrecognized command line option '-mtune=zEC12' make[2]: *** [/kisskb/src/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1124: prepare0] Error 2 make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 120 ARCH=s390 O=/kisskb/build/kbuild_s390-defconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/kbuild_s390-defconfig_s390x # Build took: 0:00:02.767692