.gitignore

@@ -1 +1,2 @@
-SOURCES/osbuild-110.tar.gz
+SOURCES/osbuild-174.tar.gz
+SOURCES/osbuild-initrd-0.1.tar.gz

.osbuild.metadata

@@ -0,0 +1,2 @@
+0aea3d6207eddb0e22a20f322e1fede14ecbd7f2 SOURCES/osbuild-174.tar.gz
+3d7fb002fdfc5311619f1981716bcf699e48159b SOURCES/osbuild-initrd-0.1.tar.gz

SPECS/osbuild.spec

@@ -1,12 +1,14 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        110
+Version:        174
+%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}.alma.1
@@ -15,19 +17,37 @@ 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
+BuildRequires:  python3-setuptools
 BuildRequires:  systemd
 
+# for tests
+BuildRequires:  python3-iniparse
+BuildRequires:  python3-jsonschema
+BuildRequires:  python3-kickstart
+BuildRequires:  python3-mako
+BuildRequires:  python3-PyYAML
+BuildRequires:  python3-pytest
+%if 0%{?fedora}
+BuildRequires:  python3-license-expression
+BuildRequires:  python3-pytest-xdist
+BuildRequires:  python3-tomli-w
+%endif
+
 Requires:       bash
 Requires:       bubblewrap
 Requires:       coreutils
 Requires:       curl
-Requires:       dnf
 Requires:       e2fsprogs
 Requires:       glibc
 Requires:       policycoreutils
@@ -38,10 +58,12 @@ Requires:       tar
 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 toml package can be used instead
+# the stdlib tomllib module can be used instead
-%if 0%{?rhel} < 10
+%if 0%{?rhel} && 0%{?rhel} < 10
 Requires:       python3-tomli
 %endif
 
@@ -104,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}
@@ -117,10 +146,25 @@ Contains the necessary SELinux policies that allows
 osbuild to use labels unknown to the host inside the
 containers it uses to build OS artifacts.
 
+%package        container-selinux
+Summary:        SELinux container policies
+Requires:       selinux-policy-%{selinuxtype}
+Requires:       container-selinux
+Requires(post): selinux-policy-%{selinuxtype}
+Requires(post): container-selinux
+BuildRequires:  selinux-policy-devel
+BuildRequires:  selinux-policy-devel
+%{?selinux_requires}
+
+%description    container-selinux
+Contains the necessary SELinux policies that allows
+running osbuild in a container.
+
 %package        tools
 Summary:        Extra tools and utilities
 Requires:       %{name} = %{version}-%{release}
 Requires:       python3-pyyaml
+Requires:       python3-dnf
 
 # These are required for `osbuild-dev`, only packaged for Fedora
 %if 0%{?fedora}
@@ -137,38 +181,63 @@ manifests and osbuild.
 Summary:        Dependency solving support for DNF
 Requires:       %{name} = %{version}-%{release}
 
-# Fedora 40 and later use libdnf5, RHEL and Fedora < 40 use libdnf
+# RHEL 11 and Fedora 41 and later use libdnf5, RHEL < 11 and Fedora < 41 use dnf
-%if 0%{?fedora} >= 40
+# On Fedora 41 however, we force dnf4 (and depend on python3-dnf) until dnf5 issues are resolved.
-Requires: python3-libdnf5 >= 5.1.1
+# See https://github.com/rpm-software-management/dnf5/issues/1748
+# and https://issues.redhat.com/browse/COMPOSER-2361
+%if 0%{?rhel} >= 11
+Requires: python3-libdnf5 >= 5.2.1
 %else
-Requires: python3-libdnf
+Requires: python3-dnf
 %endif
 
+%if 0%{?fedora}
+# RHEL / CS does not have python3-license-expression
+# It is needed for validating license expressions in RPM packages when generating SBOMs
+# While SBOMs can be generated also without this package, it is recommended to have it.
+Recommends: python3-license-expression
+%endif
+
+# osbuild 125 added a new "solver" field and osbuild-composer only
+# supports this since 116
+Conflicts: osbuild-composer <= 115
+
+# 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
 Contains depsolving capabilities for package managers.
 
 %prep
 %forgeautosetup -p1
