diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-07-21 14:21:01 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-07-21 14:21:01 -0500 |
| commit | b6670052876b21ed6905a8eb2be5258291a0b38b (patch) | |
| tree | 93a9ea9d129b31ba61029cae54e95a8fdceaabce /process_configs.sh | |
| parent | 5f0e0f3c714a197de8d36ab1c984fc722e87c60d (diff) | |
| download | kernel-b6670052876b21ed6905a8eb2be5258291a0b38b.tar.gz kernel-b6670052876b21ed6905a8eb2be5258291a0b38b.tar.xz kernel-b6670052876b21ed6905a8eb2be5258291a0b38b.zip | |
kernel-5.14.0-0.rc2.20210721git8cae8cd89f05.24
* Wed Jul 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc2.20210721git8cae8cd89f05.24]
- redhat/configs: Add CONFIG_INTEL_PMT_CRASHLOG (Michael Petlan) [1880486]
- redhat/configs: Add CONFIG_INTEL_PMT_TELEMETRY (Michael Petlan) [1880486]
- redhat/configs: Add CONFIG_MFD_INTEL_PMT (Michael Petlan) [1880486]
- redhat/configs: enable CONFIG_BLK_DEV_ZONED (Ming Lei) [1638087]
- Add --with clang_lto option to build the kernel with Link Time Optimizations (Tom Stellard)
- common: disable DVB_AV7110 and associated pieces (Peter Robinson)
- Fix fedora-only config updates (Don Zickus)
- Fedor config update for new option (Justin M. Forbes)
Resolves: rhbz#1638087, rhbz#1880486
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'process_configs.sh')
| -rwxr-xr-x | process_configs.sh | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/process_configs.sh b/process_configs.sh index b1e1f4338..1709e6dc3 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -31,6 +31,16 @@ die() exit 1 } +get_cross_compile() +{ + arch=$1 + if [[ "$CC_IS_CLANG" -eq 1 ]]; then + echo "$arch" + else + echo "scripts/dummy-tools/" + fi +} + # stupid function to find top of tree to do kernel make configs switch_to_toplevel() { @@ -193,11 +203,11 @@ function commit_new_configs() fi echo -n "Checking for new configs in $cfg ... " - make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/ KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig + make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig grep -E 'CONFIG_' .listnewconfig > .newoptions if test -s .newoptions then - make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/ KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig + make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig parsenewconfigs fi rm .newoptions @@ -227,7 +237,7 @@ function process_configs() fi echo -n "Processing $cfg ... " - make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/ KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig + make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig grep -E 'CONFIG_' .listnewconfig > .newoptions if test -n "$NEWOPTIONS" && test -s .newoptions then @@ -252,7 +262,7 @@ function process_configs() rm .listnewconfig - make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/ KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1 + make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1 echo "# $arch" > "$cfgtmp" cat "$cfgorig" >> "$cfgtmp" if test -n "$CHECKOPTIONS" @@ -280,6 +290,8 @@ CONTINUEONERROR="" NEWOPTIONS="" TESTRUN="" CHECKWARNINGS="" +MAKEOPTS="" +CC_IS_CLANG=0 RETURNCODE=0 @@ -314,6 +326,13 @@ do -z) COMMITNEWCONFIGS="x" ;; + -m) + shift + if [ "$1" = "CC=clang" -o "$1" = "LLVM=1" ]; then + CC_IS_CLANG=1 + fi + MAKEOPTS="$MAKEOPTS $1" + ;; *) break;; esac |