import buildah-1.24.2-2.module+el8.6.0+14379+4ec2a99a
This commit is contained in:
parent
4eb0b05757
commit
8d68401d13
@ -1 +1 @@
|
|||||||
c92982bd8195174d24c0f80638be5375dff2babc SOURCES/release-1.23-87a0565.tar.gz
|
bfaa7b5c8d8169ed7a175c1edea673bca9dc184c SOURCES/buildah-1.24.2-ce608bc.tar.gz
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/release-1.23-87a0565.tar.gz
|
SOURCES/buildah-1.24.2-ce608bc.tar.gz
|
||||||
|
45
SOURCES/fix-bash-syntax.patch
Normal file
45
SOURCES/fix-bash-syntax.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
From eedab4fd872c3be8ab15af767897f92c78a71fde Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
|
||||||
|
Date: Mon, 21 Feb 2022 14:58:40 -0500
|
||||||
|
Subject: [PATCH] helpers.bash: Use correct syntax
|
||||||
|
|
||||||
|
Fixes gating test failure:
|
||||||
|
```
|
||||||
|
/usr/share/buildah/test/system/./helpers.bash: line 474: !is_cgroupsv2: command not found
|
||||||
|
```
|
||||||
|
|
||||||
|
Co-authored-by: Yiqiao Pu <ypu@redhat.com>
|
||||||
|
|
||||||
|
I'm just the committer.
|
||||||
|
|
||||||
|
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
|
||||||
|
---
|
||||||
|
tests/helpers.bash | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/helpers.bash b/tests/helpers.bash
|
||||||
|
index bd2794c974..3e72108bec 100644
|
||||||
|
--- a/tests/helpers.bash
|
||||||
|
+++ b/tests/helpers.bash
|
||||||
|
@@ -433,9 +433,9 @@ function skip_if_rootless() {
|
||||||
|
##################################
|
||||||
|
function skip_if_rootless_and_cgroupv1() {
|
||||||
|
if test "$BUILDAH_ISOLATION" = "rootless"; then
|
||||||
|
- if !is_cgroupsv2; then
|
||||||
|
- skip "${1:-test does not work when \$BUILDAH_ISOLATION = rootless} and not cgroupv2"
|
||||||
|
- fi
|
||||||
|
+ if ! is_cgroupsv2; then
|
||||||
|
+ skip "${1:-test does not work when \$BUILDAH_ISOLATION = rootless} and not cgroupv2"
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -471,7 +471,7 @@ function skip_if_cgroupsv2() {
|
||||||
|
# skip_if_cgroupsv1 # Some tests don't work with cgroupsv1
|
||||||
|
#######################
|
||||||
|
function skip_if_cgroupsv1() {
|
||||||
|
- if !is_cgroupsv2; then
|
||||||
|
+ if ! is_cgroupsv2; then
|
||||||
|
skip "${1:-test does not work with cgroups v1}"
|
||||||
|
fi
|
||||||
|
}
|
@ -11,13 +11,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global import_path github.com/containers/buildah
|
%global import_path github.com/containers/buildah
|
||||||
%global branch release-1.23
|
#%%global branch main
|
||||||
%global commit0 87a05652193fe2ba7011ef400a1bea5a5cf092c4
|
%global commit0 ce608bcecdeb077daab846c83b026c508cff9688
|
||||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||||
|
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Name: buildah
|
Name: buildah
|
||||||
Version: 1.23.1
|
Version: 1.24.2
|
||||||
Release: 2%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A command line tool used for creating OCI Images
|
Summary: A command line tool used for creating OCI Images
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -29,6 +29,7 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar
|
|||||||
%else
|
%else
|
||||||
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
|
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
|
||||||
%endif
|
%endif
|
||||||
|
Patch0: fix-bash-syntax.patch
|
||||||
BuildRequires: golang >= 1.16.6
|
BuildRequires: golang >= 1.16.6
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
@ -128,6 +129,33 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
|
|||||||
%{_datadir}/%{name}/test
|
%{_datadir}/%{name}/test
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.24.2-2
|
||||||
|
- Add patch to fix bash symtax for gating tests
|
||||||
|
- Upstream PR: https://github.com/containers/buildah/pull/3792
|
||||||
|
- Related: #2001445
|
||||||
|
|
||||||
|
* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.24.2-1
|
||||||
|
- update to https://github.com/containers/buildah/releases/tag/v1.24.2
|
||||||
|
- Related: #2001445
|
||||||
|
|
||||||
|
* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.24.1-1
|
||||||
|
- update to https://github.com/containers/buildah/releases/tag/v1.24.1
|
||||||
|
- Related: #2001445
|
||||||
|
|
||||||
|
* Wed Feb 02 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.24.0-1
|
||||||
|
- update to https://github.com/containers/buildah/releases/tag/v1.24.0
|
||||||
|
- Related: #2001445
|
||||||
|
|
||||||
|
* Tue Jan 25 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.23.2-1
|
||||||
|
- update to the latest content of https://github.com/containers/buildah/tree/release-1.23
|
||||||
|
(https://github.com/containers/buildah/commit/83a66a7)
|
||||||
|
- Related: #2001445
|
||||||
|
|
||||||
|
* Mon Nov 22 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.23.1-3
|
||||||
|
- update to the latest content of https://github.com/containers/buildah/tree/release-1.23
|
||||||
|
(https://github.com/containers/buildah/commit/867c1bc)
|
||||||
|
- Related: #2001445
|
||||||
|
|
||||||
* Mon Oct 18 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.23.1-2
|
* Mon Oct 18 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.23.1-2
|
||||||
- respect Epoch in subpackage dependencies
|
- respect Epoch in subpackage dependencies
|
||||||
- Related: #2001445
|
- Related: #2001445
|
||||||
|
Loading…
Reference in New Issue
Block a user