+tar xf %SOURCE1
 
 %build
 %py3_build
 make man
 
+ln -rs %{_builddir}/%{name}-%{version}/runners/org.osbuild.rhel82 %{_builddir}/%{name}-%{version}/runners/org.osbuild.almalinux8
+%if 0%{?almalinux} >= 9
+ln -rs %{_builddir}/%{name}-%{version}/runners/org.osbuild.centos9 %{_builddir}/%{name}-%{version}/runners/org.osbuild.almalinux9
+%endif
+(cd osbuild-initrd-%{osbuild_initrd_version}; make build)
+
 # SELinux
 make -f /usr/share/selinux/devel/Makefile osbuild.pp
 bzip2 -9 osbuild.pp
 
+make -f /usr/share/selinux/devel/Makefile osbuild-container.pp
+bzip2 -9 osbuild-container.pp
+
 %pre selinux
 %selinux_relabel_pre -s %{selinuxtype}
 
 %install
 %py3_install
+(cd osbuild-initrd-%{osbuild_initrd_version}; %make_install)
 
-ln -rs %{_builddir}/%{name}-%{version}/runners/org.osbuild.rhel82 %{_builddir}/%{name}-%{version}/runners/org.osbuild.almalinux8
+# 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
-%if 0%{?almalinux} >= 9
-ln -rs %{_builddir}/%{name}-%{version}/runners/org.osbuild.centos9 %{_builddir}/%{name}-%{version}/runners/org.osbuild.almalinux9
-%endif
 
 mkdir -p %{buildroot}%{pkgdir}/stages
 install -p -m 0755 $(find stages -type f -not -name "test_*.py") %{buildroot}%{pkgdir}/stages/
@@ -207,6 +276,7 @@ install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5
 
 # SELinux
 install -D -m 0644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
+install -D -m 0644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}-container.pp.bz2
 install -D -m 0644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
 install -D -p -m 0644 selinux/osbuild.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if
 
@@ -219,17 +289,104 @@ install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir}
 
 # Install `osbuild-depsolve-dnf` into libexec
 mkdir -p %{buildroot}%{_libexecdir}
-# Fedora 40 and later use dnf5-json, RHEL and Fedora < 40 use dnf-json
-%if 0%{?fedora} >= 40
-install -p -m 0755 tools/osbuild-depsolve-dnf5 %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
-%else
 install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
+
+# Configure the solver for dnf
+mkdir -p %{buildroot}%{_datadir}/osbuild
+# RHEL 11 and Fedora 41 and later use dnf5, RHEL < 11 and Fedora < 41 use dnf
+# On Fedora 41 however, we force dnf4 (and depend on python3-dnf) until dnf5 issues are resolved.
+# See https://github.com/rpm-software-management/dnf5/issues/1748
+# and https://issues.redhat.com/browse/COMPOSER-2361
+%if 0%{?rhel} >= 11
+install -p -m 0644 tools/solver-dnf5.json %{buildroot}%{pkgdir}/solver.json
+%else
+install -p -m 0644 tools/solver-dnf.json %{buildroot}%{pkgdir}/solver.json
 %endif
 
+%if 0%{?fedora} || 0%{?rhel} >= 9
 %check
