diff --git a/recipes-support/snapd/snapd-2.61.3.inc b/recipes-support/snapd/snapd-2.61.3.inc deleted file mode 100644 index 15dcca8..0000000 --- a/recipes-support/snapd/snapd-2.61.3.inc +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = "https://${GO_IMPORT}/releases/download/${PV}/snapd_${PV}.vendor.tar.xz" - -SRC_URI[md5sum] = "407a07be765fc817c7030ce606e74944" -SRC_URI[sha256sum] = "90d427ca0a0e1306e647c6091176fba678522e2af04228aa274a34d011c82123" - -S = "${WORKDIR}/${PN}-${PV}" diff --git a/recipes-support/snapd/snapd-2.63.inc b/recipes-support/snapd/snapd-2.63.inc new file mode 100644 index 0000000..923cda8 --- /dev/null +++ b/recipes-support/snapd/snapd-2.63.inc @@ -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}" diff --git a/recipes-support/snapd/snapd-git.inc b/recipes-support/snapd/snapd-git.inc index 582e74c..401fc4f 100644 --- a/recipes-support/snapd/snapd-git.inc +++ b/recipes-support/snapd/snapd-git.inc @@ -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" diff --git a/recipes-support/snapd/snapd-native_2.61.3.bb b/recipes-support/snapd/snapd-native_2.63.bb similarity index 96% rename from recipes-support/snapd/snapd-native_2.61.3.bb rename to recipes-support/snapd/snapd-native_2.63.bb index e6cdde1..415fe5c 100644 --- a/recipes-support/snapd/snapd-native_2.61.3.bb +++ b/recipes-support/snapd/snapd-native_2.63.bb @@ -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} += " \ diff --git a/recipes-support/snapd/snapd.inc b/recipes-support/snapd/snapd.inc index e468675..9607fa4 100644 --- a/recipes-support/snapd/snapd.inc +++ b/recipes-support/snapd/snapd.inc @@ -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 diff --git a/recipes-support/snapd/snapd_2.61.3.bb b/recipes-support/snapd/snapd_2.61.3.bb deleted file mode 100644 index c367c50..0000000 --- a/recipes-support/snapd/snapd_2.61.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -include snapd.inc -include snapd-2.61.3.inc diff --git a/recipes-support/snapd/snapd_2.63.bb b/recipes-support/snapd/snapd_2.63.bb new file mode 100644 index 0000000..320bcd8 --- /dev/null +++ b/recipes-support/snapd/snapd_2.63.bb @@ -0,0 +1,2 @@ +include snapd.inc +include snapd-2.63.inc