elektrowolle/osbuild-composer
1
0
Fork 0
forked from rpms/osbuild-composer
Code Issues Pull Requests Releases Activity

import osbuild-composer-68-1.el8

Browse Source
This commit is contained in:
CentOS Sources 2022-11-18 04:11:00 +00:00 committed by Stepan Oksanichenko
parent f70f459c03
commit cff0bbb8ca
4 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/osbuild-composer-67.tar.gz
SOURCES/osbuild-composer-68.tar.gz

2
.osbuild-composer.metadata
View File

@ -1 +1 @@
f69958ce00b7640e4ff730648dff7e790898c7f2 SOURCES/osbuild-composer-67.tar.gz
da3dd4a5b7d18798d926b4bb1e1d627f6069f14a SOURCES/osbuild-composer-68.tar.gz

38
SOURCES/tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch
View File

@ -1,38 +0,0 @@
From 1e5a7526369ec0bfd4bd5c536ff16f534f023fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
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 <thozza@redhat.com>
---
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

7
SPECS/osbuild-composer.spec
View File

@ -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 <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
- New upstream release
* Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
- New upstream release