From aa9d285e0291a5f4d66cc14222f5d24cbcd7228e Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 5 Jul 2021 12:20:06 +0200 Subject: [PATCH] skopeo-1.3.1-5.el9 - handle CentOS Stream while updating vendored components - Related: #1970747 Signed-off-by: Jindrich Novy --- skopeo.spec | 10 +++++++--- update-vendored.sh | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/skopeo.spec b/skopeo.spec index 54ffbbf..97a7e9c 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -21,8 +21,8 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl # podman/skopeo/podman. %global podman_branch master %global image_branch v5.12.0 -%global common_branch v0.38.4 -%global storage_branch v1.31.1 +%global common_branch v0.38.12 +%global storage_branch v1.31.3 %global shortnames_branch main %global commit0 038f70e6f52ca354534b2d38ce9611b8fc5537c4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) @@ -30,7 +30,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 1 Name: skopeo Version: 1.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -241,6 +241,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Mon Jul 05 2021 Jindrich Novy - 1:1.3.1-5 +- handle CentOS Stream while updating vendored components +- Related: #1970747 + * Mon Jul 05 2021 Jindrich Novy - 1:1.3.1-4 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.3 (https://github.com/containers/skopeo/commit/038f70e) diff --git a/update-vendored.sh b/update-vendored.sh index 9b78ce2..c569f9d 100755 --- a/update-vendored.sh +++ b/update-vendored.sh @@ -5,13 +5,17 @@ set -xe rm -f /tmp/ver_image /tmp/ver_common /tmp/ver_storage B=`pkg switch-branch | grep ^* | cut -d\ -f2` +git branch | grep c9s > /dev/null +if [ $? == 0 ]; then + B=c9s +fi echo $B for P in podman skopeo buildah; do BRN=`pwd | sed 's,^.*/,,'` rm -rf $P pkg clone $P cd $P - pkg switch-branch $B + [ $B != c9s ] && pkg switch-branch $B if [ $BRN != stream-container-tools-rhel8 ]; then pkg prep else