From 60b7ff23980d39726951755cac49768488eeafac Mon Sep 17 00:00:00 2001 From: caina Date: Thu, 24 Apr 2025 18:19:41 +0800 Subject: [PATCH] kconfig: update openeuler_defconfig with current config changes hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IC5PU5 CVE: NA ----------------------------------------- openeule_defconfig, without changing any other modifications. Saving .config directly will introduce many unrelated changes, Not conducive to viewing patch modification purposes during submission. Signed-off-by: caina --- scripts/kconfig/makeconfig.sh | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/scripts/kconfig/makeconfig.sh b/scripts/kconfig/makeconfig.sh index c54f4d84ae9b..ca984a92ca8b 100644 --- a/scripts/kconfig/makeconfig.sh +++ b/scripts/kconfig/makeconfig.sh @@ -6,19 +6,12 @@ if [ ! -f .config ]; then exit 1 fi -sed -e '/CONFIG_CC_VERSION_TEXT/d' \ - -e '/CONFIG_CC_IS_GCC/d' \ - -e '/CONFIG_GCC_VERSION/d' \ - -e '/CONFIG_LD_VERSION/d' \ - -e '/CONFIG_LD_IS/d' \ - -e '/CONFIG_CLANG_VERSION/d' \ - -e '/CONFIG_LLD_VERSION/d' \ - -e '/CONFIG_CC_CAN/d' \ - -e '/CONFIG_CC_HAS/d' \ - -e '/CONFIG_AS_VERSION/d' \ - -e '/CONFIG_AS_HAS/d' \ - -e '/CONFIG_AS_IS/d' \ - -e '/CONFIG_PAHOLE_VERSION/d' \ - -i .config - -cp .config arch/$1/configs/openeuler_defconfig +mv .config .config.new +make openeuler_defconfig +diff -Nur .config .config.new > .config-diff +sed -e "s/\.config\.new/arch\/$1\/configs\/openeuler_defconfig/" -i .config-diff +sed -e "s/\.config/arch\/$1\/configs\/openeuler_defconfig/" -i .config-diff +patch -p0 < .config-diff +rm .config-diff +mv .config.new .config +make olddefconfig -- Gitee