diff mbox series

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

Message ID 20190301235634.9551-2-cascardo@canonical.com
State New
Headers show
Series [1/2] UBUNTU: Packaging: Introduce copy-files and local-mangle | expand

Commit Message

Thadeu Lima de Souza Cascardo March 1, 2019, 11:56 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1817734

Now that copy-files (and optionally local-mangle) 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>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
---
 .../etc/update-from-azure-cosmic-master       | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
diff mbox series

Patch

diff --git a/debian.azure-bionic/etc/update-from-azure-cosmic-master b/debian.azure-bionic/etc/update-from-azure-cosmic-master
index 1955e3dbe361..fbd8d0fc350c 100755
--- a/debian.azure-bionic/etc/update-from-azure-cosmic-master
+++ b/debian.azure-bionic/etc/update-from-azure-cosmic-master
@@ -96,29 +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
-
-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