| Message ID | 20190221165451.4232-1-cascardo@canonical.com |
|---|---|
| Headers | show |
| Series | Split copy-files from update-from-*master | expand |
On 21.02.19 17:54, Thadeu Lima de Souza Cascardo wrote: > Per subject. > > Thadeu Lima de Souza Cascardo (3): > UBUNTU: Packaging: Introduce copy-files and local-mangle > UBUNTU: Packaging: Make update-from-*master call copy-files > UBUNTU: Packaging: Really disable ZFS > > .../etc/update-from-azure-xenial-master | 32 +-------- > .../scripts/helpers/copy-files | 67 +++++++++++++++++++ > .../scripts/helpers/local-mangle | 13 ++++ > 3 files changed, 81 insertions(+), 31 deletions(-) > create mode 100755 debian.azure-trusty/scripts/helpers/copy-files > create mode 100755 debian.azure-trusty/scripts/helpers/local-mangle > Hm, maybe I miss something but I get the impression that patch #3 already has been merged into patch #1
On Fri, Feb 22, 2019 at 03:23:05PM +0100, Stefan Bader wrote: > On 21.02.19 17:54, Thadeu Lima de Souza Cascardo wrote: > > Per subject. > > > > Thadeu Lima de Souza Cascardo (3): > > UBUNTU: Packaging: Introduce copy-files and local-mangle > > UBUNTU: Packaging: Make update-from-*master call copy-files > > UBUNTU: Packaging: Really disable ZFS > > > > .../etc/update-from-azure-xenial-master | 32 +-------- > > .../scripts/helpers/copy-files | 67 +++++++++++++++++++ > > .../scripts/helpers/local-mangle | 13 ++++ > > 3 files changed, 81 insertions(+), 31 deletions(-) > > create mode 100755 debian.azure-trusty/scripts/helpers/copy-files > > create mode 100755 debian.azure-trusty/scripts/helpers/local-mangle > > > > Hm, maybe I miss something but I get the impression that patch #3 already > has been merged into patch #1 > It looks like I undo it on patch 2. So, another round of fixups for that. I would like to have it like debian.xenial/ on patch 1 and not fix it in patch 2, but on a different patch, because, then, we keep it just like it is, and in case they really want to keep zfs, we can just not apply patch 3 or revert it later. Same for some other trees (two of them) that have local-mangle only to skipabi, and those should just be removed later on. I just tried the most conservative approach here so the SRU cycle won't be broken by this change alone. Cascardo.