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

[Thadeu Lima de Souza Cascardo]

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.trusty/etc/update-from-trusty-master | 33 +--------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/debian.trusty/etc/update-from-trusty-master b/debian.trusty/etc/update-from-trusty-master
index 931435bd092a..62192d7dbf43 100755
--- a/debian.trusty/etc/update-from-trusty-master
+++ b/debian.trusty/etc/update-from-trusty-master
@@ -98,38 +98,7 @@ else
 	fi
 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
-
-#
-# Make sure signed module enforcement stays off until user space is ready.
-#
-sed -i 's/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=y/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=n/' ${DEBIAN_TARGET}/config/config.common.ubuntu
-
-#
-# Build in these 2 modules for arm in order to avoid
-# a missing __aeabi_uldivmod symbol.
-#
-for i in CONFIG_MEGARAID_LEGACY CONFIG_MEGARAID_MAILBOX CONFIG_MEGARAID_MM CONFIG_MEGARAID_NEWGEN CONFIG_MEGARAID_SAS
-do
-	echo "$i=n" >> ${DEBIAN_TARGET}/config/armhf/config.common.armhf
-done
-# Drop lowlatency
-sed -i 's/lowlatency//g' ${DEBIAN_TARGET}/rules.d/*.mk
-for i in lowlatency
-do
-	find ${DEBIAN_TARGET}/config | grep $i | xargs rm -f
-	find ${DEBIAN_TARGET}/control.d | grep $i | xargs rm -f
-done
-# Make sure CONFIG_SECURITY_APPARMOR_AA3_SEMANTICS=n
-sed -i 's/CONFIG_SECURITY_APPARMOR_AA3_SEMANTICS=y/CONFIG_SECURITY_APPARMOR_AA3_SEMANTICS=n/' ${DEBIAN_TARGET}/config/config.* ${DEBIAN_TARGET}/config/*/config.*
+"./${DEBIAN_TARGET}/scripts/helpers/copy-files"
 
 fakeroot debian/rules clean updateconfigs || exit 1
 
-- 
2.20.1