-
Notifications
You must be signed in to change notification settings - Fork 37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Parts from Noble packages/sources #705
Merged
tomponline
merged 29 commits into
canonical:latest-edge
from
simondeziel:parts-from-pkgs
Feb 3, 2025
Merged
Parts from Noble packages/sources #705
tomponline
merged 29 commits into
canonical:latest-edge
from
simondeziel:parts-from-pkgs
Feb 3, 2025
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
and libtpms0 (0.9.3-0ubuntu4) Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
…u2) is broken When using upstream sources, version 1.0.0 worked but the Ubuntu package one does not: ``` ==> Set a valid variable data + lxc config uefi set v1 testvar-8be4df61-93ca-11d2-aa0d-00e098032b8c=48656c6c6f2066726f6d204c5844 Error: Failed to run: uefivars.py -i json -o edk2: exit status 1 (Reading uefivars from stdin Read 41 variables Traceback (most recent call last): File "/snap/lxd/x2/bin/uefivars.py", line 33, in <module> sys.exit(load_entry_point('pyuefivars==0.1', 'console_scripts', 'uefivars.py')()) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/snap/lxd/current/lib/python3/dist-packages/pyuefivars/__init__.py", line 156, in main outfile.write(bytes(varstore)) ^^^^^^^^^^^^^^^ File "/snap/lxd/current/lib/python3/dist-packages/pyuefivars/edk2.py", line 295, in __bytes__ self.blockmap = [(self.length // OVMF_BLOCK_SIZE, OVMF_BLOCK_SIZE)] ^^^^^^^^^^^^^^^ NameError: name 'OVMF_BLOCK_SIZE' is not defined. Did you mean: 'self.OVMF_BLOCK_SIZE'?) ``` This is due to a regression introduced by an Ubuntu patch: https://git.launchpad.net/ubuntu/+source/python-uefivars/tree/debian/patches/edk2.py-Improve-firmware-volume-de-serialization.patch?h=ubuntu/noble#n112 This patch was dropped in versions after Noble so we should try to use the future package that comes with `core26`. Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Patch file taken from: https://git.launchpad.net/ubuntu/+source/python-uefivars/plain/debian/patches/Revert-Use-google-crc32c-instead-of-crc32c.patch?h=ubuntu/plucky This uses the `crc32c` lib coming from the distro package `python3-crc32c` instead of `pip` installing the Google version. Signed-off-by: Simon Deziel <[email protected]>
…ld3) This avoid `pip` installing the Google version. Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
e67cc11
to
751c506
Compare
…4.04.3) Signed-off-by: Simon Deziel <[email protected]>
Even if it did, there is a `libapparmor.so.1` available in `core24`. Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
The snapcraft linter has been complaining that `libusbredirhost.so.1` was primed without being used by any of the binaries/libs which was true: ``` root@v1:/snap/lxd/current# find -type f -exec ldd {} + 2>&1 | grep libusbredirhost ./lib/x86_64-linux-gnu/libusbredirhost.so.1.0.3: ``` This single hit is because `ldd` report about which file it lists when calling it on multiple files to inspect. Signed-off-by: Simon Deziel <[email protected]>
The snapcraft linter has been complaining that `libnvidia-container-go.so.1` was primed without being used by any of the binaries/libs which was true: ``` root@v1:/snap/lxd/current# find -type f -exec ldd {} + 2>&1 | grep libnvidia-container-go ./lib/libnvidia-container-go.so.1.17.2: ``` This single hit is because `ldd` report about which file it lists when calling it on multiple files to inspect. Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
The previous wildcard included `liburing-ffi.so` which was not used by anything. Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
ba45000
to
f297c52
Compare
Signed-off-by: Simon Deziel <[email protected]>
Signed-off-by: Simon Deziel <[email protected]>
f297c52
to
a85af0b
Compare
Signed-off-by: Simon Deziel <[email protected]>
tomponline
approved these changes
Feb 3, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
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.
Some of those changes also resulted in a smaller snap (~7MiB):
and a smaller
squashfs
(~36MiB) as well:This means faster download, faster decompression and less RAM usage.
It's also a little faster to build even on amd64:
But should be quite a bit faster on arches without QEMU/edk2