From 632aab4e08e8a0e4778eab153c4303107b440b0a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 17 Sep 2021 17:44:28 +0000 Subject: [PATCH] import osbuild-composer-33.1-1.el8 --- .gitignore | 2 +- .osbuild-composer.metadata | 2 +- ...-test-rhel85-qcow2-custom-regenerate.patch | 181 ------------------ SPECS/osbuild-composer.spec | 39 +++- 4 files changed, 38 insertions(+), 186 deletions(-) delete mode 100644 SOURCES/0001-test-rhel85-qcow2-custom-regenerate.patch diff --git a/.gitignore b/.gitignore index f3ac690..429695b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-33.tar.gz +SOURCES/osbuild-composer-33.1.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 499b3b9..ee12909 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -18bdc85004f4f5bb687ce6c39fb9560897e659ff SOURCES/osbuild-composer-33.tar.gz +d5fe574d23bc5ef95e85dc6fdf6cb7bad38a5b99 SOURCES/osbuild-composer-33.1.tar.gz diff --git a/SOURCES/0001-test-rhel85-qcow2-custom-regenerate.patch b/SOURCES/0001-test-rhel85-qcow2-custom-regenerate.patch deleted file mode 100644 index f99d52a..0000000 --- a/SOURCES/0001-test-rhel85-qcow2-custom-regenerate.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 7c635fc6b0a45e1d54bea9caaaf4ba82447cfe3f Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Sun, 29 Aug 2021 14:59:24 +0000 -Subject: [PATCH] test/rhel85/qcow2/custom: regenerate - -Signed-off-by: Tom Gundersen ---- - .../rhel_85-x86_64-qcow2-customize.json | 64 +++++++++++-------- - 1 file changed, 39 insertions(+), 25 deletions(-) - -diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-customize.json b/test/data/manifests/rhel_85-x86_64-qcow2-customize.json -index 18524628..c1e1632a 100644 ---- a/test/data/manifests/rhel_85-x86_64-qcow2-customize.json -+++ b/test/data/manifests/rhel_85-x86_64-qcow2-customize.json -@@ -100,17 +100,17 @@ - ] - }, - "filesystem": [ -- { -- "mountpoint": "/", -- "minsize": 131072000 -- }, - { - "mountpoint": "/usr", - "minsize": 2147483648 - }, - { - "mountpoint": "/var", -- "minsize": 131072000 -+ "minsize": 1073741824 -+ }, -+ { -+ "mountpoint": "/", -+ "minsize": 2147483648 - } - ] - } -@@ -477,6 +477,7 @@ - "sha256:53849d779914a944acc126459911030c8ac8310ffcab354c6a7bcc4ef4af5bab", - "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a", - "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb", -+ "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d", - "sha256:ee5595a39aa681b5d91f25d5e9415733ac47e92840af4baaaf6d2f802c78f212", - "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78", - "sha256:1291973fb1c479d3d3dab62d7dbcda052ab998779a0eb2e45427d0e2257d8db4", -@@ -1451,8 +1452,8 @@ - "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" - }, - { -- "size": 16312220, -- "start": 4659200, -+ "size": 14471068, -+ "start": 6500352, - "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" - }, -@@ -1463,7 +1464,7 @@ - "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" - }, - { -- "size": 256000, -+ "size": 2097152, - "start": 4403200, - "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "a178892e-e285-4ce1-9114-55780875d64e" -@@ -1506,8 +1507,8 @@ - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", -- "start": 4659200, -- "size": 16312220 -+ "start": 6500352, -+ "size": 14471068 - } - } - } -@@ -1539,7 +1540,7 @@ - "options": { - "filename": "disk.img", - "start": 4403200, -- "size": 256000 -+ "size": 2097152 - } - } - } -@@ -1576,8 +1577,8 @@ - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", -- "start": 4659200, -- "size": 16312220 -+ "start": 6500352, -+ "size": 14471068 - } - }, - "usr": { -@@ -1593,7 +1594,7 @@ - "options": { - "filename": "disk.img", - "start": 4403200, -- "size": 256000 -+ "size": 2097152 - } - } - }, -@@ -2921,6 +2922,9 @@ - "sha256:d50174632033170dfd1d8125f132962872c0042711e44ed59e91f6d2d26071c0": { - "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/polkit-libs-0.115-12.el8.x86_64.rpm" - }, -+ "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": { -+ "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/efibootmgr-16-1.el8.x86_64.rpm" -+ }, - "sha256:d570af0578f5b2c6225f1f2354404f65bccf91c3974e98dcbc0c7b55a61b9b46": { - "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/grep-3.1-6.el8.x86_64.rpm" - }, -@@ -9354,6 +9358,15 @@ - "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/efi-filesystem-3-3.el8.noarch.rpm", - "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb" - }, -+ { -+ "name": "efibootmgr", -+ "epoch": 0, -+ "version": "16", -+ "release": "1.el8", -+ "arch": "x86_64", -+ "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/efibootmgr-16-1.el8.x86_64.rpm", -+ "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d" -+ }, - { - "name": "efivar", - "epoch": 0, -@@ -13168,6 +13181,7 @@ - "e2fsprogs-1.45.6-2.el8.x86_64", - "e2fsprogs-libs-1.45.6-2.el8.x86_64", - "efi-filesystem-3-3.el8.noarch", -+ "efibootmgr-16-1.el8.x86_64", - "efivar-37-4.el8.x86_64", - "efivar-libs-37-4.el8.x86_64", - "elfutils-debuginfod-client-0.185-1.el8.x86_64", -@@ -13603,6 +13617,16 @@ - "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "uuid": "7B77-95E7" - }, -+ { -+ "bootable": false, -+ "fstype": "xfs", -+ "label": "root", -+ "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", -+ "size": 7409186816, -+ "start": 3328180224, -+ "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", -+ "uuid": "e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1" -+ }, - { - "bootable": false, - "fstype": "xfs", -@@ -13618,20 +13642,10 @@ - "fstype": "xfs", - "label": null, - "partuuid": "A178892E-E285-4CE1-9114-55780875D64E", -- "size": 131072000, -+ "size": 1073741824, - "start": 2254438400, - "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4" -- }, -- { -- "bootable": false, -- "fstype": "xfs", -- "label": "root", -- "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", -- "size": 8351856640, -- "start": 2385510400, -- "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", -- "uuid": "e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1" - } - ], - "passwd": [ --- -2.31.1 - diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 1a70302..c40d254 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 33 +Version: 33.1 %gometa @@ -28,7 +28,7 @@ ExcludeArch: i686 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -Patch0: 0001-test-rhel85-qcow2-custom-regenerate.patch + BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: systemd @@ -155,8 +155,38 @@ install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_l install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/ +# Only include repositories for the distribution and release install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories -install -m 0644 -vp repositories/* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +# CentOS also defines rhel so we check for centos first +%if 0%{?centos} + +# CentOS 9 supports building for CentOS 8 and later +%if 0%{?centos} >= 9 +install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +%else +# CentOS 8 only supports building for CentOS 8 +install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ + +%endif +%else +%if 0%{?rhel} +# RHEL 9 supports building for RHEL 8 and later +%if 0%{?rhel} >= 9 +install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ + +%else +# RHEL 8 only supports building for 8 +install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ + +%endif +%endif +%endif + +# Fedora can build for all included fedora releases +%if 0%{?fedora} +install -m 0644 -vp repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +%endif install -m 0755 -vd %{buildroot}%{_unitdir} install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/ @@ -376,6 +406,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Sep 15 2021 Ondřej Budai - 33.1-1 +- New upstream release + * Mon Aug 30 2021 Tom Gundersen - 33-1 - New upstream release