[bionic/gcp-edge,2/2] UBUNTU: Packaging: Make update-from-*master call copy-files
diff mbox series

Message ID 20190221163719.1762-3-cascardo@canonical.com
State New
Headers show
Series
  • Split copy-files from update-from-*master
Related show

Commit Message

Thadeu Lima de Souza Cascardo Feb. 21, 2019, 4:37 p.m. UTC
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@canonical.com>
---
 debian.gcp-edge/etc/update-from-master | 37 +-------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

Patch
diff mbox series

diff --git a/debian.gcp-edge/etc/update-from-master b/debian.gcp-edge/etc/update-from-master
index 7e0b312eb7c4..4d5790f8969b 100755
--- a/debian.gcp-edge/etc/update-from-master
+++ b/debian.gcp-edge/etc/update-from-master
@@ -96,42 +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/
-echo -e 'skipabi=true\nskipmodule=true\nskipretpoline=true' >> ${DEBIAN_TARGET}/rules.d/hooks.mk
-
-#
-# 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