diff options
Diffstat (limited to 'recipes-containers/cri-o/cri-o_git.bb')
| -rw-r--r-- | recipes-containers/cri-o/cri-o_git.bb | 53 |
1 files changed, 22 insertions, 31 deletions
diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index ebf5bab3..4e17a7cd 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb @@ -14,10 +14,9 @@ At a high level, we expect the scope of cri-o to be restricted to the following - Resource isolation as required by the CRI \ " -SRCREV_cri-o = "6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3" +SRCREV_cri-o = "5aff11c7c1afdc785adafd7da3c3f2a6ac51b88d" SRC_URI = "\ - git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.17;name=cri-o \ - file://0001-Makefile-force-symlinks.patch \ + git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.30;name=cri-o;protocol=https \ file://crio.conf \ " @@ -27,7 +26,10 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2 GO_IMPORT = "import" -PV = "1.17.0+git${SRCREV_cri-o}" +PV = "1.30.0+git${SRCREV_cri-o}" + +inherit features_check +REQUIRED_DISTRO_FEATURES ?= "seccomp" DEPENDS = " \ glib-2.0 \ @@ -36,38 +38,25 @@ DEPENDS = " \ ostree \ libdevmapper \ libseccomp \ - libselinux \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ cni \ libdevmapper \ " -python __anonymous() { - msg = "" - # ERROR: Nothing PROVIDES 'libseccomp' (but /buildarea/layers/meta-virtualization/recipes-containers/cri-o/cri-o_git.bb DEPENDS on or otherwise requires it). - # ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. - # Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'cri-o', 'libseccomp'] - if 'security' not in d.getVar('BBFILE_COLLECTIONS').split(): - msg += "Make sure meta-security should be present as it provides 'libseccomp'" - raise bb.parse.SkipRecipe(msg) - # ERROR: Nothing PROVIDES 'libselinux' (but /buildarea/layers/meta-virtualization/recipes-containers/cri-o/cri-o_git.bb DEPENDS on or otherwise requires it). - # ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. - # Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'cri-o', 'libselinux'] - elif 'selinux' not in d.getVar('BBFILE_COLLECTIONS').split(): - msg += "Make sure meta-selinux should be present as it provides 'libselinux'" - raise bb.parse.SkipRecipe(msg) -} +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[selinux] = ",,libselinux" PACKAGES =+ "${PN}-config" -RDEPENDS_${PN} += " virtual/containerd virtual/runc" -RDEPENDS_${PN} += " e2fsprogs-mke2fs conmon util-linux iptables conntrack-tools" +RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}" +RDEPENDS:${PN} += " e2fsprogs-mke2fs conmon util-linux iptables conntrack-tools" inherit systemd inherit go inherit goarch inherit pkgconfig +inherit container-host EXTRA_OEMAKE="BUILDTAGS=''" @@ -81,8 +70,8 @@ do_compile() { } SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','crio.service','',d)}" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','crio.service','',d)}" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" do_install() { set +e @@ -107,17 +96,19 @@ do_install() { install -m 0644 ${S}/src/import/contrib/systemd/crio.service ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/src/import/contrib/systemd/crio-shutdown.service ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/src/import/contrib/systemd/crio-wipe.service ${D}${systemd_unitdir}/system/ + + install -d ${D}${localstatedir}/lib/crio } -FILES_${PN}-config = "${sysconfdir}/crio/config/*" -FILES_${PN} += "${systemd_unitdir}/system/*" -FILES_${PN} += "/usr/local/bin/*" -FILES_${PN} += "/usr/share/containers/oci/hooks.d" +FILES:${PN}-config = "${sysconfdir}/crio/config/*" +FILES:${PN} += "${systemd_unitdir}/system/*" +FILES:${PN} += "/usr/local/bin/*" +FILES:${PN} += "/usr/share/containers/oci/hooks.d" # don't clobber hooks.d -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -INSANE_SKIP_${PN} += "ldflags already-stripped" +INSANE_SKIP:${PN} += "ldflags already-stripped textrel" deltask compile_ptest_base |