[trusty/lts-xenial 2/2] UBUNTU: Packaging: Make update-from-*master call copy-files

[Thadeu Lima de Souza Cascardo]

BugLink: https://bugs.launchpad.net/bugs/1786013

Now that copy-files and local-magle are introduced, update-from-*master may
make use of them, instead of doing the copies and mangles itself. That makes it
easier to replace update-from-*master with a single script version for all
trees in the future.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 debian.xenial/etc/update-from-xenial-master | 39 +--------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian.xenial/etc/update-from-xenial-master b/debian.xenial/etc/update-from-xenial-master
index c1d137e29e05..46dbdb74bb91 100755
--- a/debian.xenial/etc/update-from-xenial-master
+++ b/debian.xenial/etc/update-from-xenial-master
@@ -94,43 +94,7 @@ then
 	exit 1
 fi
 
-#
-# Pick up any master branch changes to udeb modules or firmware.
-#
-rsync -av --delete ${DEBIAN_SOURCE}/d-i/ ${DEBIAN_TARGET}/d-i
-
-#
-# Update configs from master
-#
-rsync -av --delete ${DEBIAN_SOURCE}/config/ ${DEBIAN_TARGET}/config
-
-#
-# Turn off strong stack protection as it requires gcc 4.9+
-#
-sed -i -e 's/^.*CONFIG_CC_STACKPROTECTOR_REGULAR.*$/CONFIG_CC_STACKPROTECTOR_REGULAR=y/' -e 's/^CONFIG_CC_STACKPROTECTOR_STRONG.*$/# CONFIG_CC_STACKPROTECTOR_STRONG is not set/' ${DEBIAN_TARGET}/config/config.common.ubuntu
-sed -i 's/CONFIG_CC_STACKPROTECTOR_STRONG/CONFIG_CC_STACKPROTECTOR_REGULAR/' ${DEBIAN_TARGET}/config/annotations
-
-#
-# Update package and DTB settings from master.
-#
-rsync -av ${DEBIAN_SOURCE}/rules.d/*.mk ${DEBIAN_TARGET}/rules.d/
-# Remove the .mk files from the arch's that are not supported
-for i in ${FOREIGN_ARCHES}
-do
-	rm -f ${DEBIAN_TARGET}/rules.d/${i}.mk
-	git rm -f ${DEBIAN_TARGET}/rules.d/${i}.mk || true
-done
-# Disable ZFS as we have no tooling in trusty to mount these.
-sed -i -e 's/^\(do_zfs[ \t]*=[ \t]\)true\(.*\)$/\1false\2/' debian.xenial/rules.d/*.mk
-
-#
-# Update modprobe.d from master
-#
-rsync -av --delete ${DEBIAN_SOURCE}/modprobe.d/ ${DEBIAN_TARGET}/modprobe.d
-
-cp -p ${DEBIAN_SOURCE}/control.d/*.inclusion-list ${DEBIAN_TARGET}/control.d
-
-cp -p ${DEBIAN_SOURCE}/reconstruct ${DEBIAN_TARGET}/reconstruct
+"./${DEBIAN_TARGET}/scripts/helpers/copy-files"
 
 fakeroot debian/rules clean updateconfigs
 
@@ -150,7 +114,6 @@ if [ -z "$SKIP_REBASE_IF_UPTODATE" ]; then
 fi
 
 # Stage the bits we changed.
-rm -f ${DEBIAN_TARGET}/d-i/kernel-versions
 git add ${DEBIAN_TARGET}/d-i ${DEBIAN_TARGET}/config \
 	${DEBIAN_TARGET}/rules.d/*.mk ${DEBIAN_TARGET}/reconstruct \
 	${DEBIAN_TARGET}/modprobe.d
-- 
2.20.1