-exit 0
+# skip toml-writing tests in RHEL (no such library available there)
-# We have some integration tests, but those require running a VM, so that would
+# There is a bunch of tests failing on specific arch/OS combinations.
-# be an overkill for RPM check script.
+# osbuild is a noarch package, meaning the architecture conditionals don't work.
+# The details of the failing tests are described in the comments.
+# Since we can't be granular enough, skip tests based on the OS only.
+# This means some tests won't be run even though they could,
+# but that's an acceptable tradeoff.
+ignore_files=()
+skip_tests=()
+
+# 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
+%ifnarch x86_64
+ignore_files+=(
+    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
+)
+%endif
+
+# fails on s390x:
+# test_ioctl_toggle_immutable
+# test_rmtree_immutable
+%ifarch s390x
+skip_tests+=(
+    test_ioctl_toggle_immutable
+    test_rmtree_immutable
+)
+%endif
+
+# fails on ppc64le:
+# TestAPI.test_exception - https://github.com/osbuild/osbuild/issues/2337
+# TestUtilJsonComm.test_send_and_recv_tons_of_data_is_fine - https://github.com/osbuild/osbuild/issues/2336
+# TestUtilJsonComm.test_sendmsg_errors_with_size_on_EMSGSIZE - https://github.com/osbuild/osbuild/issues/2342
+%ifarch ppc64le
+skip_tests+=(
+    "(TestAPI and test_exception)"
+    "(TestUtilJsonComm and test_send_and_recv_tons_of_data_is_fine)"
+    "(TestUtilJsonComm and test_sendmsg_errors_with_size_on_EMSGSIZE)"
+)
+%endif
+
+# fails on ppc64le and aarch64:
+# test_cache_full_behavior
+%ifarch ppc64le || aarch64
+skip_tests+=(
+    test_cache_full_behavior
+)
+%endif
+
+# fails on C9S and EPEL9:
+# tools/test/test_depsolve.py
+# test_dnf4_pkg_to_package - https://github.com/osbuild/osbuild/issues/2339
+%if 0%{?rhel} && 0%{?rhel} < 10
+ignore_files+=(
+    tools/test/test_depsolve.py
+)
+skip_tests+=(
+    test_dnf4_pkg_to_package
+)
+%endif
+
+ignore_args=()
+for file in "${ignore_files[@]}"; do
+    ignore_args+=(--ignore "$file")
+done
+
+skip_test_expr=""
+for test in "${skip_tests[@]}"; do
+    if [ "$skip_test_expr" != "" ]; then
+        skip_test_expr+=" and not $test"
+    else
+        skip_test_expr+="not $test"
+    fi
+done
+
+%pytest %{?fedora:-n auto} -v %{?rhel:-m "not tomlwrite"} ${ignore_args[@]} -k "${skip_test_expr}"
+%endif
 
 %files
 %license LICENSE
@@ -238,6 +395,7 @@ exit 0
 %{_mandir}/man5/%{name}-manifest.5*
 %{_datadir}/osbuild/schemas
 %{pkgdir}
