rpms
/
osbuild-composer
8
0
Fork 1
Code Issues Pull Requests Releases Activity

import osbuild-composer-76-2.el9_2

This commit is contained in:
CentOS Sources 2023-05-09 05:20:17 +00:00 committed by Stepan Oksanichenko
parent be74389a30
commit 8e00ea3101
6 changed files with 6598 additions and 28 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-62.1.tar.gz
SOURCES/osbuild-composer-76.tar.gz

2
.osbuild-composer.metadata
View File

@ -1 +1 @@
520bf4f4c08543615d5bcf64ab067845b71cfee8 SOURCES/osbuild-composer-62.1.tar.gz
f68a24e9d6a407708e33d72240b140e9c60378f1 SOURCES/osbuild-composer-76.tar.gz

83
SOURCES/0001-tests-ostree-Change-centos-8-BOOT_LOCATION-to-a-work.patch Normal file
View File

@ -0,0 +1,83 @@
From 30f4b0753691841e232701a3ad17f018e8799ebe Mon Sep 17 00:00:00 2001
From: Jakub Rusz <jrusz@redhat.com>
Date: Mon, 20 Mar 2023 15:29:42 +0100
Subject: [PATCH 1/3] tests/ostree: Change centos-8 BOOT_LOCATION to a working
boot.iso
The latest boot.iso stopped working. Changing to an older version to
unblock CI. RHBZ#2180024 opened with this issue.
---
test/cases/ostree-rebase-bios.sh | 4 ++--
test/cases/ostree-rebase-uefi.sh | 4 ++--
test/cases/ostree.sh | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/cases/ostree-rebase-bios.sh b/test/cases/ostree-rebase-bios.sh
index 702b506c8..7390c2a0e 100755
--- a/test/cases/ostree-rebase-bios.sh
+++ b/test/cases/ostree-rebase-bios.sh
@@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in
"centos-8")
OSTREE_REF="centos/8/${ARCH}/edge"
OS_VARIANT="centos8"
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
PARENT_REF="centos/8/${ARCH}/edge"
KERNEL_RT_PKG="kernel-rt-core"
;;
@@ -356,7 +356,7 @@ echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
STOPHERE
# Get the boot.iso from BOOT_LOCATION
-curl -O "$BOOT_LOCATION"/images/boot.iso
+curl -O "$BOOT_LOCATION"images/boot.iso
sudo mv boot.iso /var/lib/libvirt/images
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
diff --git a/test/cases/ostree-rebase-uefi.sh b/test/cases/ostree-rebase-uefi.sh
index c0697f543..7c3fd7721 100755
--- a/test/cases/ostree-rebase-uefi.sh
+++ b/test/cases/ostree-rebase-uefi.sh
@@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in
"centos-8")
OSTREE_REF="centos/8/${ARCH}/edge"
OS_VARIANT="centos8"
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
PARENT_REF="centos/8/${ARCH}/edge"
KERNEL_RT_PKG="kernel-rt-core"
;;
@@ -358,7 +358,7 @@ LIBVIRT_IMAGE_PATH=/var/lib/libvirt/images/${IMAGE_KEY}-uefi.qcow2
sudo qemu-img create -f qcow2 "${LIBVIRT_IMAGE_PATH}" 20G
# Get the boot.iso from BOOT_LOCATION
-curl -O "$BOOT_LOCATION"/images/boot.iso
+curl -O "$BOOT_LOCATION"images/boot.iso
sudo mv boot.iso /var/lib/libvirt/images
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index f2841d953..0cfe6d02a 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -104,7 +104,7 @@ case "${ID}-${VERSION_ID}" in
OSTREE_REF="centos/8/${ARCH}/edge"
OS_VARIANT="centos8"
USER_IN_COMMIT="true"
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
EMBEDED_CONTAINER="true"
FIREWALL_FEATURE="false"
DIRS_FILES_CUSTOMIZATION="true"
@@ -486,7 +486,7 @@ if [[ "${USER_IN_COMMIT}" == "true" ]]; then
fi
# Get the boot.iso from BOOT_LOCATION
-curl -O "$BOOT_LOCATION"/images/boot.iso
+curl -O "$BOOT_LOCATION"images/boot.iso
sudo mv boot.iso /var/lib/libvirt/images
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
--
2.39.2

3803
SOURCES/0002-distro-rhel-add-payload-repos-to-os-package-set.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2655
SOURCES/0003-Manifest-always-set-kernel-options-in-grub2-stage.patch Normal file
View File

