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

Message ID 20190221164153.2855-3-cascardo@canonical.com
State New
Headers show
Series
  • Untitled series #93450
Related show

Commit Message

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

Patch
diff mbox series

diff --git a/debian.hwe/etc/update-from-bionic-master b/debian.hwe/etc/update-from-bionic-master
index 2769f706accd..b89aeb904a5c 100755
--- a/debian.hwe/etc/update-from-bionic-master
+++ b/debian.hwe/etc/update-from-bionic-master
@@ -94,37 +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
-
-# Remove snapdragon from d-i
-sed -i /snapdragon/d ${DEBIAN_TARGET}/d-i/kernel-versions
-
-#
-# 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/
-
-# We don't build snapdragon
-sed -i '/_snapdragon/d' ${DEBIAN_TARGET}/rules.d/arm64.mk
-sed -i 's/^\(flavo.*\)\ssnapdragon\(.*\)$/\1\2/' ${DEBIAN_TARGET}/rules.d/arm64.mk
-rm -f ${DEBIAN_TARGET}/config/arm64/config.flavour.snapdragon
-
-#
-# 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