Finalize core22 transition (5.0-edge) #518
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
simondeziel
changed the title
simondeziel
force-pushed
the
finalize-core22-transition-take2-5.0-edge
branch
from
21aa874 to
3ac2415
Compare
simondeziel
changed the title
|
@simondeziel please can you update the PR description to help me understand the methodology you used here to select the commits - was it primarily just doing a diff between 5.21-edge and 5.0-edge and then looking for the associated commit? What I'm trying to figure out is what to look for in terms of risk areas/large changes. Thanks |
simondeziel
force-pushed
the
finalize-core22-transition-take2-5.0-edge
branch
4 times, most recently
from
bb70b57 to
2220cbf
Compare
|
Locally built snap: |
|
This snap was tested in local VMs using 22.04 and 24.04. A subset of the |
@simondeziel i dont think we can do this, this was supported in 5.0 and is still available in core22 right? |
These need to stay in - we are just changing the base and bringing in updates, not taking away functionality. |
These need to stay in, as it is a late LTS point release so support/behaviours should remain as stable as possible. |
|
@tomponline yep, was easy to miss but the list in the PR description is for thing I did not cherry-pick :) |
|
Apologies I misread that you had not cherry-picked that list :) |
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
tomponline
reviewed
Jul 18, 2024
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit cda2184)
Signed-off-by: Max Asnaashari <[email protected]> (cherry picked from commit dd708ad) Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 7b8f29e)
…files Those files are not world-readable and LXD should already have done the proper changes to have `unshare` work anyway. Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit be91e34)
…nfined files Those files are not world-readable and LXD should already have done the proper changes to have `unshare` work anyway. Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit e387b3a)
It's a fix for a build failure on s390: Installing build-packages Cannot find package listed in 'build-packages': acpica-tools Full execution log: '/root/.local/state/snapcraft/log/snapcraft-20240621-073250.087743.log' Build failed Reason is that, in Ubuntu 24.04 acpica-tools package is not available for s390: https://packages.ubuntu.com/noble/acpica-tools compare with: https://packages.ubuntu.com/jammy/acpica-tools Let's workaround this by preventing build packages installation for any architectures other than amd64/arm64. It's safe, because we only build edk2 for these two architectures. Signed-off-by: Alexander Mikhalitsyn <[email protected]> (cherry picked from commit a0e011e) Signed-off-by: Simon Deziel <[email protected]>
snapcraft syntax a little bit unobvious, and it turned out that: - on amd64,arm64: means AND and not OR. Which is obviously wrong. Let's workaround this. Fixes: a0e011e ("snapcraft: install edk2 build dependencies only when needed") Signed-off-by: Alexander Mikhalitsyn <[email protected]> (cherry picked from commit b57a131) Signed-off-by: Simon Deziel <[email protected]>
Only for core24. Signed-off-by: Alexander Mikhalitsyn <[email protected]> (cherry picked from commit 5910450) Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 526ed11)
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit 30a24f3) Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
snapcraft deduplication is not applied to files from packages listed in stage-packages. To avoid duplicating lz4's .so, make it explicit that we don't want to prime it and instead relying on the one provided in the base snap. Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 84c3f5c)
Let's ship newer version of AppArmor with support of new features. Only needed for core22. But we will use with core24 based series for consistency. Also bumped apparmor to v4.0.2. Signed-off-by: Alexander Mikhalitsyn <[email protected]> (cherry picked from commit 8591ed4) Signed-off-by: Thomas Parrott <[email protected]> Signed-off-by: Simon Deziel <[email protected]>
simondeziel
force-pushed
the
finalize-core22-transition-take2-5.0-edge
branch
from
0f0540b to
25ec456
Compare
|
The |
Signed-off-by: Alexander Mikhalitsyn <[email protected]> (cherry picked from commit e6c25ef)
|
The |
Using `source-commit` causes the build to fail:
```
Executing PosixPath('/root/parts/nvidia-container/run/build.sh')
:: + make -j6
:: Makefile:106: *** Invalid major version. Stop.
```
Using `source-tag` makes it misteriously work. This oddity was reproduced with
v1.14.6, v1.16.0 and v1.16.1
Signed-off-by: Simon Deziel <[email protected]>
tomponline
reviewed
Sep 19, 2024
| "$schema": "https://docs.renovatebot.com/renovate-schema.json", | ||
| "extends": [ | ||
| "config:base", | ||
| "schedule:earlyMondays" |
There was a problem hiding this comment.
Can you align with https://github.com/canonical/lxd/blob/main/.github/renovate.json
tomponline
approved these changes
Sep 19, 2024
|
@simondeziel does this include the fix for the snap preseed config? |
|
@simondeziel is this ready to merge? |
I did not include the breaking commit nor the one that reverted it. Bottom-line is the preseed/
I finally got around to testing the resulting snap: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains all the commits I deemed appropriate to cherry-pick from
latest-edgeright before it moved fromcore22tocore24(so at commit e6c25ef).Here's what was not cherry-picked:
unconfinedchangesedk2commit dadf771edk2: Cleanup build flags and switch to gcc5as that caused issue with secure-boot cert injectionedk2refreshed part definition/override-buildsectionCSMsupportminiosupportnasmman page patch refresh (sincenasmversion was not bumped)nvmesupportqemuchange to Ubuntu/LP sourceapparmorpart removalzfs-0.6,zfs-0.7andzfs-2.0part removalcephremoval fromarmhflxc-to-lxdremovallxd-benchmarkremovallxd-migrateremovalnanopart removalvimpart removalshiftfsremovalupgrade-bridgescript removalXDG_*variable removalLXD_OVMF_PATHreplacement byLXD_QEMU_FW_PATHasstable-5.0still uses the former/var/lib/lxd/unix.sockethandlingmicrocephplugmicroovnplugI also tweaked the
zfs-0-6part to no longer go agit cherry-pick+ full clone but instead use (another).patchfile.