Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-08-08 12:02:17 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-08-08 12:02:17 +0200
commite89ed2ea54d52206f30b317f37cdf3de203defbd (patch)
treee27666e1ae485054193753e0af189fce089b4af7
parent4ced28183db12b57d25a7ff04b3db538672a98ac (diff)
parentcda92f9e1dbe5e84e03fe42a07796cb494a22904 (diff)
Merge branch 'packaging' into linux-next
-rw-r--r--rpm/kernel-binary.spec.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index fa91813212..c736479ebc 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -330,12 +330,16 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-vanilla_base="default"
+config_base="default"
%ifarch %ix86
-vanilla_base="pae"
+config_base="pae"
%endif
+if ! [ -f %my_builddir/config/%cpu_arch/$config_base ] ; then
+ config_base=%variant
+ config_base=${config_base#-}
+fi
if ! grep -q CONFIG_MMU= "%my_builddir/config/%cpu_arch_flavor"; then
-cp "%my_builddir/config/%cpu_arch/$vanilla_base" .config
+cp "%my_builddir/config/%cpu_arch/$config_base" .config
../scripts/kconfig/merge_config.sh -m .config \
%my_builddir/config/%cpu_arch_flavor
else