Move to team folder
|Deletions are marked like this.||Additions are marked like this.|
|Line 166:||Line 166:|
|* If the kABI changed note the reasoning on the [[https://wiki.ubuntu.com/KernelTeam/Stable_kABI|stable kernel ABI]] wiki page.|| * If the kABI changed note the reasoning on the [[https://wiki.ubuntu.com/KernelTeam/Stable_kABI|stable kernel ABI]] wiki page. This must also be announced by mails to
* firstname.lastname@example.org (kernel team mailing list)
* email@example.com (installer team mailing list)
This document is intended to document the processes involved in the maintenance of stable (after release) kernel trees. Those should be independent of a specific release. If not, this should be noted on the specific description.
Stable release updates will be done after the initial release. To prevent regressions there are a more formal process involved in getting new patches included. The process is described in general at StableReleaseUpdates with a kernel specific part described KernelUpdates. There is one special case for stable kernel tree updates from upstream (described below).
Every SRU needs a bug. Patches are sent to kernel mailing list and have to get at least one ACK (maybe 2 with the current team size).
- All patches should be signed-off-by the person who did the patch.
Patches from upstream should not change the submitter's reference. They should be cherry-picked or exported and then re-imported (git format-patch and git-am. Personally I do a
git format-patch -s <sha> -1then add bug and/or CVE references and then import the resulting patch (the -s automatically adds a signed-of-by line).
- Changes that require an kABI bump should be marked by adding "BumpABI: yes" to the git message. This is a manual process but makes life simpler of someone asks why the ABI has been bumped.
- SRU justification is added to bug and nomination for releases are used to track progress for each release (if appropriate).
- ubuntu-sru has to get subscribed
- The milestone is set for the next official update release.
SRUs from the stable kernel tree
Since the process for stable kernel updates (LWN article) is very similar to our SRU process and there have been quite a number of bugs that have been solved by finally finding out that there has been a fix in the stable tree, those patches will be added as soon as a new stable tree release is published (see the RFC about this at the RFC page).
The process for this looks like this:
- Stable release updates from the kernel.org stable kernel that matches the kernel version will qualify as SRU updates. There will be one LP bug to track the merge.
The merge has to be announced on the kernel-team mailing list and should also be ACKed by at least one (two) members of the kernel team.
- Updates resulting from stable tree imports should be kept at least 2 weeks in -proposed before moving to -updates. Any change or regression in the stable tree resets the counter.
- Regressions (if there are any) will be tracked in separate LP bugs.
Current contact: Kees Cook
CVE updates usually are done in batches (except for very critical problems). There is a list of CVEs and all currently maintained releases have to be checked for possible vulnerabilities.
The patchsets are prepared by one member of the stable maintenance team but not pushed if any of the patches still is embargoed.
- test builds must be done at least for i386 and amd64
- test packages and upload sources are provided on an internal server (e.g. chinstrap).
- boot tests should be done for i386 (and amd64)
[TBD] verification of the vulnerability (if possible)
this would be good but requires automated tests
Proposed work flow for security updates with unreleased or pending -proposed updates:
- create a branch based on the last official (-updates/-security) release
- add fixes and do the release from this branch
- after release (and after gathering the ABI files) merge back to main tree.
This makes sure the version of the security release can be checked out and based upon.
Note: Had to use "git push origin master" to get merges visible.
Updates to custom binaries (virtual/openvz/...)
Custom binary builds are usually community maintained and not as critical as the main kernel flavours. Nevertheless updates should follow a certain pattern to be clearly documented.
- Get triggered by a community member (usually kernel-team mailing list)
- Open a LP bug for SRU documentation
- Create a branch and pull/cerry-pick
- Do a test build
- Publish the SRU request on the kernel-team list. References to patches as gitweb links since patches might be big.
Either in a PPA or on the porter machines. HPPA is a problem due to hardware access.
A new upload is prepared by editing/creating the changelog (KernelMaintenance)
- Use chroots to create the uploads (because scripts depend on certain environments)
The insertchanges target does not always work properly, especially on older releases. Always make sure to check the generated file.
- Are there duplicate/unwanted entries?
- Has every entry a bug reference?
Ubuntu patches (UBUNTU keyword prefixed) automatically get this if they contained a Bug keyword in the description. Some of the build environments have been updated to do the same for upstream patches with a Bug entry.
Patches from upstream did not (but do with updated scripts and if they include a Bug keyword.
- CVEs should have the CVE-xxxx-xxxx number in their description
UBUNTU: Fix stupid bug Bug: #0815 CVE-2008-0815
The changelog keeps order of uploads, git log the order of check-ins but this cannot always be honoured. The make process cannot handle complicated forth and back of ABI releases. But in general the sequence of the changelog reflects the upload history
On updates the command for generating the source package should include the -v option (and have the orig.tar.gz, to do only diff uploads). If the the orig.tar.gz file is placed into the directory above the kernel tree, this will be done automagically.
dpkg-buildpackage -S -rfakeroot -I.git -I.gitignore -i'\.git.*' \ -v<version>
A note to <version>: this should be the last relevant version uploaded. So for uploads to -proposed this should be the last version uploaded to updates. Updates to security should probably be done the same way, but since -security is moved to -updates rather quickly, both will be the same version anyway.
The actual release
The release is done by uploading the source packages to special servers. If the kernel ABI has changed, LUM, LBM and LRM must be uploaded with updated version/ABI numbers as well. Also the linux-meta package must be updated and uploaded (after the other packages are done).
- The upload target differs, depending on the type of upload:
-security uploads go to security.ubuntu.com (jackass) while
-proposed uploads go to upload.ubuntu.com
The packages have to be signed by someone with the upload rights and the uploaded packages will be invisible until they are ACCEPTED
For -security uploads the contacts are kees or jdstrand. For those the status is even invisible after acceptance.
For -proposed uploads the packages have to be accepted by either slangasek or pitty (or cjwatson(?))
If the kABI changed note the reasoning on the stable kernel ABI wiki page. This must also be announced by mails to
- Somehow also keep track of the changes in supported hardware to gather this for releases.
As described in KernelMaintenance. Thoughts on that:
- The ABI files have to be fetched. Would it make sense to get them, then change the release tag to that state? Better would be to get those from test builds. Currently the only problem is HPPA (no host).
The creation of the new release uses whoami and stuff. Might be better to take DEBNAME and DEBEMAIL...