64713449ce
We've been using a generic `osbuild-run`, which sets up the build environment (and works around bugs) for all build roots. It is already getting unwieldy, because it tries to detect the OS for some things it configures. It's also about to cause problems for RHEL, which doesn't currently support a python3 shebang without having /etc around. This patch changes the `build` key in a pipeline to not be a pipeline itself, but an object with `runner` and `pipeline` keys. `pipeline` is the build pipeline, as before. `runner` is the name of the runner to use. Runners are programs in the `runners` subdirectory. Three runners are included in this patch. They're copies of osbuild-run for now (except some additions for rhel82). The idea is that each of them only contains the minimal setup code necessary for an OS, and that we can review what's needed when updating a build root. Also modify the `--build-pipeline` command line switch to accept such a build object (instead of a pipeline) and rename it accordingly, to `--build-env`. Correspondingly, `OSBUILD_TEST_BUILD_PIPELINE` → `OSBUILD_TEST_BUILD_ENV`.
84 lines
1.9 KiB
RPMSpec
84 lines
1.9 KiB
RPMSpec
%global pypi_name osbuild
|
|
%global pkgdir %{_prefix}/lib/%{pypi_name}
|
|
|
|
Name: %{pypi_name}
|
|
Version: 5
|
|
Release: 1%{?dist}
|
|
License: ASL 2.0
|
|
|
|
URL: https://github.com/osbuild/osbuild
|
|
|
|
Source0: https://github.com/osbuild/%{pypi_name}/archive/%{version}.tar.gz
|
|
BuildArch: noarch
|
|
Summary: A build system for OS images
|
|
|
|
BuildRequires: python3-devel
|
|
|
|
Requires: bash
|
|
Requires: coreutils
|
|
Requires: dnf
|
|
Requires: e2fsprogs
|
|
Requires: glibc
|
|
Requires: policycoreutils
|
|
Requires: qemu-img
|
|
Requires: systemd
|
|
Requires: systemd-container
|
|
Requires: tar
|
|
Requires: util-linux
|
|
Requires: python3-%{pypi_name}
|
|
|
|
%{?python_enable_dependency_generator}
|
|
|
|
%description
|
|
A build system for OS images
|
|
|
|
%package -n python3-%{pypi_name}
|
|
Summary: %{summary}
|
|
%{?python_provide:%python_provide python3-%{pypi_name}}
|
|
|
|
%description -n python3-%{pypi_name}
|
|
A build system for OS images
|
|
|
|
%prep
|
|
%autosetup -n %{name}-%{version}
|
|
|
|
%build
|
|
%py3_build
|
|
|
|
%install
|
|
%py3_install
|
|
|
|
mkdir -p %{buildroot}%{pkgdir}/stages
|
|
install -p -m 0755 $(find stages -type f) %{buildroot}%{pkgdir}/stages/
|
|
|
|
mkdir -p %{buildroot}%{pkgdir}/assemblers
|
|
install -p -m 0755 $(find assemblers -type f) %{buildroot}%{pkgdir}/assemblers/
|
|
|
|
mkdir -p %{buildroot}%{pkgdir}/runners
|
|
install -p -m 0755 $(find runners -type f) %{buildroot}%{pkgdir}/runners
|
|
|
|
%check
|
|
exit 0
|
|
# We have some integration tests, but those require running a VM, so that would
|
|
# be an overkill for RPM check script.
|
|
|
|
%files
|
|
%license LICENSE
|
|
%{_bindir}/osbuild
|
|
%{pkgdir}
|
|
|
|
%files -n python3-%{pypi_name}
|
|
%license LICENSE
|
|
%doc README.md
|
|
%{python3_sitelib}/%{pypi_name}-*.egg-info/
|
|
%{python3_sitelib}/%{pypi_name}/
|
|
|
|
%changelog
|
|
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1-3
|
|
- Rebuilt for Python 3.8
|
|
|
|
* Mon Jul 29 2019 Martin Sehnoutka <msehnout@redhat.com> - 1-2
|
|
- update upstream URL to the new Github organization
|
|
|
|
* Wed Jul 17 2019 Martin Sehnoutka <msehnout@redhat.com> - 1-1
|
|
- Initial package
|