Update to 172
Resolves: RHEL-111405
This commit is contained in:
imagebuilder-bot
parent
f5a27949e4
commit
eff9a2f74b
2
.gitignore
vendored
2
.gitignore
vendored
@ -126,3 +126,5 @@
|
||||
/osbuild-162.tar.gz
|
||||
/osbuild-163.tar.gz
|
||||
/osbuild-164.tar.gz
|
||||
/osbuild-172.tar.gz
|
||||
/osbuild-initrd-0.1.tar.gz
|
||||
|
||||
38
osbuild.spec
38
osbuild.spec
@ -1,12 +1,14 @@
|
||||
%global forgeurl https://github.com/osbuild/osbuild
|
||||
%global selinuxtype targeted
|
||||
|
||||
Version: 164
|
||||
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}
|
||||
@ -191,9 +206,7 @@ Recommends: python3-license-expression
|
||||
# supports this since 116
|
||||
Conflicts: osbuild-composer <= 115
|
||||
|
||||
# This version needs to get bumped every time the osbuild-dnf-json
|
||||
# version changes in an incompatible way. Packages like osbuild-composer
|
||||
# can depend on the exact API version this way
|
||||
# XXX: remove this once the osbuild-dnf-json V1 API is removed (osbuild/solver/api/v1.py)
|
||||
Provides: osbuild-dnf-json-api = 8
|
||||
|
||||
%description depsolve-dnf
|
||||
@ -201,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
|
||||
@ -218,6 +233,10 @@ 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
|
||||
|
||||
mkdir -p %{buildroot}%{pkgdir}/stages
|
||||
install -p -m 0755 $(find stages -type f -not -name "test_*.py") %{buildroot}%{pkgdir}/stages/
|
||||
@ -294,10 +313,11 @@ install -p -m 0644 tools/solver-dnf.json %{buildroot}%{pkgdir}/solver.json
|
||||
# but that's an acceptable tradeoff.
|
||||
# x86_64-specific tests:
|
||||
# test/mod/test_util_sbom_spdx.py, test/mod/test_util_sbom_dnf.py, test/mod/test_testutil_dnf4.py
|
||||
# test/mod/test_solver_implementations.py
|
||||
# test_ioctl_toggle_immutable and test_rmtree_immutable fail on s390x
|
||||
# test_cache_full_behavior fails on ppc64le
|
||||
# tools/test/test_depsolve.py fails on C9S and EPEL9
|
||||
ignore="--ignore test/mod/test_util_sbom_spdx.py --ignore test/mod/test_util_sbom_dnf.py --ignore test/mod/test_testutil_dnf4.py"
|
||||
ignore="--ignore test/mod/test_util_sbom_spdx.py --ignore test/mod/test_util_sbom_dnf.py --ignore test/mod/test_testutil_dnf4.py --ignore test/mod/test_solver_implementations.py"
|
||||
skip="not test_ioctl_toggle_immutable and not test_rmtree_immutable and not test_cache_full_behavior"
|
||||
%if 0%{?rhel}
|
||||
ignore="$ignore --ignore tools/test/test_depsolve.py"
|
||||
@ -334,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*
|
||||
@ -390,6 +413,9 @@ fi
|
||||
%{pkgdir}/solver.json
|
||||
|
||||
%changelog
|
||||
* Fri Feb 06 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 172-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Nov 05 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 164-1
|
||||
- New upstream release
|
||||
|
||||
|
||||
3
sources
3
sources
@ -1 +1,2 @@
|
||||
SHA512 (osbuild-164.tar.gz) = d48c567767a1d5e3bb6b02bf61eb898c8bc3a420637c2d02159e8f2059f146d54141d72766dc0265a639af162be2e8983679e249b70881ba7d08a601629b7de0
|
||||
SHA512 (osbuild-172.tar.gz) = 0227a71cb12379f5cf8b3740b71c61758d0bdcc43df7b0af851ccd0428275bbe773d722426141b0b194a232ec9b7542f4796f68e06387140d47f0188a36394b6
|
||||
SHA512 (osbuild-initrd-0.1.tar.gz) = af8fd6b3b84f4f0ffca9847d8cef49322d75a03fc60743c8bf697a21df019666778e826bc0a8e9f5faca59151bf91f12d65d2a5e820ca9d0bd840ff92d33054a
|
||||
|
||||
Loading…
Reference in New Issue
Block a user