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

conf: declare support for scarthgap #57

Closed
wants to merge 3 commits into from
Closed

conf: declare support for scarthgap #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45e3234
conf: declare support for scarthgap
zyga Mar 25, 2024
d29fc31
kas: use branch (scarthgap) rather than refspec
zyga May 27, 2024
3385afc
snapd: bump to 2.63
zyga May 27, 2024
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
2 changes: 1 addition & 1 deletion conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ BBFILE_PRIORITY_snapd = "7"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
LAYERVERSION_snapd = "1"
LAYERSERIES_COMPAT_snapd = "kirkstone langdale mickledore nanbield"
LAYERSERIES_COMPAT_snapd = "kirkstone langdale mickledore nanbield scarthgap"
LAYERDEPENDS_snapd = "core filesystems-layer security"
6 changes: 3 additions & 3 deletions kas-poky-snapd.common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:
poky:
url: https://git.yoctoproject.org/git/poky
path: layers/poky
refspec: master
branch: scarthgap
layers:
meta:
meta-poky:
Expand All @@ -20,7 +20,7 @@ repos:
meta-openembedded:
url: http://git.openembedded.org/meta-openembedded
path: layers/meta-openembedded
refspec: master
branch: scarthgap
layers:
meta-oe:
meta-python:
Expand All @@ -31,7 +31,7 @@ repos:
meta-security:
url: http://git.yoctoproject.org/git/meta-security
path: layers/meta-security
refspec: master
branch: scarthgap

bblayers_conf_header:
standard: |
Expand Down
6 changes: 0 additions & 6 deletions recipes-support/snapd/snapd-2.61.3.inc
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions recipes-support/snapd/snapd-2.63.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
SRC_URI = "https://${GO_IMPORT}/releases/download/${PV}/snapd_${PV}.vendor.tar.xz"

SRC_URI[md5sum] = "a79b53b0de79153d597bc07c7bd76e4d"
SRC_URI[sha256sum] = "2f0083d2c4e087c29f48cd1abb8a92eb2e63cf04cd433256c86fac05d0b28cab"

S = "${WORKDIR}/${PN}-${PV}"
4 changes: 2 additions & 2 deletions recipes-support/snapd/snapd-git.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PR = "r0"


BASEPV = "2.61.3"
BASEPV = "2.63"
SRC_URI = "git://github.com/snapcore/snapd.git;protocol=https;branch=release/${BASEPV};destsuffix=git/"
PV = "${BASEPV}+git${SRCPV}"
S = "${WORKDIR}/git"

SRCREV = "12e48ef9a63b92964a57e549107c648887b040eb"
SRCREV = "40efd81c2f35213eabf2df83fb9efabe88fa124e"

DEFAULT_PREFERENCE ??= "-1"

Expand Down
2 changes: 1 addition & 1 deletion recipes-support/snapd/snapd-native_2.61.3.bb → recipes-support/snapd/snapd-native_2.63.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ HOMEPAGE = "https://www.snapcraft.io"
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://${WORKDIR}/snapd-${PV}/COPYING;md5=d32239bcb673463ab874e80d47fae504"

require snapd-2.61.3.inc
require snapd-2.63.inc
S = "${WORKDIR}/snapd-${PV}"

RDEPENDS_${PN} += " \
Expand Down
1 change: 1 addition & 0 deletions recipes-support/snapd/snapd.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ do_install() {
install -d ${D}${bindir}
install -d ${D}${systemd_unitdir}/system
install -d ${D}/var/lib/snapd
install -d ${D}/var/lib/snapd/cgroup
install -d ${D}/var/lib/snapd/snaps
install -d ${D}/var/lib/snapd/lib/gl
install -d ${D}/var/lib/snapd/desktop
Expand Down
2 changes: 0 additions & 2 deletions recipes-support/snapd/snapd_2.61.3.bb
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions recipes-support/snapd/snapd_2.63.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include snapd.inc
include snapd-2.63.inc