pastalian/osbuild-composer
1
0
Fork 0
forked from rpms/osbuild-composer
Code Pull Requests Activity

Merge branch 'c9' into a9

Browse Source
This commit is contained in:
eabdullin 2023-05-10 19:52:30 +03:00
commit bd9152cc49
3 changed files with 6619 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1499
SOURCES/0004-simplified-installer-enable-isolinux.patch Normal file
View File

File diff suppressed because it is too large Load Diff

5104
SOURCES/0005-Save-manifest-lists-when-pulling-containers-Set-container-local-names-explicitly.patch Normal file
View File

File diff suppressed because it is too large Load Diff

22
SPECS/osbuild-composer.spec
View File

@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
} }
Name: osbuild-composer Name: osbuild-composer
Release: 2%{?dist}.alma Release: 2%{?dist}.2.alma
Summary: An image building service based on osbuild Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images # osbuild-composer doesn't have support for building i686 and armv7hl images
@ -44,6 +44,10 @@ Patch0: 0001-tests-ostree-Change-centos-8-BOOT_LOCATION-to-a-work.patch
Patch1: 0002-distro-rhel-add-payload-repos-to-os-package-set.patch Patch1: 0002-distro-rhel-add-payload-repos-to-os-package-set.patch
# https://github.com/osbuild/osbuild-composer/pull/3348 # https://github.com/osbuild/osbuild-composer/pull/3348
Patch2: 0003-Manifest-always-set-kernel-options-in-grub2-stage.patch Patch2: 0003-Manifest-always-set-kernel-options-in-grub2-stage.patch
# https://github.com/osbuild/osbuild-composer/pull/3410
Patch3: 0004-simplified-installer-enable-isolinux.patch
# https://github.com/osbuild/osbuild-composer/pull/3411
Patch4: 0005-Save-manifest-lists-when-pulling-containers-Set-container-local-names-explicitly.patch
# AlmaLinux patch # AlmaLinux patch
Patch100: almalinux_support.patch Patch100: almalinux_support.patch
@ -292,10 +296,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer Summary: The worker for osbuild-composer
Requires: systemd Requires: systemd
Requires: qemu-img Requires: qemu-img
Requires: osbuild >= 81 Requires: osbuild >= 81-1.el9_2.1
Requires: osbuild-ostree >= 81 Requires: osbuild-ostree >= 81-1.el9_2.1
Requires: osbuild-lvm2 >= 81 Requires: osbuild-lvm2 >= 81-1.el9_2.1
Requires: osbuild-luks2 >= 81 Requires: osbuild-luks2 >= 81-1.el9_2.1
Requires: %{name}-dnf-json = %{version}-%{release} Requires: %{name}-dnf-json = %{version}-%{release}
%description worker %description worker
@ -414,9 +418,15 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif %endif
%changelog %changelog
* Tue May 09 2023 Eduard Abdullin <eabdullin@almalinux.org> - 76-2.alma * Tue May 09 2023 Eduard Abdullin <eabdullin@almalinux.org> - 76-2.2.alma
- Add AlmaLinux support - Add AlmaLinux support
* Tue Apr 25 2023 Achilleas Koutsou <achilleas@redhat.com> - 76-2.2
- Save manifest lists when pulling containers & Set container local names explicitly (rhbz#2189400)
* Tue Apr 25 2023 Tomáš Hozza <thozza@redhat.com> - 76-2.1
- simplified-installer: enable isolinux (rhbz#2178130)
* Mon Mar 27 2023 Tomáš Hozza <thozza@redhat.com> - 76-2 * Mon Mar 27 2023 Tomáš Hozza <thozza@redhat.com> - 76-2
- distro/rhel: add payload repos to os package set (rhbz#2177699) - distro/rhel: add payload repos to os package set (rhbz#2177699)
- Manifest: always set kernel options in grub2 stage (rhbz#2162299) - Manifest: always set kernel options in grub2 stage (rhbz#2162299)