[Buildroot] [PATCH 1/1] package/sloci-image: bump to version 0.1.2

* [Buildroot] [PATCH 1/1] package/sloci-image: bump to version 0.1.2
@ 2021-10-18 21:54 Fabrice Fontaine
  2021-10-25 20:17 ` Arnout Vandecappelle
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2021-10-18 21:54 UTC (permalink / raw)
  To: buildroot; +Cc: Sergio Prado, Jens Rosenboom, Matt Weber, Fabrice Fontaine

- Drop patches (already in version)
- Update hash of LICENSE (year updated with
  https://github.com/jirutka/sloci-image/commit/ab128a4a1f12321d39188de38f81652b5852e35c)

https://github.com/jirutka/sloci-image/compare/v0.1.1...v0.1.2

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...-from-the-contents-of-working-folder.patch | 37 ------------------
 ...002-oci_arch-fix-arch-arm64-argument.patch | 39 -------------------
 package/sloci-image/sloci-image.hash          |  4 +-
 package/sloci-image/sloci-image.mk            |  2 +-
 4 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 package/sloci-image/0001-create-OCI-tar-from-the-contents-of-working-folder.patch
 delete mode 100644 package/sloci-image/0002-oci_arch-fix-arch-arm64-argument.patch

diff --git a/package/sloci-image/0001-create-OCI-tar-from-the-contents-of-working-folder.patch b/package/sloci-image/0001-create-OCI-tar-from-the-contents-of-working-folder.patch
deleted file mode 100644
index 3d048e3843..0000000000
--- a/package/sloci-image/0001-create-OCI-tar-from-the-contents-of-working-folder.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 66c73c2ba3057634f19f37d3cfbbe752638c9f9f Mon Sep 17 00:00:00 2001
-From: Matthew Weber <matthew.weber@collins.com>
-Date: Fri, 27 Aug 2021 12:24:19 -0500
-Subject: [PATCH] create OCI tar from the contents of working folder
-
-When testing with containerd, it was found that the tarfile
-created with sloci can't import because the contents are inside
-a folder.  Looking around online, it seems that the an oci tar
-should container the blob/index.json/oci-layout in the . of the
-tarfile.
-
-Upstream: https://github.com/jirutka/sloci-image/pull/3
-
-Refs:
-https://snyk.io/blog/container-image-formats/
-https://github.com/opencontainers/image-spec/blob/main/image-layout.md
-
-Signed-off-by: Matthew Weber <matthew.weber@collins.com>
----
- sloci-image | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sloci-image b/sloci-image
-index 90dba26..7f3c775 100755
---- a/sloci-image
-+++ b/sloci-image
-@@ -425,6 +425,6 @@ if [ "$OUT_TYPE" = tar ]; then
- 	file_name="$IMAGE_NAME-$CFG_REF_NAME-$CFG_ARCH"
- 	file_name="$file_name${CFG_ARCH_VARIANT:+"-$CFG_ARCH_VARIANT"}-$CFG_OS.oci-image"
- 
--	tar ${DEBUG:+-v} -cf "$file_name.tar" "$IMAGE_NAME"
-+	tar ${DEBUG:+-v} -cf "$file_name.tar" -C "$IMAGE_NAME" .
- 	rm -Rf "$IMAGE_NAME"
- fi
--- 
-2.17.1
-
diff --git a/package/sloci-image/0002-oci_arch-fix-arch-arm64-argument.patch b/package/sloci-image/0002-oci_arch-fix-arch-arm64-argument.patch
deleted file mode 100644
index 27c4ab8c16..0000000000
--- a/package/sloci-image/0002-oci_arch-fix-arch-arm64-argument.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 67b16c65cdf0f654275802d6d12451a81a4d2796 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Sat, 11 Sep 2021 14:37:20 +0200
-Subject: [PATCH] oci_arch: fix "--arch arm64" argument
-
-The --arch argument presumably should take the appropriate GOARCH-type
-string. The oci_arch() function does some conversion on it, which is
-needed because without --arch the architecture is taken from "uname -m",
-which yields something different than a GOARCH-type string.
-
-However, oci_arch() converts arm* into arm, which is wrong for arm64.
-Since arm64 is a proper GOARCH-type string, it shouldn't be converted at
-all.
-
-Upate the case statement to convert arm64 to arm64 (i.e., do nothing).
-Since the arm64 match comes before arm*, it takes precedence.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-Upstream: https://github.com/jirutka/sloci-image/pull/4
----
- sloci-image | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sloci-image b/sloci-image
-index 7f3c775..6844023 100755
---- a/sloci-image
-+++ b/sloci-image
-@@ -214,7 +214,7 @@ oci_arch() {
- 	case "$1" in
- 		x86_64) echo amd64;;
- 		x86) echo 386;;
--		aarch64) echo arm64;;
-+		aarch64|arm64) echo arm64;;
- 		arm*) echo arm;;
- 		*) echo "$1";;
- 	esac
--- 
-2.31.1
-
diff --git a/package/sloci-image/sloci-image.hash b/package/sloci-image/sloci-image.hash
index 117f0ba6e0..ea1368e422 100644
--- a/package/sloci-image/sloci-image.hash
+++ b/package/sloci-image/sloci-image.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256  56fbc335c193eccc3992f0a723c6dabe762f6d4854fc52059be074bdf5060d9e  sloci-image-0.1.1.tar.gz
+sha256  4c5baee9a4915ca88e3a54befa1ccb8616be20208070cf54ac366c195647da79  sloci-image-0.1.2.tar.gz
 
 # Hash for license files:
-sha256  8ea53673b084576813fc40cd63817c5a1619438942b5e6c30dac1d10707c27e4  LICENSE
+sha256  4c86c21e003875b85b4b9299156f8cec72c8e8e1abf5aa1f2d3c4dc665a3bea0  LICENSE
diff --git a/package/sloci-image/sloci-image.mk b/package/sloci-image/sloci-image.mk
index 232127bfa2..7361c49de4 100644
--- a/package/sloci-image/sloci-image.mk
+++ b/package/sloci-image/sloci-image.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SLOCI_IMAGE_VERSION = 0.1.1
+SLOCI_IMAGE_VERSION = 0.1.2
 SLOCI_IMAGE_SITE = $(call github,jirutka,sloci-image,v$(SLOCI_IMAGE_VERSION))
 
 SLOCI_IMAGE_LICENSE = MIT
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread