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

Update to latest snapd #154

Merged
merged 1 commit into from
Oct 16, 2023
Merged

Update to latest snapd #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ ubuntu-image (3.0+23.04ubuntu1) UNRELEASED; urgency=medium
* Replace linter and handle previously ignored errors
* handle unknown Offset in gadget Volumes

-- Łukasz 'sil2100' Zemczak <[email protected]> Fri, 14 Jul 2023 15:56:27 +0200
[ Alfonso Sanchez-Beato ]
* Update to latest snapd, adapting to changes in layouts code.

-- Alfonso Sanchez-Beato <[email protected]> Fri, 13 Oct 2023 11:26:23 +0100

ubuntu-image (2.2+22.10ubuntu1) kinetic; urgency=medium

Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require github.com/ulikunitz/xz v0.5.10 // indirect

require (
github.com/snapcore/secboot v0.0.0-20230623151406-4d331d24f830 // indirect
github.com/snapcore/snapd v0.0.0-20230918083329-3a169c3795c7
github.com/snapcore/snapd v0.0.0-20231013073308-d6406abbd09d
github.com/xanzy/ssh-agent v0.3.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand Down Expand Up @@ -64,5 +64,4 @@ require (
github.com/snapcore/bolt v1.3.2-0.20210908134111-63c8bfcf7af8 // indirect
github.com/snapcore/go-gettext v0.0.0-20201130093759-38740d1bd3d2 // indirect
gopkg.in/macaroon.v1 v1.0.0 // indirect
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
)
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ github.com/snapcore/go-gettext v0.0.0-20201130093759-38740d1bd3d2/go.mod h1:D3Ss
github.com/snapcore/secboot v0.0.0-20230623151406-4d331d24f830 h1:SCJ9Uiekv6uMqzMGP50Y0KBxkLP7IzPW35aI3Po6iyM=
github.com/snapcore/secboot v0.0.0-20230623151406-4d331d24f830/go.mod h1:72paVOkm4sJugXt+v9ItmnjXgO921D8xqsbH2OekouY=
github.com/snapcore/snapd v0.0.0-20201005140838-501d14ac146e/go.mod h1:3xrn7QDDKymcE5VO2rgWEQ5ZAUGb9htfwlXnoel6Io8=
github.com/snapcore/snapd v0.0.0-20230918083329-3a169c3795c7 h1:ry7HJmraU4aPeXglrpZyLLQ4rg8ZW5y6Bs5bk+tZ/tc=
github.com/snapcore/snapd v0.0.0-20230918083329-3a169c3795c7/go.mod h1:M+wSEB8eBfffw7I69nDtilqKfbdkmCNbtXY1wMJV1v0=
github.com/snapcore/snapd v0.0.0-20231013073308-d6406abbd09d h1:S0Awi6wSKUXNV5cBllpnOdgqON3+MkDV0f0lnOtBxms=
github.com/snapcore/snapd v0.0.0-20231013073308-d6406abbd09d/go.mod h1:M+wSEB8eBfffw7I69nDtilqKfbdkmCNbtXY1wMJV1v0=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
Expand Down Expand Up @@ -184,8 +184,6 @@ gopkg.in/djherbis/times.v1 v1.2.0 h1:UCvDKl1L/fmBygl2Y7hubXCnY7t4Yj46ZrBFNUipFbM
gopkg.in/djherbis/times.v1 v1.2.0/go.mod h1:AQlg6unIsrsCEdQYhTzERy542dz6SFdQFZFv6mUY0P8=
gopkg.in/macaroon.v1 v1.0.0 h1:BmexIS8QyY02i0uoeXwrtlH8vCS/Rmxq9uzOy4qQvk8=
gopkg.in/macaroon.v1 v1.0.0/go.mod h1:KeG3in9Jb7Z3RNA/PFngm+mISBo0Q0O9KQeF958zuoQ=
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
gopkg.in/retry.v1 v1.0.3 h1:a9CArYczAVv6Qs6VGoLMio99GEs7kY9UzSF9+LD+iGs=
gopkg.in/retry.v1 v1.0.3/go.mod h1:FJkXmWiMaAo7xB+xhvDF59zhfjDWyzmyAxiT4dB688g=
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 h1:yiW+nvdHb9LVqSHQBXfZCieqV4fzYhNBql77zY0ykqs=
Expand Down
3 changes: 2 additions & 1 deletion internal/statemachine/common_states.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ func (stateMachine *StateMachine) populateBootfsContents() error {
GadgetRootDir: filepath.Join(stateMachine.tempDirs.unpack, "gadget"),
KernelRootDir: filepath.Join(stateMachine.tempDirs.unpack, "kernel"),
}
laidOutVolume, err := gadgetLayoutVolume(volume, nil, layoutOptions)
laidOutVolume, err := gadgetLayoutVolume(volume,
gadget.OnDiskStructsFromGadget(volume), layoutOptions)
if err != nil {
return fmt.Errorf("Error laying out bootfs contents: %s", err.Error())
}
Expand Down
2 changes: 1 addition & 1 deletion snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ summary: Create Ubuntu images
description: |
Official tool for building Ubuntu images, currently supporing Ubuntu Core
snap-based images and preinstalled Ubuntu classic images.
version: 3.0+snap12
version: 3.0+snap13
grade: stable
confinement: classic
base: core22
Expand Down