+%exclude %{pkgdir}/initrd
 %{_udevrulesdir}/*.rules
 # the following files are in the lvm2 sub-package
 %exclude %{pkgdir}/devices/org.osbuild.lvm2*
@@ -260,6 +418,9 @@ exit 0
 %{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*
@@ -294,19 +455,139 @@ fi
 %posttrans selinux
 %selinux_relabel_post -s %{selinuxtype}
 
+%files container-selinux
+%{_datadir}/selinux/packages/%{selinuxtype}/%{name}-container.pp.bz2
+%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}-container
+
+%post container-selinux
+%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}-container.pp.bz2
+
+%postun container-selinux
+if [ $1 -eq 0 ]; then
+    %selinux_modules_uninstall -s %{selinuxtype} %{name}-container
+fi
+
 %files tools
+%{_bindir}/osbuild-image-info
 %{_bindir}/osbuild-mpp
 %{?fedora:%{_bindir}/osbuild-dev}
 
 %files depsolve-dnf
 %{_libexecdir}/osbuild-depsolve-dnf
+%{pkgdir}/solver.json
 
 %changelog
-* Wed Mar 27 2024 Eduard Abdullin <eabdullin@almalinux.org> - 110-1.alma
+* Mon Mar 30 2026 Eduard Abdullin <eabdullin@almalinux.org> - 174-1.alma.1
 - Add AlmaLinux runners
 
+* Thu Feb 19 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 174-1
+- New upstream release
+
+* Thu Feb 12 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 173-1
+- New upstream release
+
+* 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
+
+* Thu Oct 23 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 163-1
+- New upstream release
+
+* Thu Oct 09 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 162-1
+- New upstream release
+
+* Thu Aug 14 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 158-1
+- New upstream release
+
+* Tue Jul 15 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 156-1
+- New upstream release
+
+* Sat Jul 12 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 155-1
+- New upstream release
+
+* Fri Jun 20 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 153-1
+- New upstream release
+
+* Fri Jun 06 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 151-1
+- New upstream release
+
+* Mon May 19 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 149-1
+- New upstream release
+
+* Wed Apr 16 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 147-1
+- New upstream release
+
+* Mon Apr 14 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 146-1
+- New upstream release
+
+* Fri Mar 28 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 144-1
+- New upstream release
+
+* Fri Feb 28 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 142-1
+- New upstream release
+
+* Wed Feb 12 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 141-1
+- New upstream release
+
+* Wed Feb 05 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 140-1
+- New upstream release
+
+* Thu Jan 30 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 139-1
+- New upstream release
+
+* Thu Jan 16 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 138-1
+- New upstream release
+
+* Thu Dec 19 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 137-1
+- New upstream release
+
+* Wed Dec 04 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 136-1
+- New upstream release
+
+* Sat Nov 23 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 135-1
+- New upstream release
+
+* Wed Oct 23 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 132-1
+- New upstream release
+
+* Wed Oct 09 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 131-1
+- New upstream release
+
+* Thu Sep 26 2024 Tomáš Hozza <thozza@redhat.com> - 130-1
+- New upstream release
+
+* Wed Aug 21 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 126-1
+- New upstream release
+
+* Wed Aug 14 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 125-1
+- New upstream release
+
+* Thu Aug 01 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 124-1
+- New upstream release
+
+* Thu Jul 25 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 123-1
+- New upstream release
+
+* Tue Jul 23 2024 Tomáš Hozza <thozza@redhat.com> - 122-2
+- Run tests only on x86_64
+
+* Thu Jul 04 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 122-1
+- New upstream release
+
+* Thu May 23 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 119-1
+- New upstream release
+
+* Fri May 10 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 118-1
+- New upstream release
+
+* Wed Feb 28 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 111-1
+- New upstream release
+
 * Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 110-1
 - New upstream release
+
 * Thu Feb 22 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 109-1
 - New upstream release
 
@@ -322,15 +603,31 @@ fi
 * Tue Jan 16 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 104-1
 - New upstream release
 
-* Tue Dec 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
+* Wed Jan 03 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 103-1
 - New upstream release
 
-* Mon Dec 11 2023 Paweł Poławski <ppolawsk@redhat.com> - 100-2
+* Wed Dec 20 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 102-1
+- New upstream release
+
+* Mon Dec 11 2023 Paweł Poławski <ppolawsk@redhat.com> - 101-2
 - Change unit-test timeout from 3h to 4h
+- Rebuild after failed gating
+
+* Wed Dec 06 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
+- New upstream release
 
 * Fri Nov 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
 - New upstream release
 
+* Wed Nov 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 99-1
+- New upstream release
+
+* Wed Oct 25 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 98-1
+- New upstream release
+
+* Wed Oct 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 97-1
+- New upstream release
+
 * Wed Sep 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 96-1
 - New upstream release
 
@@ -367,12 +664,9 @@ fi
 * Wed Jun 07 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
 - New upstream release
 
-* Tue May 30 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
+* Wed May 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
 - New upstream release
 
-* Tue May 30 2023 Tomáš Hozza <thozza@redhat.com> - 85-2
-- Backport upstream fixes for unit tests on RHEL-8 (PR#1316, PR#1317)
-
 * Thu May 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
 - New upstream release
 
@@ -403,6 +697,9 @@ fi
 * Wed Jan 04 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
 - New upstream release
 
+* Wed Dec 21 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 74-1
+- New upstream release
+
 * Wed Dec 07 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 73-1
 - New upstream release
 
@@ -415,6 +712,9 @@ fi
 * Wed Oct 26 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 70-1
 - New upstream release
 
+* Tue Oct 18 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 69-1
+- New upstream release
+
 * Fri Aug 26 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 65-1
 - New upstream release
 
@@ -430,7 +730,7 @@ fi
 * Wed Jul 20 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 61-1
 - New upstream release
 
-* Thu Jul 07 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
+* Wed Jul 06 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
 - New upstream release
 
 * Wed Jun 22 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
@@ -439,7 +739,7 @@ fi
 * Wed Jun 08 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
 - New upstream release
 
-* Thu May 26 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
+* Wed May 25 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
 - New upstream release
 
 * Wed May 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 56-1
@@ -448,13 +748,13 @@ fi
 * Wed Apr 27 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 55-1
 - New upstream release
 
-* Fri Apr 15 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
+* Wed Apr 13 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
 - New upstream release
 
 * Thu Mar 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
 - New upstream release
 
-* Tue Mar 08 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 52-1
+* Fri Mar 04 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 52-1
 - New upstream release
 
 * Sun Feb 27 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 50-1
@@ -463,90 +763,112 @@ fi
 * Wed Feb 23 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 49-1
 - New upstream release
 
-* Thu Feb 17 2022 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 48-1
+* Wed Feb 16 2022 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 48-1
 - New upstream release
 
-* Thu Feb 03 2022 Jacob Kozol <jacobdkozol@gmail.com> - 47-1
+* Wed Feb 02 2022 Jacob Kozol <jacobdkozol@gmail.com> - 47-1
 - New upstream release
 
 * Wed Jan 19 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46-1
 - New upstream release
 
-* Mon Jan 10 2022 Tomas Hozza <thozza@redhat.com> - 45-1
+* Fri Jan 07 2022 Tomas Hozza <thozza@redhat.com> - 45-1
 - New upstream release
 
-* Wed Jan 05 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 44-1
+* Thu Dec 16 2021 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 44-1
 - New upstream release
 
-* Wed Dec 01 2021 Achilleas Koutsou <achilleas@redhat.com> - 43-1
+* Wed Dec 01 2021 Achilleas Koutsou <achilleas@koutsou.net> - 43-1
 - New upstream release
 
-* Mon Nov 29 2021 Ondřej Budai <ondrej@budai.cz> - 42-1
+* Wed Nov 17 2021 'Gianluca Zuccarelli' <'<gzuccare@redhat.com>'> - 42-1
 - New upstream release
 
-* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 39-1
+* Thu Oct 07 2021 Simon Steinbeiß <simon.steinbeiss@redhat.com> - 39-1
 - New upstream release
 
-* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 35-1
+* Sun Aug 29 2021 Tom Gundersen <tgunders@redhat.com> - 35-1
 - Upstream release 35
 
-* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 34-1
+* Sun Aug 29 2021 Tom Gundersen <tgunders@redhat.com> - 34-1
 - Upstream release 34
 
-* Wed Aug 25 2021 Tom Gundersen <teg@jklm.no> - 33-1
+* Wed Aug 25 2021 Tom Gundersen <tgunders@redhat.com> - 33-1
 - Upstream release 33
 
-* Tue Aug 24 2021 Tom Gundersen <teg@jklm.no> - 32-1
+* Tue Aug 24 2021 Tom Gundersen <tgunders@redhat.com> - 32-1
 - Upstream release 32
 
-* Mon Aug 23 2021 Tom Gundersen <teg@jklm.no> - 31-1
+* Mon Aug 23 2021 Tom Gundersen <tgunders@redhat.com> - 31-1
 - Upstream release 31
 
-* Fri Jul 23 2021 Christian Kellner <christian@kellner.me> - 30-1
+* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 30-1
 - Upstream release 30
-- Ship osbuild-mpp in new tools sub-package.
+- Many new stages for building ostree-based raw images
-- Remove executable bit from schemata files.
+- Bootiso.mono stage was deprecated and split into smaller stages
+- Mounts are now represented as an array in a manifest
+- Various bug fixes and improvements to various stages
 
-* Tue Apr 27 2021 Achilleas Koutsou <achilleas@redhat.com> - 28-1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
-- Upstream release 28
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Includes fixes and feature additions for multiple stages.
+  Related: rhbz#1991688
 
-* Fri Feb 19 2021 Christian Kellner <ckellner@redhat.com> - 26-1
+* Tue Jun 29 2021 Ondřej Budai <ondrej@budai.cz> - 29-1
+- Upstream release 29
+- Adds host services
+- Adds modprobe and logind stage
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 27-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Mar 17 2021 Christian Kellner <ckellner@redhat.com> - 27-2
+- Include Fedora 35 runner (upstream commit 337e0f0)
+
+* Tue Mar 16 2021 Christian Kellner <ckellner@redhat.com> - 27-1
+- Upstream release 27
+- Various bug fixes related to the new container and installer
+  stages introdcued in version 25 and 26.
+
+* Sat Feb 20 2021 Christian Kellner <ckellner@redhat.com> - 26-1
 - Upstream release 26
-- Includes the necessary stages to build boot isos.
+- Support for building boot isos
+- Grub stage gained support for 'saved_entry' to fix grub tooling
 
 * Fri Feb 12 2021 Christian Kellner <ckellner@redhat.com> - 25-1
-- Upstream 25 release
+- Upstream release 25
 - First tech preview of the new manifest format. Includes
   various new stages and inputs to be able to build ostree
   commits contained in a oci archive.
 
 * Thu Jan 28 2021 Christian Kellner <ckellner@redhat.com> - 24-1
-- Upstream 24 release
+- Upstream release 24
-- Include new `Input` modules.
+- Turn on dependency generator for everything but runners
+- Include new 'input' binaries
 
-* Mon Nov 23 2020 Christian Kellner <ckellner@redhat.com> - 23-3
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23-2
-- only disable the dep. generator for runners, remove explicity
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-  python3 requirement again. The dependency should be picked up
-  via the dependency generator now.
-
-* Fri Nov 13 2020 Christian Kellner <ckellner@redhat.com> - 23-2
-- Explicilty require python3. See the comment above the Requires
-  for an explanation why this is needed.
 
 * Fri Oct 23 2020 Christian Kellner <ckellner@redhat.com> - 23-1
 - Upstream release 23
 - Do not mangle shebangs for assemblers, runners & stages.
 
-* Wed Oct 14 2020 Christian Kellner <ckellner@redhat.com> - 22-1
+* Mon Oct 12 2020 Christian Kellner <ckellner@redhat.com> - 22-1
 - Upstream release 22
-- Remove all patches since they are all in osbuild-22.
+
+* Thu Sep 10 2020 Christian Kellner <ckellner@redhat.com> - 21-1
+- Upstream reelase 21
+
+* Thu Aug 13 2020 Christian Kellner <ckellner@redhat.com> - 20-1
+- Upstream reelase 20
+
+* Fri Aug  7 2020 Christian Kellner <ckellner@redhat.com> - 19-1
+- Upstream release 19
+- Drop no-floats-in-sources.patch included in release 19
 - bubblewrap replaced systemd-nspawn for sandboxing; change the
   requirements accordingly.
 
-* Thu Aug 13 2020 Christian Kellner <ckellner@redhat.com> - 18-3
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-3
-- Add patch to allow nnp and nosuid domain transitions
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-  https://github.com/osbuild/osbuild/pull/495
 
 * Fri Jun 26 2020 Christian Kellner <ckellner@redhat.com> - 18-2
 - Add patch to not pass floats to curl in the files source
@@ -557,54 +879,80 @@ fi
 - All RHEL runners now use platform-python.
 
 * Wed Jun 10 2020 Christian Kellner <ckellner@redhat.com> - 17-1
-- Upstream release 17
+- new upstream relaese 17
 - Add custom SELinux policy that lets osbuild set labels inside
   the build root that are unknown to the host.
 
-* Thu Jun  4 2020 Christian Kellner <christian@kellner.me> - 16-1
+* Thu Jun  4 2020 Christian Kellner <ckellner@redhat.com> - 16-1
-- Upstream release 16
+- new upstream release 16
 - Drop sources-fix-break-when-secrets-is-None.patch included in
-  osbuild-16.
+  the new upstream reelase.
 
-* Tue May 26 2020 Christian Kellner <ckellner@redhat.com> - 15-2
+* Wed May 27 2020 Miro Hrončok <mhroncok@redhat.com> - 15-4
+- Rebuilt for Python 3.9
+
+* Tue May 26 2020 Christian Kellner <ckellner@redhat.com> - 15-3
 - Add a patch to allow org.osbuild.files source in the new format
   but without actually containing the secrets key.
   Taken from merged PR: https://github.com/osbuild/osbuild/pull/416
 
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 15-2
+- Rebuilt for Python 3.9
+
 * Thu May 21 2020 Christian Kellner <ckellner@redhat.com> - 15-1
-- New upstream release 15
+- new upstream release 15
-- Drop draft4-validator.json patch, included in osbuild-15
 
-* Wed May 13 2020 Christian Kellner <ckellner@redhat.com> - 14-2
+* Wed May  6 2020 Christian Kellner <christian@kellner.me> - 14-2
-- Add draft4-validator.json patch
-  python3-jsonschema in RHEL currently has version 2.6.0 which
-  has support validating up to and including draft4 of jsonschema.
-  See https://github.com/osbuild/osbuild/pull/394
-
-* Wed May 13 2020 Christian Kellner <ckellner@redhat.com> - 14-1
-- Upstream release 14
 - Install schemata to <datadir>/osbuild/schemas and include a
   symlink to it in /usr/lib/osbuild/schemas
+
+* Wed May  6 2020 Christian Kellner <christian@kellner.me> - 14-1
+- new upstream release 14
 - The directories /usr/lib/osbuild/{assemblers, stages}/osbuild
   got removed. Changes to osbuild made them obsolete.
 
 * Wed Apr 15 2020 Christian Kellner <ckellner@redhat.com> - 12-1
-- Sync with Fedora and use upstream release 12
+- new upstream release 12
 - Specify the exact version in the 'python3-osbuild' requirement
   to avoid the library and the main binary being out of sync.
 - osbuild-ostree sub-package with the necessary bits to create
   OSTree based images
-- Turn off dependency generator for internal components
-- Add NEWS.md file with the release notes and man pages
 
-* Mon Dec 16 2019 Lars Karlitski <lars@karlitski.net> - 7-1
+* Thu Apr  2 2020 Christian Kellner <ckellner@redhat.com> - 11-1
-- New upstream release
+- new upstream release 11
+- Turn of dependency generator for internal components
 
-* Sun Dec 1 2019 Tom Gundersen <teg@jklm.no> - 6-2
+* Thu Mar 19 2020 Christian Kellner <ckellner@redhat.com> - 10-1
-- New upstream release
+- new upstream release 10
+- build and include man pages, this adds 'make' and 'python3-docutils'
+  to the build requirements
+- add NEWS.md file with the release notes
 
-* Thu Oct 24 2019 Lars Karlitski <lueberni@redhat.com> - 3-2
+* Thu Mar  5 2020 Christian Kellner <ckellner@redhat.com> - 9-1
-- add gating infra and tests
+- new upstream release: 9
+- Remove host runner link, it now is being auto-detected
+- Cleanup use of mixed use of spaces/tabs
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 16 2019 Packit Service <user-cont-team+packit-service@redhat.com> - 7-1
+- new upstream release: 7
+
+* Sat Nov 30 2019 Tom Gundersen <teg@jklm.no> - 6-1
+- new upstream release: 6
+
+* Wed Oct 30 2019 Lars Karlitski <lars@karlitski.net> - 5-1
+- new upstream release: 5
+
+* Wed Oct 16 2019 Tom Gundersen <tgunders@redhat.com> - 4-1
+- new upstream release: 4
+
+* Fri Oct 04 2019 Lars Karlitski <lars@karlitski.net> - 3-1
+- new upstream release: 3
+
+* Wed Sep 18 2019 Martin Sehnoutka <msehnout@redhat.com> - 2-1
+- new upstream release: 2
 
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1-3
 - Rebuilt for Python 3.8