# git rev-parse -q --verify d077ee8b591d3961919f0322846a74dc7c6d3a64^{commit} d077ee8b591d3961919f0322846a74dc7c6d3a64 already have revision, skipping fetch # git checkout -q -f -B kisskb d077ee8b591d3961919f0322846a74dc7c6d3a64 # git clean -qxdf # < git log -1 # commit d077ee8b591d3961919f0322846a74dc7c6d3a64 # Author: Matthias Maennich # Date: Wed Dec 2 15:12:39 2020 +0000 # # scripts: merge_config: add strict mode to fail upon any redefinition # # When merging configuration fragments, it might be of interest to # identify mismatches (redefinitions) programmatically. Hence add the # option -s (strict mode) to instruct merge_config.sh to bail out in # case any redefinition has been detected. # # With strict mode, warnings are emitted as before, but the script # terminates with rc=1. If -y is set to define "builtin having # precedence over modules", fragments are still allowed to set =m (while # the base config has =y). Strict mode will tolerate that as demotions # from =y to =m are ignored when setting -y. # # Signed-off-by: Matthias Maennich # Reviewed-by: Lee Jones # Signed-off-by: Masahiro Yamada # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/x86_64-linux/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/x86_64-linux/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 d077ee8b591d3961919f0322846a74dc7c6d3a64 # < make -s -j 48 ARCH=x86_64 O=/kisskb/build/kbuild_x86_64-allnoconfig_x86_64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/x86_64-linux/bin/x86_64-linux- allnoconfig # < make -s -j 48 ARCH=x86_64 O=/kisskb/build/kbuild_x86_64-allnoconfig_x86_64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/x86_64-linux/bin/x86_64-linux- help # make -s -j 48 ARCH=x86_64 O=/kisskb/build/kbuild_x86_64-allnoconfig_x86_64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/x86_64-linux/bin/x86_64-linux- olddefconfig # make -s -j 48 ARCH=x86_64 O=/kisskb/build/kbuild_x86_64-allnoconfig_x86_64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/x86_64-linux/bin/x86_64-linux- Completed OK # rm -rf /kisskb/build/kbuild_x86_64-allnoconfig_x86_64-gcc4.9 # Build took: 0:00:25.616775