From 4ce0548ea80e4dd51d3cf4d4f1f5a37eb140ae9c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 18 Nov 2022 04:11:32 +0000 Subject: [PATCH] Auto sync2gitlab import of osbuild-composer-68-1.el8.src.rpm --- .gitignore | 1 + osbuild-composer.spec | 7 ++-- sources | 2 +- ...sh-copy-RHEL-repo-overrides-using-wi.patch | 38 ------------------- 4 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch diff --git a/.gitignore b/.gitignore index 88a87f3..496b402 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /osbuild-composer-60.tar.gz /osbuild-composer-62.tar.gz /osbuild-composer-67.tar.gz +/osbuild-composer-68.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index f4413ba..bac5d9d 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 67 +Version: 68 %gometa @@ -33,8 +33,6 @@ License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -# https://github.com/osbuild/osbuild-composer/pull/3111 -Patch0: tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: systemd @@ -429,6 +427,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Nov 16 2022 imagebuilder-bot - 68-1 +- New upstream release + * Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com - 67-1 - New upstream release diff --git a/sources b/sources index 766a286..0b90e93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-67.tar.gz) = ca3e0c7cdb92a547108391c45f24c01b22f2eede54cd087eb020651a2122666109f18f8c16790020a23465a5e68b07ca8acef037a5e1472cea5b03bc756dc472 +SHA512 (osbuild-composer-68.tar.gz) = 95a0eaeecf14785414467ae09f2f63ce383742fe72881e4874c3d6dabf2f549e6ea21626bb284d40650c55e8867fcc03edb96c3e7f1fc0c3b558f926f9e9a890 diff --git a/tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch b/tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch deleted file mode 100644 index a0127a2..0000000 --- a/tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1e5a7526369ec0bfd4bd5c536ff16f534f023fd5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= -Date: Wed, 2 Nov 2022 12:18:46 +0100 -Subject: [PATCH] tools/provision.sh: copy RHEL repo overrides using wildcard -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Don't list specific RHEL repos which should be copied over to the repo -overrides directory, but instead copy all of them, similar to how it's -done for Fedora and CentOS Stream. This is less error prone when support -for a new RHEL release is added to composer. - -Signed-off-by: Tomáš Hozza ---- - tools/provision.sh | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/tools/provision.sh b/tools/provision.sh -index 93f8cccbd..09265f907 100755 ---- a/tools/provision.sh -+++ b/tools/provision.sh -@@ -140,11 +140,7 @@ else # AUTH_METHOD_NONE - # Copy all fedora repo overrides - sudo cp -a /usr/share/tests/osbuild-composer/repositories/{fedora,centos}-*.json "$REPODIR" - # Copy RHEL point release repos -- sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-85.json "$REPODIR" -- sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-86.json "$REPODIR" -- sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-87.json "$REPODIR" -- sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-90.json "$REPODIR" -- sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-91.json "$REPODIR" -+ sudo cp -a /usr/share/tests/osbuild-composer/repositories/rhel-*.json "$REPODIR" - - # override source repositories to consume content from the nightly compose - if [ "${NIGHTLY:=false}" == "true" ]; then --- -2.37.3 -