From 34b7d7a957f0f3dcb10dd97045a4997a8261bce2 Mon Sep 17 00:00:00 2001 From: Renbo Date: Thu, 2 Mar 2023 16:14:02 +0800 Subject: [PATCH 1/2] update to skopeo-1.9.4-0.1.module+el8.7.0+17824+66a0202b Signed-off-by: Renbo --- 0001-add-loong64-support-for-etcd.patch | 29 -------------- download | 2 +- skopeo.spec | 50 ++++++++++++++++--------- 3 files changed, 33 insertions(+), 48 deletions(-) delete mode 100644 0001-add-loong64-support-for-etcd.patch diff --git a/0001-add-loong64-support-for-etcd.patch b/0001-add-loong64-support-for-etcd.patch deleted file mode 100644 index bb6f9f5..0000000 --- a/0001-add-loong64-support-for-etcd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e6fea3042b3b9f9986ce9e19c730b2bd3d3eaa05 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Fri, 30 Dec 2022 06:22:44 +0000 -Subject: [PATCH] add loong64 support for etcd - ---- - vendor/go.etcd.io/bbolt/bolt_loong64.go | 10 ++++++++++ - 1 file changed, 10 insertions(+) - create mode 100644 vendor/go.etcd.io/bbolt/bolt_loong64.go - -diff --git a/vendor/go.etcd.io/bbolt/bolt_loong64.go b/vendor/go.etcd.io/bbolt/bolt_loong64.go -new file mode 100644 -index 0000000..d02d59e ---- /dev/null -+++ b/vendor/go.etcd.io/bbolt/bolt_loong64.go -@@ -0,0 +1,10 @@ -+// +build loong64 -+ -+package bbolt -+ -+// maxMapSize represents the largest mmap size supported by Bolt. -+const maxMapSize = 0x8000000000 // 512GB -+ -+// maxAllocSize is the size used when creating array pointers. -+const maxAllocSize = 0x7FFFFFFF -+ --- -2.27.0 - diff --git a/download b/download index 3016ae3..96edfd7 100644 --- a/download +++ b/download @@ -1 +1 @@ -aacd226596db25dba189c252ef080b2c skopeo-1.9.1-2eac0f4.tar.gz +92fbb68275179666699976f64afc12d1 release-1.9-04d99f7.tar.gz diff --git a/skopeo.spec b/skopeo.spec index 747bade..0b8b573 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -1,27 +1,21 @@ %global with_check 0 -%global anolis_release .0.1 %if 0%{?rhel} > 7 && ! 0%{?fedora} -%ifarch loongarch64 -%define gobuild(o:) \ -go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; -%else %define gobuild(o:) \ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; -%endif %else %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; %endif %global import_path github.com/containers/%{name} -#%%global branch main -%global commit0 2eac0f463a6d2d9d8312c4a52c1e30e8bb8bf7f8 +%global branch release-1.9 +%global commit0 04d99f7eb2de0abdb04ea6b7b9f3fff77dfe4c9f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo -Version: 1.9.1 -Release: 1%{anolis_release}%{?dist} +Version: 1.9.4 +Release: 0.1%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -32,8 +26,6 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar %else Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif - -Patch001: 0001-add-loong64-support-for-etcd.patch BuildRequires: git-core BuildRequires: golang >= 1.17.7 BuildRequires: /usr/bin/go-md2man @@ -129,14 +121,27 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog -* Fri Dec 30 2022 Wenlong Zhang - 2:1.9.1-1.0.1 -- add loong64 support for skopeo +* Fri Jan 13 2023 Jindrich Novy - 2:1.9.4-0.1 +- consume skopeo from release-1.9 upstream branch +- Resolves: #2160713 + +* Thu Oct 20 2022 Jindrich Novy - 2:1.9.3-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.9.3 +- Related: #2135973 + +* Wed Aug 03 2022 Jindrich Novy - 2:1.9.2-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.9.2 +- Related: #2061390 -* Wed Jul 27 2022 Jindrich Novy - 2:1.9.1-1 +* Tue Jul 26 2022 Jindrich Novy - 2:1.9.1-1 - update to https://github.com/containers/skopeo/releases/tag/v1.9.1 - Related: #2061390 -* Tue Jun 07 2022 Jindrich Novy - 2:1.8.0-2 +* Mon Jul 18 2022 Jindrich Novy - 2:1.9.0-2 +- update to skopeo-1.9.0 - thanks to Lokesh Mandvekar for fixing build issues +- Related: #2061390 + +* Wed May 11 2022 Jindrich Novy - 2:1.8.0-2 - BuildRequires: /usr/bin/go-md2man - Related: #2061390 @@ -144,16 +149,25 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} - update to https://github.com/containers/skopeo/releases/tag/v1.8.0 - Related: #2061390 -* Wed Apr 20 2022 Jindrich Novy - 2:1.7.0-2 +* Fri Apr 08 2022 Jindrich Novy - 2:1.7.0-2 - Related: #2061390 * Fri Mar 25 2022 Jindrich Novy - 2:1.7.0-1 - update to https://github.com/containers/skopeo/releases/tag/v1.7.0 +- Related: #2061390 -* Mon Mar 07 2022 Jindrich Novy - 2:1.6.1-1 +* Thu Feb 17 2022 Jindrich Novy - 2:1.6.1-1 - update to https://github.com/containers/skopeo/releases/tag/v1.6.1 - Related: #2001445 +* Thu Feb 03 2022 Jindrich Novy - 2:1.6.0-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.6.0 +- Related: #2001445 + +* Mon Nov 29 2021 Jindrich Novy - 2:1.5.2-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.5.2 +- Related: #2001445 + * Mon Nov 08 2021 Jindrich Novy - 2:1.5.1-1 - update to https://github.com/containers/skopeo/releases/tag/v1.5.1 - Related: #2001445 -- Gitee From b2a49e568cfb0229fec0daf409155a81ec31a762 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Fri, 30 Dec 2022 15:41:15 +0800 Subject: [PATCH 2/2] add loong64 support for skopeo Signed-off-by: Wenlong Zhang --- 0001-add-loong64-support-for-etcd.patch | 29 +++++++++++++++++++++++++ skopeo.spec | 13 ++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-add-loong64-support-for-etcd.patch diff --git a/0001-add-loong64-support-for-etcd.patch b/0001-add-loong64-support-for-etcd.patch new file mode 100644 index 0000000..bb6f9f5 --- /dev/null +++ b/0001-add-loong64-support-for-etcd.patch @@ -0,0 +1,29 @@ +From e6fea3042b3b9f9986ce9e19c730b2bd3d3eaa05 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Fri, 30 Dec 2022 06:22:44 +0000 +Subject: [PATCH] add loong64 support for etcd + +--- + vendor/go.etcd.io/bbolt/bolt_loong64.go | 10 ++++++++++ + 1 file changed, 10 insertions(+) + create mode 100644 vendor/go.etcd.io/bbolt/bolt_loong64.go + +diff --git a/vendor/go.etcd.io/bbolt/bolt_loong64.go b/vendor/go.etcd.io/bbolt/bolt_loong64.go +new file mode 100644 +index 0000000..d02d59e +--- /dev/null ++++ b/vendor/go.etcd.io/bbolt/bolt_loong64.go +@@ -0,0 +1,10 @@ ++// +build loong64 ++ ++package bbolt ++ ++// maxMapSize represents the largest mmap size supported by Bolt. ++const maxMapSize = 0x8000000000 // 512GB ++ ++// maxAllocSize is the size used when creating array pointers. ++const maxAllocSize = 0x7FFFFFFF ++ +-- +2.27.0 + diff --git a/skopeo.spec b/skopeo.spec index 0b8b573..f8dfcaf 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -1,8 +1,14 @@ %global with_check 0 +%global anolis_release .0.1 %if 0%{?rhel} > 7 && ! 0%{?fedora} +%ifarch loongarch64 +%define gobuild(o:) \ +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; +%else %define gobuild(o:) \ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; +%endif %else %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; %endif @@ -15,7 +21,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 2 Name: skopeo Version: 1.9.4 -Release: 0.1%{?dist} +Release: 0.1%{anolis_release}%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -26,6 +32,8 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar %else Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif + +Patch001: 0001-add-loong64-support-for-etcd.patch BuildRequires: git-core BuildRequires: golang >= 1.17.7 BuildRequires: /usr/bin/go-md2man @@ -121,6 +129,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Thu Mar 02 2023 Wenlong Zhang - 2:1.9.4-0.1.0.1 +- add loong64 support for skopeo + * Fri Jan 13 2023 Jindrich Novy - 2:1.9.4-0.1 - consume skopeo from release-1.9 upstream branch - Resolves: #2160713 -- Gitee