[xenial/oracle 2/2] UBUNTU: Packaging: Make update-from-*master call copy-files
Thadeu Lima de Souza Cascardo
cascardo at canonical.com
Thu Feb 21 16:43:04 UTC 2019
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>
---
debian.oracle-xenial/etc/update-from-master | 24 +--------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/debian.oracle-xenial/etc/update-from-master b/debian.oracle-xenial/etc/update-from-master
index b23fea2e75c9..926ae589f96b 100755
--- a/debian.oracle-xenial/etc/update-from-master
+++ b/debian.oracle-xenial/etc/update-from-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
--
2.20.1
More information about the kernel-team
mailing list