All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bruce Ashfield <bruce.ashfield@gmail.com>
To: haiqing.bai@windriver.com
Cc: meta-virtualization@lists.yoctoproject.org
Subject: Re: [meta-virtualization] [wrynose][PATCH] sloci-image: upgrade v0.1.0 -> v0.1.2
Date: Fri, 5 Jun 2026 03:35:15 +0000	[thread overview]
Message-ID: <aiJD81hCkwBIfyiC@gmail.com> (raw)
In-Reply-To: <20260602084925.1052813-1-haiqing.bai@windriver.com>

There's a bump pending in master-next, that needs to land first, and
then you can sumbit a cherry pick request for it.

Bruce

In message: [meta-virtualization] [wrynose][PATCH] sloci-image: upgrade v0.1.0 -> v0.1.2
on 02/06/2026 haiqing via lists.yoctoproject.org wrote:

> From: Haiqing Bai <Haiqing.Bai@windriver.com>
> 
> 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 <haiqing.bai@windriver.com>
> ---
>  .../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 <bruce.ashfield@gmail.com>
>  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 <bruce.ashfield@gmail.com>
> +Signed-off-by: Haiqing Bai <haiqing.bai@windriver.com>
>  ---
>   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
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9839): https://lists.yoctoproject.org/g/meta-virtualization/message/9839
> Mute This Topic: https://lists.yoctoproject.org/mt/119608048/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 



      reply	other threads:[~2026-06-05  3:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-02  8:49 [wrynose][PATCH] sloci-image: upgrade v0.1.0 -> v0.1.2 haiqing.bai
2026-06-05  3:35 ` Bruce Ashfield [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aiJD81hCkwBIfyiC@gmail.com \
    --to=bruce.ashfield@gmail.com \
    --cc=haiqing.bai@windriver.com \
    --cc=meta-virtualization@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.