Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Move to core 22 (5.0-edge) #238

Merged
merged 6 commits into from
Feb 14, 2024
Merged

Move to core 22 (5.0-edge) #238

merged 6 commits into from
Feb 14, 2024

Conversation

mihalicyn
Copy link
Member

@mihalicyn mihalicyn commented Dec 7, 2023 •
edited
Loading

  • move to core22
  • fix ZFS 0.6/0.7 build issues on core22

@mihalicyn
Copy link
Member Author

ZFS 0.6:
https://github.com/mihalicyn/zfs/commits/zfs-0.6-core22-compilation-fix

ZFS 0.7:
https://github.com/mihalicyn/zfs/commits/zfs-0.7-core22-compilation-fix

I'm on the way to create .patch files and properly include them in the lxd-pkg-snap. But just for demonstration and testing purposes publishing this PR as it is.

@mihalicyn mihalicyn marked this pull request as ready for review December 7, 2023 15:50
simondeziel
simondeziel previously approved these changes Dec 7, 2023
View reviewed changes
Copy link
Member

@simondeziel simondeziel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, with the small inconsistency s/SNAPCRAFT_PROJECT_DIR/CRAFT_PROJECT_DIR/ fixed.

That is a very welcome change, thank you!

snapcraft.yaml Show resolved Hide resolved
snapcraft.yaml Show resolved Hide resolved
@mihalicyn mihalicyn requested a review from MusicDin December 8, 2023 08:45
MusicDin
MusicDin previously approved these changes Dec 8, 2023
View reviewed changes
@tomponline
Copy link
Member

LGTM, but wont merge until after LXD 5.0.3 is released.

@tomponline
Copy link
Member

tomponline commented Feb 13, 2024 •
edited
Loading

This can be rebased and we can then look to merge it soon. Ta

@simondeziel
Copy link
Member

simondeziel commented Feb 13, 2024 •
edited
Loading

This would also be a good time to drop the build-attributes that no longer make sense if the base is core22, see https://snapcraft.io/docs/release-notes-snapcraft-6-1#heading--core22

stgraber and others added 5 commits February 14, 2024 11:15
@stgraber @mihalicyn
snapcraft: Move to core22
b4237b8 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit e85fe8b)
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
@stgraber @mihalicyn
snapcraft: Fix meson builds
a0a6ecd 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit a2c01af)
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
@stgraber @mihalicyn
nvidia-container: Tweak for 22.04
b19f1af 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit c20fbd9)
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
@stgraber @mihalicyn
nvidia-container: Fix issue with Ubuntu 20.04
f9967b6 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit e98676c)
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
@mihalicyn
zfs: fix build for zfs 0.6 and 0.7 on core22
02c841e 
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
@mihalicyn
Copy link
Member Author

This can be rebased and we can then look to merge it soon. Ta

Have rebased.

@mihalicyn mihalicyn changed the title [WIP] Move to core 22 (5.0-edge) Move to core 22 (5.0-edge) Feb 14, 2024
@mihalicyn
snapcraft: remove build-attributes for core22-step-dependencies
e32927a 
It makes no sense anymore as we step on core22.

Suggested-by: Simon Deziel <[email protected]>
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
@mihalicyn mihalicyn dismissed stale reviews from MusicDin and simondeziel via e32927a February 14, 2024 10:34
@mihalicyn
Copy link
Member Author

This would also be a good time to drop the build-attributes that no longer make sense if the base is core22, see https://snapcraft.io/docs/release-notes-snapcraft-6-1#heading--core22

Have done.

@tomponline tomponline merged commit 31300a2 into canonical:5.0-edge Feb 14, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomponline tomponline tomponline approved these changes

@simondeziel simondeziel Awaiting requested review from simondeziel

@MusicDin MusicDin Awaiting requested review from MusicDin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mihalicyn @tomponline @simondeziel @MusicDin @stgraber