[xenial/aws-hwe,2/2] UBUNTU: Packaging: Make update-from-*master call copy-files
diff mbox series

Message ID 20190221163912.2064-3-cascardo@canonical.com
State New
Headers show
Series
  • [xenial/aws-hwe,1/2] UBUNTU: Packaging: Introduce copy-files and local-mangle
Related show

Commit Message

Thadeu Lima de Souza Cascardo Feb. 21, 2019, 4:39 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>
---
 .../etc/update-from-aws-bionic-master         | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

Patch
diff mbox series

diff --git a/debian.aws-hwe/etc/update-from-aws-bionic-master b/debian.aws-hwe/etc/update-from-aws-bionic-master
index 5fae8a07c5f2..ec820dad51b0 100755
--- a/debian.aws-hwe/etc/update-from-aws-bionic-master
+++ b/debian.aws-hwe/etc/update-from-aws-bionic-master
@@ -96,30 +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
-
-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