Merge ~rodrigo-zaiden/ubuntu-cve-tracker:merge_esm_kernel_changes into ubuntu-cve-tracker:master
Status: | Merged |
---|---|
Merged at revision: | 0f20c5bee31dc0e7f3b00706a851db8942bec135 |
Proposed branch: | ~rodrigo-zaiden/ubuntu-cve-tracker:merge_esm_kernel_changes |
Merge into: | ubuntu-cve-tracker:master |
Diff against target: |
39 lines (+10/-4) 1 file modified
scripts/prepare-kernel-usn.py (+10/-4) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Steve Beattie | Approve | ||
Review via email: mp+443137@code.launchpad.net |
Commit message
scripts/
with '--esm-ppa' argument, we add the capability to create USNs for
active and ESM kernel releases in the same execution. It simply checks
if the new argument is present and if the release is ESM, if so, it add
the necessary arguments for 'sis-changes' to download ESM kernel change
files.
before this commit, if we wanted to publish an ESM and active kernel
release in the same USN we had to merge the changes manually after
running the commands for EMS and active kernel releases separately.
Description of the change
In current execution of 'prepare-
and active releases we must run the commands separately passing the ESM
ppa instead of the archive ppa argument so that sis-changes download the
changes properly and so we can merge then manually later.
for regular archive ppa release:
./scripts/
bionic/
[...]
/home/
--ppa ubuntu --pocket Security -r bionic \
--download /tmp/prepare-
linux-oracle linux-meta-oracle linux-signed-oracle
[...]
for ESM release:
./scripts/
--ppa ubuntu-
xenial xenial/
[...]
/home/
--include-eol --ppa ubuntu-
--download /tmp/prepare-
linux-oracle linux-meta-oracle linux-signed-oracle
[...]
and now with the proposed change:
./scripts/
ubuntu-
xenial xenial/
bionic/
[...]
/home/
--ppa ubuntu-
--download /tmp/prepare-
linux-oracle linux-meta-oracle linux-signed-oracle
[...]
/home/
--ppa ubuntu --pocket Security -r bionic \
--download /tmp/prepare-
linux-oracle linux-meta-oracle linux-signed-oracle
[...]
'sis-changes' is still working as expected, the commands are the same, but
are executed all together and will merge the changes in the same USN.
extra notes:
* if pocket ('-p') or ppa ('--ppa') is not passed at all, it also works.
The default if nothing is passed is 'ubuntu' archive and 'security'
pocket. It remains like that with the new argument, that is, if
'--esm-ppa' is passed and nothing else, but non-esm releases are passed
it will get the kernel changes for these releases from the archive.
Nice! That's way more strightforward than the convoluted mechanisms I had been coming up with!