import osbuild-26-1.el8

.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-18.tar.gz
+SOURCES/osbuild-26.tar.gz

.osbuild.metadata

@@ -1 +1 @@
-9bf4e1ce90639dcefba530df762de397f8e39bd6 SOURCES/osbuild-18.tar.gz
+e000ca164a3f216ef99d4be66c0ebb02495d953e SOURCES/osbuild-26.tar.gz

SOURCES/no-floats-in-sources.patch

@@ -1,53 +0,0 @@
-From 7b0db90c76c6b0de6a4d481e63450e8f0d1a1d9d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com>
-Date: Thu, 25 Jun 2020 09:56:30 +0200
-Subject: [PATCH] sources/files: do not pass floats to --max-time
-
-curl uses strtod from the C standard library to convert the --max-time's value
-from string to double. However, this is what strtod expects:
-
-nonempty sequence of decimal digits optionally containing decimal-point
-character (as determined by the current C locale)
-
-Yeah, unfortunately, the decimal-point character is determined by the current
-C locale. For example, Czech and German locale uses a comma as the
-decimal-point character.
-
-For reasons I don't fully understand, Python thinks it's running on en_US
-locale, even though LC_NUMERIC is set to cs_CZ, so it uses a full stop as the
-decimal-point character when converting float to string. However, as written
-before, curl fails to parse this because it expects comma.
-
-The fix I chose is simple: Use math.ceil, so only an integer can be passed to
-curl. Why ceil? Because --max-time == 0 sounds fishy. math.ceil should return
-an integer (and it does in Python 3.8) but the documentation is not 100% clear
-on this topic, so let's be paranoid and also convert it to int after the
-ceiling.
----
- sources/org.osbuild.files | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/sources/org.osbuild.files b/sources/org.osbuild.files
-index 42ff6ca..13ce9b8 100755
---- a/sources/org.osbuild.files
-+++ b/sources/org.osbuild.files
-@@ -17,6 +17,7 @@ import concurrent.futures
- import glob
- import itertools
- import json
-+import math
- import os
- import subprocess
- import sys
-@@ -102,7 +103,7 @@ def fetch(url, checksum, directory):
-             curl_command = [
-                 "curl",
-                 "--silent",
--                "--max-time", f"{300 - elapsed_time}",
-+                "--max-time", f"{int(math.ceil(300 - elapsed_time))}",
-                 "--connect-timeout", "60",
-                 "--fail",
-                 "--location",
--- 
-2.26.2
-

SPECS/osbuild.spec

@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        18
+Version:        26
 
 %forgemeta
 
@@ -9,13 +9,12 @@ Version:        18
 %global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        ASL 2.0
 
 URL:            %{forgeurl}
 
 Source0:        %{forgesource}
-Patch0:         no-floats-in-sources.patch
 BuildArch:      noarch
 Summary:        A build system for OS images
 
@@ -24,6 +23,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-docutils
 
 Requires:       bash
+Requires:       bubblewrap
 Requires:       coreutils
 Requires:       curl
 Requires:       dnf
@@ -32,20 +32,34 @@ Requires:       glibc
 Requires:       policycoreutils
 Requires:       qemu-img
 Requires:       systemd
-Requires:       systemd-container
 Requires:       tar
 Requires:       util-linux
 Requires:       python3-%{pypi_name} = %{version}-%{release}
 Requires:       (%{name}-selinux if selinux-policy-%{selinuxtype})
 
-# Turn off dependency generators for assemblers, runners and stages.
+# Turn off dependency generators for runners. The reason is that runners are
-# They run in a container, so there's no reason to generate dependencies
+# tailored to the platform, e.g. on RHEL they are using platform-python. We
-# from them. As of 2020-03-25 this filters out python3.6 dependency generated
+# don't want to pick up those dependencies on other platform.
-# by rhel runner.
+%global __requires_exclude_from ^%{pkgdir}/(runners)/.*$
-%global __requires_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$
+
+# Turn off shebang mangling on RHEL. brp-mangle-shebangs (from package
+# redhat-rpm-config) is run on all executables in a package after the `install`
+# section runs. The below macro turns this behavior off for:
+#   - runners, because they already have the correct shebang for the platform
+#     they're meant for, and
+#   - stages and assemblers, because they are run within osbuild build roots,
+#     which are not required to contain the same OS as the host and might thus
+#     have a different notion of "platform-python".
+# RHEL NB: Since assemblers and stages are not excluded from the dependency
+# generator, this also means that an additional dependency on /usr/bin/python3
+# will be added. This is intended and needed, so that in the host build root
+# /usr/bin/python3 is present so stages and assemblers can be run.
+%global __brp_mangle_shebangs_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$
+
 
 %{?python_enable_dependency_generator}
 
+
 %description
 A build system for OS images
 
@@ -80,7 +94,6 @@ containers it uses to build OS artifacts.
 
 %prep
 %forgesetup
-%patch0 -p1
 
 %build
 %py3_build
@@ -108,6 +121,9 @@ install -p -m 0755 $(find runners -type f -or -type l) %{buildroot}%{pkgdir}/run
 mkdir -p %{buildroot}%{pkgdir}/sources
 install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources
 
+mkdir -p %{buildroot}%{pkgdir}/inputs
+install -p -m 0755 $(find inputs -type f) %{buildroot}%{pkgdir}/inputs
+
 # mount point for bind mounting the osbuild library
 mkdir -p %{buildroot}%{pkgdir}/osbuild
 
@@ -174,6 +190,43 @@ fi
 
 
 %changelog
+* Fri Feb 19 2021 Christian Kellner <ckellner@redhat.com> - 26-1
+- Upstream release 26
+- Includes the necessary stages to build boot isos.
+
+* Fri Feb 12 2021 Christian Kellner <ckellner@redhat.com> - 25-1
+- Upstream 25 release
+- 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
+- Include new `Input` modules.
+
+* Mon Nov 23 2020 Christian Kellner <ckellner@redhat.com> - 23-3
+- only disable the dep. generator for runners, remove explicity
+  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
+- Upstream release 22
+- Remove all patches since they are all in osbuild-22.
+- bubblewrap replaced systemd-nspawn for sandboxing; change the
+  requirements accordingly.
+
+* Thu Aug 13 2020 Christian Kellner <ckellner@redhat.com> - 18-3
+- Add patch to allow nnp and nosuid domain transitions
+  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
   https://github.com/osbuild/osbuild/pull/459