rpms/containers-common
7
0
Fork 0
Code Issues Pull Requests Releases Activity

containers-common-1-55.el9

Browse Source 
- fix vendoring script
- Related: #2176063

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2023-07-19 05:14:23 +02:00
parent 362a81e6ad
commit d4655925b0
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containers-common.spec
View File

@ -12,7 +12,7 @@
Epoch: 2 Epoch: 2
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 54%{?dist} Release: 55%{?dist}
Summary: Common configuration and documentation for containers Summary: Common configuration and documentation for containers
License: ASL 2.0 License: ASL 2.0
ExclusiveArch: %{go_arches} ExclusiveArch: %{go_arches}
@ -173,6 +173,10 @@ EOF
%{_datadir}/rhel/secrets/* %{_datadir}/rhel/secrets/*
%changelog %changelog
* Wed Jul 19 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-55
- fix vendoring script
- Related: #2176063
* Mon Jul 10 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-54 * Mon Jul 10 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-54
- update vendored components - update vendored components
- Related: #2176063 - Related: #2176063

13
update-vendored.sh
View File

@ -7,20 +7,23 @@ CENTOS=""
pwd | grep /tmp/centos > /dev/null pwd | grep /tmp/centos > /dev/null
if [ $? == 0 ]; then if [ $? == 0 ]; then
CENTOS=1 CENTOS=1
PKG=centpkg
else
PKG=rhpkg
fi fi
set -e set -e
for P in podman skopeo buildah; do for P in podman skopeo buildah; do
BRN=`pwd | sed 's,^.*/,,'` BRN=`pwd | sed 's,^.*/,,'`
rm -rf $P rm -rf $P
pkg clone $P $PKG clone $P
cd $P cd $P
[ -z "$CENTOS" ] && pkg switch-branch $BRN $PKG switch-branch $BRN
if [ $BRN != stream-container-tools-rhel8 ]; then if [ $BRN != stream-container-tools-rhel8 ]; then
pkg prep $PKG prep
else else
pkg --release rhel-8 prep $PKG --release rhel-8 prep
fi fi
DIR=`ls -d -- */ | grep -v ^tests | head -n1` DIR=`ls -d -- */ | grep "^$P"`
grep github.com/containers/image $DIR/go.mod | cut -d\ -f2 | sed 's,-.*,,'>> /tmp/ver_image grep github.com/containers/image $DIR/go.mod | cut -d\ -f2 | sed 's,-.*,,'>> /tmp/ver_image
grep github.com/containers/common $DIR/go.mod | cut -d\ -f2 | sed 's,-.*,,' >> /tmp/ver_common grep github.com/containers/common $DIR/go.mod | cut -d\ -f2 | sed 's,-.*,,' >> /tmp/ver_common
grep github.com/containers/storage $DIR/go.mod | cut -d\ -f2 | sed 's,-.*,,' >> /tmp/ver_storage grep github.com/containers/storage $DIR/go.mod | cut -d\ -f2 | sed 's,-.*,,' >> /tmp/ver_storage