rpms/osbuild
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/osbuild.git#4c60f0746824b5d61a1325122b469166e0dfbfd0
This commit is contained in:
DistroBaker 2021-01-28 14:16:00 +00:00
parent 96a7c10765
commit 1fab410b4a
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,3 +21,4 @@
/osbuild-21.tar.gz /osbuild-21.tar.gz
/osbuild-22.tar.gz /osbuild-22.tar.gz
/osbuild-23.tar.gz /osbuild-23.tar.gz
/osbuild-24.tar.gz

26
osbuild.spec
View File

@ -1,7 +1,7 @@
%global forgeurl https://github.com/osbuild/osbuild %global forgeurl https://github.com/osbuild/osbuild
%global selinuxtype targeted %global selinuxtype targeted
Version: 23 Version: 24
%forgemeta %forgemeta
@ -37,11 +37,10 @@ Requires: util-linux
Requires: python3-%{pypi_name} = %{version}-%{release} Requires: python3-%{pypi_name} = %{version}-%{release}
Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) 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 # 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` # redhat-rpm-config) is run on all executables in a package after the `install`
@ -51,6 +50,10 @@ Requires: (%{name}-selinux if selinux-policy-%{selinuxtype})
# - stages and assemblers, because they are run within osbuild build roots, # - 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 # which are not required to contain the same OS as the host and might thus
# have a different notion of "platform-python". # 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)/.*$ %global __brp_mangle_shebangs_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$
%{?python_enable_dependency_generator} %{?python_enable_dependency_generator}
@ -116,6 +119,9 @@ install -p -m 0755 $(find runners -type f -or -type l) %{buildroot}%{pkgdir}/run
mkdir -p %{buildroot}%{pkgdir}/sources mkdir -p %{buildroot}%{pkgdir}/sources
install -p -m 0755 $(find sources -type f) %{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 # mount point for bind mounting the osbuild library
mkdir -p %{buildroot}%{pkgdir}/osbuild mkdir -p %{buildroot}%{pkgdir}/osbuild
@ -181,6 +187,14 @@ fi
%selinux_relabel_post -s %{selinuxtype} %selinux_relabel_post -s %{selinuxtype}
%changelog %changelog
* Thu Jan 28 2021 Christian Kellner <ckellner@redhat.com> - 24-1
- Upstream release 24
- Turn on dependency generator for everything but runners
- Include new 'input' binaries
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Oct 23 2020 Christian Kellner <ckellner@redhat.com> - 23-1 * Fri Oct 23 2020 Christian Kellner <ckellner@redhat.com> - 23-1
- Upstream release 23 - Upstream release 23
- Do not mangle shebangs for assemblers, runners & stages. - Do not mangle shebangs for assemblers, runners & stages.

2
sources
View File

@ -1 +1 @@
SHA512 (osbuild-23.tar.gz) = a3f1489cc12c875cc1d1cef52f38a618ee395284cad4c6838e3f0022ad50bc1fd1d0bc53eb3b9ce293ffbef9096f4aa37fd4a506aa04a24017b4fe98787a0f20 SHA512 (osbuild-24.tar.gz) = 6a9f97bc099335cdddfc2894cffc163569a90afea1e4f0df0961d1c272184a7d9a7c069628e121ba0b45b6a4aeae469ef0ac0aa26862a664580723809622bf9d