diff --git a/.gitignore b/.gitignore index 3cb8154..f6a3a77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/release-1.28-7e4d9dd.tar.gz -/release-1.28-7e4d9dd.tar.gz +/*.tar.gz diff --git a/buildah.spec b/buildah.spec index 5b3f334..f90f960 100644 --- a/buildah.spec +++ b/buildah.spec @@ -11,13 +11,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %endif %global import_path github.com/containers/buildah -%global branch release-1.28 -%global commit0 7e4d9dd3a92fe092d118892d8667cc496711cd10 +%global branch release-1.29 +%global commit0 7fa17a8428727eb3ecaca088bda1ebec590eeb8c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: buildah -Version: 1.28.2 +Version: 1.29.1 Release: 2%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -135,6 +135,11 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog +* Wed Mar 08 2023 Jindrich Novy - 1:1.29.1-2 +- update to the latest content of https://github.com/containers/buildah/tree/release-1.29 + (https://github.com/containers/buildah/commit/7fa17a8) +- Related: #2176055 + * Tue Dec 06 2022 Jindrich Novy - 1:1.28.2-2 - update to the latest content of https://github.com/containers/buildah/tree/release-1.28 (https://github.com/containers/buildah/commit/7e4d9dd) diff --git a/fix-bash-syntax.patch b/fix-bash-syntax.patch deleted file mode 100644 index e508848..0000000 --- a/fix-bash-syntax.patch +++ /dev/null @@ -1,45 +0,0 @@ -From eedab4fd872c3be8ab15af767897f92c78a71fde Mon Sep 17 00:00:00 2001 -From: Lokesh Mandvekar -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 - -I'm just the committer. - -Signed-off-by: Lokesh Mandvekar ---- - 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 - } diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index e49fcf1..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# recipients: jnovy, lsm5, santiago ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/sources b/sources index c7b62a2..fa1ab6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (release-1.28-7e4d9dd.tar.gz) = 02a60cbddf6c7c80aa8f9691ac83a0d88bb9a63bc099d267d299110e038011ce22005c1c50c536b4ad7265489ad0f63e691688aec2c4693692b8a1a94a25c227 +SHA512 (release-1.29-7fa17a8.tar.gz) = fced9552999b59695ffde6188b0140eb5dd3fdd45403dd1f0e3526098229fb0a9695fdc33f7b0d9459b473d58604e9c59ca5b460f5b04bca02f3e2cc361dcd23