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

Message ID 20190221163518.1430-3-cascardo@canonical.com
State New
Headers show
Series
  • Split copy-files from update-from-*master
Related show

Commit Message

Thadeu Lima de Souza Cascardo Feb. 21, 2019, 4:35 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-cosmic-master | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

Comments

Stefan Bader Feb. 22, 2019, 11:07 a.m. UTC | #1
On 21.02.19 17:35, Thadeu Lima de Souza Cascardo wrote:
> BugLink: https://bugs.launchpad.net/bugs/1786013
> 
Wondering whether the "Package re-sync" LP bug is appropriate for this
update... but not violently biased in either direction,

I'd probably change below to

Now that copy-files (and optionally local-mangle) are introduced,
update-from-*master may...

as it sounds more sane as a generic message if (like it seems to be the case for
bionic/hwe) there is no local-mangle needed.

-Stefan

> 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-cosmic-master | 24 +-----------------------
>  1 file changed, 1 insertion(+), 23 deletions(-)
> 
> diff --git a/debian.hwe/etc/update-from-cosmic-master b/debian.hwe/etc/update-from-cosmic-master
> index 069bd75ecd03..50b7ff7d97f0 100755
> --- a/debian.hwe/etc/update-from-cosmic-master
> +++ b/debian.hwe/etc/update-from-cosmic-master
> @@ -94,29 +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
> -
> -#
> -# 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
>  
>

Patch
diff mbox series

diff --git a/debian.hwe/etc/update-from-cosmic-master b/debian.hwe/etc/update-from-cosmic-master
index 069bd75ecd03..50b7ff7d97f0 100755
--- a/debian.hwe/etc/update-from-cosmic-master
+++ b/debian.hwe/etc/update-from-cosmic-master
@@ -94,29 +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
-
-#
-# 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