[Unstable] UBUNTU: Use syncconfig instead of silentoldconfig

[Thadeu Lima de Souza Cascardo]

Upstream commit 911a91c39cabcb6adb2a78f4f9777abb4c032b75 ("kconfig: rename
silentoldconfig to syncconfig") added a notice that silentoldconfig will
disappear after Linux 4.19. Start using syncconfig as of now.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 debian/rules.d/2-binary-arch.mk  | 8 ++++----
 debian/scripts/misc/kernelconfig | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 561c5b3eac9b..c869327cbc8f 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -29,7 +29,7 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc
 		rsync -a --exclude debian --exclude debian.master --exclude $(DEBIAN) * $(builddir)/build-$*
 	cat $^ | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config
 	find $(builddir)/build-$* -name "*.ko" | xargs rm -f
-	$(build_cd) $(kmake) $(build_O) -j1 silentoldconfig prepare scripts
+	$(build_cd) $(kmake) $(build_O) -j1 syncconfig prepare scripts
 	touch $@
 
 # Used by developers as a shortcut to prepare a tree for compilation.
@@ -311,7 +311,7 @@ endif
 		sed -e 's/.*CONFIG_DEBUG_INFO=.*/# CONFIG_DEBUG_INFO is not set/g' > \
 		$(hdrdir)/.config
 	chmod 644 $(hdrdir)/.config
-	$(kmake) O=$(hdrdir) -j1 silentoldconfig prepare scripts
+	$(kmake) O=$(hdrdir) -j1 syncconfig prepare scripts
 	# We'll symlink this stuff
 	rm -f $(hdrdir)/Makefile
 	rm -rf $(hdrdir)/include2 $(hdrdir)/source
@@ -423,7 +423,7 @@ endif
 	sed -e 's/^# \(CONFIG_MODVERSIONS\) is not set$$/\1=y/' \
 	  -e 's/.*CONFIG_LOCALVERSION_AUTO.*/# CONFIG_LOCALVERSION_AUTO is not set/' \
 	  $(headers_tmp)/.config.old > $(headers_tmp)/.config
-	$(hmake) silentoldconfig
+	$(hmake) syncconfig
 	$(hmake) headers_install
 
 	( cd $(headers_tmp)/install/include/ && \
@@ -642,7 +642,7 @@ ifeq ($(do_tools_perf),true)
 	sed -e 's/^# \(CONFIG_MODVERSIONS\) is not set$$/\1=y/' \
 	  -e 's/.*CONFIG_LOCALVERSION_AUTO.*/# CONFIG_LOCALVERSION_AUTO is not set/' \
 	  $(builddirpa)/.config.old > $(builddirpa)/.config
-	cd $(builddirpa) && $(kmake) silentoldconfig
+	cd $(builddirpa) && $(kmake) syncconfig
 	cd $(builddirpa) && $(kmake) prepare
 	cd $(builddirpa)/tools/perf && \
 		$(kmake) prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 PYTHON=python2.7
diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index 060cc04b17aa..769acbb2ed05 100755
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -2,7 +2,7 @@
 
 . debian/debian.env
 
-# Script to merge all configs and run 'make silentoldconfig' on it to wade out bad juju.
+# Script to merge all configs and run 'make syncconfig' on it to wade out bad juju.
 # Then split the configs into distro-commmon and flavour-specific parts
 
 # We have to be in the top level kernel source directory
@@ -14,7 +14,7 @@ fi
 mode=${1:?"Usage: $0 [oldconfig|editconfig]"}
 yes=0
 case "$mode" in
-    update*configs)  mode='silentoldconfig' ;;
+    update*configs)  mode='syncconfig' ;;
     default*configs) mode='oldconfig'; yes=1 ;;
     edit*configs)    ;; # All is good
     gen*configs)     mode='genconfigs' ;; # All is good
@@ -97,10 +97,10 @@ for arch in $archs; do
 						make O=`pwd`/build ARCH=$kernarch menuconfig
 						break ;;
 					n* | N* )
-						# 'silentoldconfig' prevents
+						# 'syncconfig' prevents
 						# errors for '-' options set
 						# in common config fragments
-						make O=`pwd`/build ARCH=$kernarch silentoldconfig
+						make O=`pwd`/build ARCH=$kernarch syncconfig
 						break ;;
 					*)
 						echo "Entry not valid"
-- 
2.17.0