From 9de2c86118e5dda87b3b6f0faa7afb41ffe8b48a Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 24 May 2024 03:43:09 +0000 Subject: [PATCH] crio-o: adapt SRC_URI to include destsuffix=${GO_SRCURI_DESTSUFFIX} As of commit cc4ec43a2b657fb4c58429ab14f1edc2473c1327 [go: Drop fork of unpack code, mandate GO_SRCURI_DESTSUFFIX] we require this variable in our go recipes. We also adjust our WORKDIR reference to use UNPACKDIR instead Signed-off-by: Bruce Ashfield --- recipes-containers/cri-o/cri-o_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index 4e17a7cd..0255aa0a 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb @@ -16,7 +16,7 @@ At a high level, we expect the scope of cri-o to be restricted to the following SRCREV_cri-o = "5aff11c7c1afdc785adafd7da3c3f2a6ac51b88d" SRC_URI = "\ - git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.30;name=cri-o;protocol=https \ + git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.30;name=cri-o;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ file://crio.conf \ " @@ -83,7 +83,7 @@ do_install() { install -d ${D}${systemd_unitdir}/system/ install -d ${D}/usr/share/containers/oci/hooks.d - install ${WORKDIR}/crio.conf ${D}/${sysconfdir}/crio/crio.conf + install ${UNPACKDIR}/crio.conf ${D}/${sysconfdir}/crio/crio.conf # sample config files, they'll go in the ${PN}-config below install -d ${D}/${sysconfdir}/crio/config/