Home Home > GIT Browse > packaging
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2018-11-04 13:36:43 +0100
committerMichal Kubecek <mkubecek@suse.cz>2018-11-04 14:15:26 +0100
commita239c6e8d835e31f9a95ef095583cc801a376ede (patch)
tree6adf2d487a71c0430bfdc977de9f0eb40feb382c
parent48b03c4e62a9b45d666136bef7ab01aac892108e (diff)
rpm: use syncconfig instead of silentoldconfig where available
Since mainline commit 0085b4191f3e ("kconfig: remove silentoldconfig target"), "make silentoldconfig" can be no longer used. Use "make syncconfig" instead if available.
-rw-r--r--rpm/kernel-binary.spec.in8
-rwxr-xr-xrpm/try-disable-staging-driver8
2 files changed, 14 insertions, 2 deletions
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index 7fd6195ed9..4f445e5009 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -393,7 +393,13 @@ if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS
else
cp .config .config.orig
- make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null
+ if test -f ../scripts/kconfig/Makefile && \
+ grep -q syncconfig ../scripts/kconfig/Makefile; then
+ syncconfig="syncconfig"
+ else
+ syncconfig="silentoldconfig"
+ fi
+ make $syncconfig $MAKE_ARGS $KERN_DIRS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
diff --git a/rpm/try-disable-staging-driver b/rpm/try-disable-staging-driver
index dee6738b35..5996ca969c 100755
--- a/rpm/try-disable-staging-driver
+++ b/rpm/try-disable-staging-driver
@@ -30,6 +30,12 @@ if test -L source; then
else
source="."
fi
+if test -f ${source}/scripts/kconfig/Makefile && \
+ grep -q syncconfig ${source}/scripts/kconfig/Makefile; then
+ syncconfig="syncconfig"
+else
+ syncconfig="silentoldconfig"
+fi
makefile="$source/drivers/staging/Makefile"
skipped_options=staging-skipped-options
logfile=$1
@@ -70,7 +76,7 @@ fi
echo "Trying to disable $option"
"$source/scripts/config" --disable "$option"
-if ! make silentoldconfig $MAKE_ARGS || grep "^$option" .config; then
+if ! make $syncconfig $MAKE_ARGS || grep "^$option" .config; then
echo "Could not disable $option" >&2
exit 1
fi