[bionic/azure 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>
---
 .../etc/update-from-azure-cosmic-master       | 36 +------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/debian.azure-bionic/etc/update-from-azure-cosmic-master b/debian.azure-bionic/etc/update-from-azure-cosmic-master
index 831f88719289..8848ff601e2e 100755
--- a/debian.azure-bionic/etc/update-from-azure-cosmic-master
+++ b/debian.azure-bionic/etc/update-from-azure-cosmic-master
@@ -96,41 +96,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
-
-#
-# Update package and DTB settings from master.
-#
-rsync -av --delete ${DEBIAN_SOURCE}/rules.d/*.mk ${DEBIAN_TARGET}/rules.d/
-
-#
-# Update modprobe.d from master
-#
-rsync -av --delete ${DEBIAN_SOURCE}/modprobe.d/ ${DEBIAN_TARGET}/modprobe.d
-
-#
-# Get the master branch ABI files, which can be mostly ignored since
-# the build is skipabi and skipmodule.
-# We can ignore ABI changes with the assurance that the origin
-# will change ABI when required.
-#
-rsync -av --delete ${DEBIAN_SOURCE}/abi/ ${DEBIAN_TARGET}/abi
-for i in ${FOREIGN_ARCHES}
-do
-        rm -rf ${DEBIAN_TARGET}/abi/*/${i}
-done
-
-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
 
-- 
2.20.1