[opensuse-kernel] run_oldconfig.sh
Hi Michal - Just a quick heads up that something changed with kbuild for 2.6.32-rc2 and it needs a 'make mrproper' after switching arches. Here's the change I made to make it work. -Jeff diff --git a/scripts/run_oldconfig.sh b/scripts/run_oldconfig.sh index 9b6f692..bc0a643 100755 --- a/scripts/run_oldconfig.sh +++ b/scripts/run_oldconfig.sh @@ -219,6 +219,8 @@ ${prefix}scripts/guards $EXTRA_SYMBOLS < ${prefix}series.conf \ EXTRA_SYMBOLS="$(echo $EXTRA_SYMBOLS | sed -e 's# *[Rr][Tt] *##g')" +last_arch= + for config in $config_files; do cpu_arch=${config%/*} flavor=${config#*/} @@ -244,6 +246,8 @@ for config in $config_files; do MAKE_ARGS="ARCH=$kbuild_arch" config="${prefix}config/$config" + [ "$last_arch" != "$kbuild_arch" ] && make mrproper + cat $config \ | bash $config_subst CONFIG_LOCALVERSION \"-${config##*/}\" \ | bash $config_subst CONFIG_SUSE_KERNEL y \ @@ -260,4 +264,9 @@ for config in $config_files; do if ! diff -U0 $config .config; then sed '/^# Linux kernel version:/d' < .config > $config fi + last_arch=$kbuild_arch done + +# This is so the caller doesn't have to do it themselves afterwards since +# it's likely they're not on s/390. +make mrproper -- Jeff Mahoney SUSE Labs -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
Jeff Mahoney napsal(a):
Hi Michal -
Just a quick heads up that something changed with kbuild for 2.6.32-rc2 and it needs a 'make mrproper' after switching arches. Here's the change I made to make it work.
-Jeff
diff --git a/scripts/run_oldconfig.sh b/scripts/run_oldconfig.sh index 9b6f692..bc0a643 100755 --- a/scripts/run_oldconfig.sh +++ b/scripts/run_oldconfig.sh @@ -219,6 +219,8 @@ ${prefix}scripts/guards $EXTRA_SYMBOLS < ${prefix}series.conf \
EXTRA_SYMBOLS="$(echo $EXTRA_SYMBOLS | sed -e 's# *[Rr][Tt] *##g')"
+last_arch= + for config in $config_files; do cpu_arch=${config%/*} flavor=${config#*/} @@ -244,6 +246,8 @@ for config in $config_files; do MAKE_ARGS="ARCH=$kbuild_arch" config="${prefix}config/$config"
+ [ "$last_arch" != "$kbuild_arch" ] && make mrproper + cat $config \ | bash $config_subst CONFIG_LOCALVERSION \"-${config##*/}\" \ | bash $config_subst CONFIG_SUSE_KERNEL y \ @@ -260,4 +264,9 @@ for config in $config_files; do if ! diff -U0 $config .config; then sed '/^# Linux kernel version:/d' < .config > $config fi + last_arch=$kbuild_arch done + +# This is so the caller doesn't have to do it themselves afterwards since +# it's likely they're not on s/390. +make mrproper
Looks good, thanks for fixing the script. Michal -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
Dne 4.10.2009 16:56, Jeff Mahoney napsal(a):
Hi Michal -
Just a quick heads up that something changed with kbuild for 2.6.32-rc2 and it needs a 'make mrproper' after switching arches. Here's the change I made to make it work.
FYI, Sam just reverted the kbuild change that caused this (I think): commit 2331d1a6cd3d6e580bc88b9a160066d9e1177fe1 Author: Sam Ravnborg <sam@ravnborg.org> Date: Sun Oct 11 23:22:58 2009 +0200 kbuild: revert "save ARCH & CROSS_COMPILE ..." Revert commit 575543347b5baed0ca927cb90ba8807396fe9cc9 ... Chances are that with -rc5, the workaround won't be needed anymore. Michal
-Jeff
diff --git a/scripts/run_oldconfig.sh b/scripts/run_oldconfig.sh index 9b6f692..bc0a643 100755 --- a/scripts/run_oldconfig.sh +++ b/scripts/run_oldconfig.sh @@ -219,6 +219,8 @@ ${prefix}scripts/guards $EXTRA_SYMBOLS < ${prefix}series.conf \
EXTRA_SYMBOLS="$(echo $EXTRA_SYMBOLS | sed -e 's# *[Rr][Tt] *##g')"
+last_arch= + for config in $config_files; do cpu_arch=${config%/*} flavor=${config#*/} @@ -244,6 +246,8 @@ for config in $config_files; do MAKE_ARGS="ARCH=$kbuild_arch" config="${prefix}config/$config"
+ [ "$last_arch" != "$kbuild_arch" ] && make mrproper + cat $config \ | bash $config_subst CONFIG_LOCALVERSION \"-${config##*/}\" \ | bash $config_subst CONFIG_SUSE_KERNEL y \ @@ -260,4 +264,9 @@ for config in $config_files; do if ! diff -U0 $config .config; then sed '/^# Linux kernel version:/d' < .config > $config fi + last_arch=$kbuild_arch done + +# This is so the caller doesn't have to do it themselves afterwards since +# it's likely they're not on s/390. +make mrproper
-- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
participants (2)
-
Jeff Mahoney -
Michal Marek