File diff suppressed because it is too large Load Diff

81
SPECS/osbuild-composer.spec
View File

@ -9,7 +9,7 @@
%global goipath github.com/osbuild/osbuild-composer
Version: 62.1
Version: 76
%gometa
@ -22,17 +22,28 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 3%{?dist}
Release: 2%{?dist}
Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images
ExcludeArch: i686 armv7hl
# Upstream license specification: Apache-2.0
License: ASL 2.0
License: Apache-2.0
URL: %{gourl}
Source0: %{gosource}
# Patches were generated from the upstream 'rhel-9.2.0' branch:
# git clone https://github.com/osbuild/osbuild-composer.git
# cd osbuild-composer/
# git checkout rhel-9.2.0
# git format-patch HEAD...v76
#
# https://github.com/osbuild/osbuild-composer/pull/3349
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
# https://github.com/osbuild/osbuild-composer/pull/3348
Patch2: 0003-Manifest-always-set-kernel-options-in-grub2-stage.patch
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: systemd
@ -56,17 +67,6 @@ Requires: systemd
Provides: weldr
%if 0%{?rhel}
Obsoletes: lorax-composer <= 29
Conflicts: lorax-composer
%endif
# Remove when we stop releasing into Fedora 35
%if 0%{?fedora} >= 34
# lorax 34.3 is the first one without the composer subpackage
Obsoletes: lorax-composer < 34.3
%endif
%description
%{common_description}
@ -306,10 +306,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer
Requires: systemd
Requires: qemu-img
Requires: osbuild >= 63
Requires: osbuild-ostree >= 63
Requires: osbuild-lvm2 >= 63
Requires: osbuild-luks2 >= 63
Requires: osbuild >= 81
Requires: osbuild-ostree >= 81
Requires: osbuild-lvm2 >= 81
Requires: osbuild-luks2 >= 81
Requires: %{name}-dnf-json = %{version}-%{release}
%description worker
@ -326,8 +326,9 @@ The worker for osbuild-composer
%preun worker
# systemd_preun uses systemctl disable --now which doesn't work well with template services.
# See https://github.com/systemd/systemd/issues/15620
# The following lines mimicks its behaviour by running two commands:
if [ -d /run/systemd/system ]; then
# The following lines mimicks its behaviour by running two commands.
# The scriptlet is supposed to run only when the package is being removed.
if [ $1 -eq 0 ] && [ -d /run/systemd/system ]; then
# disable and stop all the worker services
systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service
systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
@ -341,7 +342,7 @@ fi
Summary: The dnf-json binary used by osbuild-composer and the workers
# Conflicts with older versions of composer that provide the same files
# this can be removed when RHEL 8 and Fedora 35 reach EOL
# this can be removed when RHEL 8 reaches EOL
Conflicts: osbuild-composer <= 35
%description dnf-json
@ -427,13 +428,41 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Tue Oct 25 2022 Tomáš Hozza <thozza@redhat.com> - 62.1-3
- Fix ownership of the dnf-json rpmmd files on upgrade (#2136533)
* Mon Mar 27 2023 Tomáš Hozza <thozza@redhat.com> - 76-2
- distro/rhel: add payload repos to os package set (rhbz#2177699)
- Manifest: always set kernel options in grub2 stage (rhbz#2162299)
* Fri Oct 21 2022 Tomáš Hozza <thozza@redhat.com> - 62.1-2
- Fix ownership of the dnf-json rpmmd files on upgrade (#2136533)
* Wed Mar 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 76-1
- New upstream release
* Fri Sep 16 2022 Achilleas Koutsou <achilleas@redhat.com> - 62.1-1
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
- New upstream release
* Wed Feb 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 74-1
- New upstream release
* Wed Jan 25 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 73-1
- New upstream release
* Wed Jan 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 72-1
- New upstream release
* Wed Dec 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 71-1
- New upstream release
* Wed Dec 14 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 70-1
- New upstream release
* Wed Nov 30 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 69-1
- New upstream release
* Wed Nov 16 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
- New upstream release
* Thu Nov 03 2022 Tomas Hozza <thozza@redhat.com> - 67-2
- Fix functional tests to make them pass in RHEL-9.2 gating
* Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
- New upstream release
* Mon Aug 29 2022 Ondřej Budai <ondrej@budai.cz> - 62-1