From 11fe31169f66cb15132a93a97216e354a3d7f540 Mon Sep 17 00:00:00 2001 From: Renbo Date: Wed, 31 Jul 2024 11:20:25 +0800 Subject: [PATCH 1/2] update to skopeo-1.14.4-1.src.rpm Signed-off-by: Renbo --- download | 2 +- skopeo.spec | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/download b/download index b1abfa7..0df0d81 100644 --- a/download +++ b/download @@ -1 +1 @@ -16db48d7c12708ab9b504f282766e164 release-1.14-5f2b9af.tar.gz +e965b3821ae464cc65ced8c4354adbad release-1.14-78d9c9a.tar.gz diff --git a/skopeo.spec b/skopeo.spec index be9ade1..7f17840 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -1,28 +1,22 @@ %global debug_package %{nil} %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 release-1.14 -%global commit0 5f2b9afebe813012e936cd5b3f4bae1caae8bd6f +%global commit0 78d9c9a5a94172d1768640651906ed66a395e496 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: skopeo -Version: 1.14.3 -Release: 2%{anolis_release}%{?dist} +Version: 1.14.4 +Release: 1%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -33,7 +27,6 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar %else Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif - BuildRequires: git-core BuildRequires: golang >= 1.17.7 BuildRequires: /usr/bin/go-md2man @@ -129,8 +122,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog -* Mon May 27 2024 Wenlong Zhang - 2:1.14.3-2.0.1 -- add loong64 support for skopeo +* Thu Jun 13 2024 Jindrich Novy - 2:1.14.4-1 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 + (https://github.com/containers/skopeo/commit/78d9c9a) +- Resolves: RHEL-40852 * Fri Apr 19 2024 Jindrich Novy - 2:1.14.3-2 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 -- Gitee From 953a2e32493971cc97753cea758973e4e5e06163 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 --- skopeo.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/skopeo.spec b/skopeo.spec index 7f17840..b58fc77 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -1,9 +1,15 @@ %global debug_package %{nil} %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 @@ -16,7 +22,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 2 Name: skopeo Version: 1.14.4 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: https://%{import_path} @@ -27,6 +33,7 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar %else Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif + BuildRequires: git-core BuildRequires: golang >= 1.17.7 BuildRequires: /usr/bin/go-md2man @@ -122,6 +129,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Wed Jul 31 2024 Wenlong Zhang - 2:1.14.4-1.0.1 +- add loong64 support for skopeo + * Thu Jun 13 2024 Jindrich Novy - 2:1.14.4-1 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.14 (https://github.com/containers/skopeo/commit/78d9c9a) -- Gitee