[wrynose][PATCH] sloci-image: upgrade v0.1.0 -> v0.1.2
<[email protected]> Tue, 2 Jun 2026 08:49:25 +0000
| Newsgroups | org.yoctoproject.lists.meta-virtualization |
|---|---|
| Message-ID | <[email protected]> |
From: Haiqing Bai <[email protected]> Upgrade sloci-image to the latest stable release v0.1.2. Key upstream changes since v0.1.0: - Fix escaping issues when generating OCI image config files - Don't create top-level directory in tar archive (containerd compat) - Fix "--arch arm64" argument being incorrectly rewritten to "arm" Recipe changes: - Update SRCREV to b45be2e (tag v0.1.2) - Update LIC_FILES_CHKSUM for updated LICENSE file The existing variant quoting patch is retained as it remains applicable and is not addressed upstream (Upstream-Status: Inappropriate [embedded specific]). Signed-off-by: Haiqing Bai <[email protected]> --- .../0001-sloci-image-fix-variant-quoting.patch | 11 ++++++----- recipes-containers/sloci-image/sloci-image_git.bb | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/recipes-containers/sloci-image/sloci-image/0001-sloci-image-fix-variant-quoting.patch b/recipes-containers/sloci-image/sloci-image/0001-sloci-image-fix-variant-quoting.patch index 85aa6205..e1749b63 100644 --- a/recipes-containers/sloci-image/sloci-image/0001-sloci-image-fix-variant-quoting.patch +++ b/recipes-containers/sloci-image/sloci-image/0001-sloci-image-fix-variant-quoting.patch @@ -1,4 +1,4 @@ -From 55aebd87ee81f851d088beea8688e3e599c2bced Mon Sep 17 00:00:00 2001 +From f153bc9b54b2d43e572873b7a5ca490b97d2353d Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <[email protected]> Date: Fri, 17 Jul 2020 14:40:12 -0400 Subject: [PATCH] sloci-image: fix variant quoting @@ -14,12 +14,13 @@ when a variant is defined. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Bruce Ashfield <[email protected]> +Signed-off-by: Haiqing Bai <[email protected]> --- sloci-image | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sloci-image b/sloci-image -index be8e79a..e0dc469 100755 +index 7c0c3bd..a9bcd44 100755 --- a/sloci-image +++ b/sloci-image @@ -298,6 +298,7 @@ oci_image_config() { @@ -34,11 +35,11 @@ index be8e79a..e0dc469 100755 "digest": "$manifest_digest", "platform": { "architecture": "$(oci_arch $CFG_ARCH)", -- ${CFG_ARCH_VARIANT:+"\"variant\": $(json_string "$CFG_ARCH_VARIANT"),"} -+ ${CFG_ARCH_VARIANT:+$variant_string} +- ${CFG_ARCH_VARIANT:+"$(echo \"variant\"): $(json_string "$CFG_ARCH_VARIANT"),"} ++ ${CFG_ARCH_VARIANT:+$variant_string} "os": "$CFG_OS" }, "annotations": { -- -2.19.1 +2.51.0 diff --git a/recipes-containers/sloci-image/sloci-image_git.bb b/recipes-containers/sloci-image/sloci-image_git.bb index e0bdad39..7c72c7d6 100644 --- a/recipes-containers/sloci-image/sloci-image_git.bb +++ b/recipes-containers/sloci-image/sloci-image_git.bb @@ -1,6 +1,6 @@ SUMMARY = "A simple CLI tool for packing rootfs into a single-layer OCI image" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=948cd8e59069fad992b0469af9ad7966" +LIC_FILES_CHKSUM = "file://LICENSE;md5=896c8ffa3d0539d0d980d0217269969d" SRC_URI = "git://github.com/jirutka/sloci-image.git;branch=master;protocol=https \ file://0001-sloci-image-fix-variant-quoting.patch \ " @@ -8,8 +8,8 @@ SRC_URI = "git://github.com/jirutka/sloci-image.git;branch=master;protocol=https DEPENDS = "" -SRCREV = "4015e49763e5a738026a5bbfcf32b38b5a4fa650" -PV = "v0.1.0+git" +SRCREV = "b45be2e049c5c55acb04a5edb017b793d2d9e677" +PV = "v0.1.2+git" do_compile() { : -- 2.53.0