From a65b80a3eefc285b0f9d7282eb69af45236834dc Mon Sep 17 00:00:00 2001 From: imagebuilder-bot Date: Fri, 6 Feb 2026 18:57:40 +0000 Subject: [PATCH] Update to 172 Resolves: RHEL-111406 --- .gitignore | 2 ++ osbuild.spec | 28 ++++++++++++++++++++++++++-- sources | 3 ++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eeeac92..846462d 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,5 @@ /osbuild-163.tar.gz /osbuild-164.tar.gz /osbuild-167.tar.gz +/osbuild-172.tar.gz +/osbuild-initrd-0.1.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 96f7e71..29532dd 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,12 +1,14 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 167 +Version: 172 +%global osbuild_initrd_version 0.1 %forgemeta %global pypi_name osbuild %global pkgdir %{_prefix}/lib/%{pypi_name} +%global debug_package %{nil} Name: %{pypi_name} Release: 1%{?dist} @@ -15,9 +17,14 @@ License: Apache-2.0 URL: %{forgeurl} Source0: %{forgesource} -BuildArch: noarch +Source1: https://github.com/osbuild/initrd/releases/download/%{osbuild_initrd_version}/osbuild-initrd-%{osbuild_initrd_version}.tar.gz Summary: A build system for OS images +# There is no golang support for i686 on centos and RHEL +%if 0%{?rhel} || 0%{?centos} +ExcludeArch: i686 +%endif + BuildRequires: make BuildRequires: python3-devel BuildRequires: python3-docutils @@ -52,6 +59,7 @@ Requires: util-linux Requires: python3-%{pypi_name} = %{version}-%{release} Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) Requires: python3-librepo +Requires: %{name}-initrd = %{version}-%{release} # This is required for `osbuild`, for RHEL-10 and above # the stdlib tomllib module can be used instead @@ -118,6 +126,13 @@ Requires: rpm-ostree Contains the necessary stages, assembler and source to build OSTree based images. +%package initrd +Summary: osbuild initrd for vm support +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} + +%description initrd +Osbuild initrd used for in-vm support. + %package selinux Summary: SELinux policies Requires: %{name} = %{version}-%{release} @@ -199,10 +214,12 @@ Contains depsolving capabilities for package managers. %prep %forgeautosetup -p1 +tar xf %SOURCE1 %build %py3_build make man +(cd osbuild-initrd-%{osbuild_initrd_version}; make build) # SELinux make -f /usr/share/selinux/devel/Makefile osbuild.pp @@ -216,6 +233,7 @@ bzip2 -9 osbuild-container.pp %install %py3_install +(cd osbuild-initrd-%{osbuild_initrd_version}; %make_install) # Ensure vm.py is executable which is needed to run in with init= in the vm chmod 0755 %{buildroot}%{python3_sitelib}/%{pypi_name}/vm.py @@ -336,6 +354,9 @@ ignore="$ignore --ignore tools/test/test_depsolve.py" %{python3_sitelib}/%{pypi_name}-*.egg-info/ %{python3_sitelib}/%{pypi_name}/ +%files initrd +%{pkgdir}/initrd + %files lvm2 %{pkgdir}/devices/org.osbuild.lvm2* %{pkgdir}/stages/org.osbuild.lvm2* @@ -392,6 +413,9 @@ fi %{pkgdir}/solver.json %changelog +* Fri Feb 06 2026 imagebuilder-bot - 172-1 +- New upstream release + * Wed Dec 17 2025 imagebuilder-bot - 167-1 - New upstream release diff --git a/sources b/sources index d6f006d..afddb51 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (osbuild-167.tar.gz) = 635e44b187d9be550107bc7ab58d32c874cedf4e0c5bac4291859df9abc0c7dff6dad175eccd984d5a2c560b3df2dba94df440535095b9e290232eb1ccc2a394 +SHA512 (osbuild-172.tar.gz) = 0227a71cb12379f5cf8b3740b71c61758d0bdcc43df7b0af851ccd0428275bbe773d722426141b0b194a232ec9b7542f4796f68e06387140d47f0188a36394b6 +SHA512 (osbuild-initrd-0.1.tar.gz) = af8fd6b3b84f4f0ffca9847d8cef49322d75a03fc60743c8bf697a21df019666778e826bc0a8e9f5faca59151bf91f12d65d2a5e820ca9d0bd840ff92d33054a