Home Home > GIT Browse > packaging
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-08-07 21:14:19 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-08-07 21:14:52 +0200
commitaf37821c627bd4dd9285daf581a68be90135374b (patch)
treef2ccd69507572ecedb45868ae6888837605ea086
parent1ef0ba14192cc1b1a2b5a734aa2e037f017053db (diff)
rpm/kernel-binary.spec.in: support partial rt debug config.
-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