From 1ab45a6613713e12eb7d29c35bd906f8e3f2714c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 06 2021 08:10:34 +0000 Subject: import osbuild-24-1.el8 --- diff --git a/.gitignore b/.gitignore index 49236de..348efa7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-23.tar.gz +SOURCES/osbuild-24.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index 4837a03..5a05e1b 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -153a2b2bc2a90a60b072170fe60188da0a179a08 SOURCES/osbuild-23.tar.gz +d0990a63c087f843faa79d88b08ca206a8ae1fce SOURCES/osbuild-24.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 7e6d98e..8a1cc0b 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 23 +Version: 24 %forgemeta @@ -9,7 +9,7 @@ Version: 23 %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Release: 2%{?dist} +Release: 1%{?dist} License: ASL 2.0 URL: %{forgeurl} @@ -37,18 +37,10 @@ Requires: util-linux Requires: python3-%{pypi_name} = %{version}-%{release} Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) -# We explicitly depend on Python3, since our modules (stages, assembler, sources) -# have a '#/usr/bin/python3' shebang, because the very same modules will also run -# in different buildroots, e.g. Fedora, which does *not* have platform-python. -# Therefore that host-buildroot, i.e. the host that runs osbuild, needs to provide -# /usr/bin/python3 as well. Therefore we require it: -Requires: python3 - -# Turn off dependency generators for assemblers, runners and stages. -# They run in a container, so there's no reason to generate dependencies -# from them. As of 2020-03-25 this filters out python3.6 dependency generated -# by rhel runner. -%global __requires_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$ +# Turn off dependency generators for runners. The reason is that runners are +# tailored to the platform, e.g. on RHEL they are using platform-python. We +# don't want to pick up those dependencies on other platform. +%global __requires_exclude_from ^%{pkgdir}/(runners)/.*$ # 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` @@ -58,10 +50,16 @@ Requires: python3 # - 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 @@ -123,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 @@ -189,6 +190,15 @@ fi %changelog +* Thu Jan 28 2021 Christian Kellner - 24-1 +- Upstream 24 release +- Include new `Input` modules. + +* Mon Nov 23 2020 Christian Kellner - 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 - 23-2 - Explicilty require python3. See the comment above the Requires for an explanation why this is needed.