22 upstream release

no spec file changes.

.gitignore

@@ -1 +1,22 @@
 /1.tar.gz
+/2.tar.gz
+/3.tar.gz
+/4.tar.gz
+/5.tar.gz
+/6.tar.gz
+/7.tar.gz
+/osbuild-8.tar.gz
+/osbuild-9.tar.gz
+/osbuild-10.tar.gz
+/osbuild-11.tar.gz
+/osbuild-12.tar.gz
+/osbuild-13.tar.gz
+/osbuild-14.tar.gz
+/osbuild-15.tar.gz
+/osbuild-16.tar.gz
+/osbuild-17.tar.gz
+/osbuild-18.tar.gz
+/osbuild-19.tar.gz
+/osbuild-20.tar.gz
+/osbuild-21.tar.gz
+/osbuild-22.tar.gz

.packit.yaml

@@ -0,0 +1,37 @@
+# we have the specfile in the root of our repository
+specfile_path: osbuild.spec
+# when doing an update in Fedora, we want to copy the spec file and the config file
+synced_files:
+  - osbuild.spec
+  - .packit.yaml
+upstream_project_name: osbuild
+downstream_package_name: osbuild
+jobs:
+  # trigger a COPR build for push events in open PRs
+  - job: copr_build
+    trigger: pull_request
+    metadata:
+      targets:
+      - fedora-30-x86_64
+      - fedora-31-x86_64
+      - fedora-rawhide-x86_64
+  # this is triggered by a commit on src.fedoraproject.org, not Github!
+  # e.g. in case of mass rebuild or automated changes of spec file (e.g. Python packagers)
+  # it will create a PR on Github with changes in synchronized files
+  - job: sync_from_downstream
+    trigger: commit
+  # create a PR on src.fedoraproject.org containing updated spec file and new sources (tarball)
+  # triggered by Github release
+  - job: propose_downstream
+    trigger: release
+    metadata:
+      dist-git-branch: master
+  # The same as above only for f31
+  - job: propose_downstream
+    trigger: release
+    metadata:
+      dist-git-branch: f31
+  - job: propose_downstream
+    trigger: release
+    metadata:
+      dist-git-branch: f30

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.7.2.dev96+g8ed72cd.

gating.yaml

@@ -0,0 +1,12 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

osbuild.spec

@@ -1,30 +1,46 @@
+%global         forgeurl https://github.com/osbuild/osbuild
+%global         selinuxtype targeted
+
+Version:        22
+
+%forgemeta
+
 %global         pypi_name osbuild
+%global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Version:        1
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        ASL 2.0
 
-URL:            https://github.com/osbuild/osbuild
+URL:            %{forgeurl}
 
-Source0:        https://github.com/osbuild/%{pypi_name}/archive/%{version}.tar.gz
+Source0:        %{forgesource}
 BuildArch:      noarch
 Summary:        A build system for OS images
 
+BuildRequires:  make
 BuildRequires:  python3-devel
+BuildRequires:  python3-docutils
 
-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}
+Requires:       bash
+Requires:       bubblewrap
+Requires:       coreutils
+Requires:       curl
+Requires:       dnf
+Requires:       e2fsprogs
+Requires:       glibc
+Requires:       policycoreutils
+Requires:       qemu-img
+Requires:       systemd
+Requires:       tar
+Requires:       util-linux
+Requires:       python3-%{pypi_name} = %{version}-%{release}
+
+# 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)/.*$
 
 %{?python_enable_dependency_generator}
 
@@ -35,25 +51,54 @@ A build system for OS images
 Summary:        %{summary}
 %{?python_provide:%python_provide python3-%{pypi_name}}
 
-%description -n     python3-%{pypi_name}
+%description -n python3-%{pypi_name}
 A build system for OS images
 
+%package        ostree
+Summary:        OSTree support
+Requires:       %{name} = %{version}-%{release}
+Requires:       ostree
+Requires:       rpm-ostree
+
+%description ostree
+Contains the necessary stages, assembler and source
+to build OSTree based images.
+
 %prep
-%autosetup -n %{name}-%{version}
+%forgesetup
 
 %build
 %py3_build
+make man
 
 %install
 %py3_install
 
-mkdir -p %{buildroot}%{_libexecdir}/%{pypi_name}/stages
-install -p -m 0755 $(find stages -type f) %{buildroot}%{_libexecdir}/%{pypi_name}/stages/
+mkdir -p %{buildroot}%{pkgdir}/stages
+install -p -m 0755 $(find stages -type f) %{buildroot}%{pkgdir}/stages/
 
-mkdir -p %{buildroot}%{_libexecdir}/%{pypi_name}/assemblers
-install -p -m 0755 $(find assemblers -type f) %{buildroot}%{_libexecdir}/%{pypi_name}/assemblers/
+mkdir -p %{buildroot}%{pkgdir}/assemblers
+install -p -m 0755 $(find assemblers -type f) %{buildroot}%{pkgdir}/assemblers/
 
-install -p -m 0755 osbuild-run %{buildroot}%{_libexecdir}/%{pypi_name}/
+mkdir -p %{buildroot}%{pkgdir}/runners
+install -p -m 0755 $(find runners -type f -or -type l) %{buildroot}%{pkgdir}/runners
+
+mkdir -p %{buildroot}%{pkgdir}/sources
+install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources
+
+# mount point for bind mounting the osbuild library
+mkdir -p %{buildroot}%{pkgdir}/osbuild
+
+# schemata
+mkdir -p %{buildroot}%{_datadir}/osbuild/schemas
+install -p -m 0755 $(find schemas/*.json) %{buildroot}%{_datadir}/osbuild/schemas
+ln -s %{_datadir}/osbuild/schemas %{buildroot}%{pkgdir}/schemas
+
+# documentation
+mkdir -p %{buildroot}%{_mandir}/man1
+mkdir -p %{buildroot}%{_mandir}/man5
+install -p -m 0644 -t %{buildroot}%{_mandir}/man1/ docs/*.1
+install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5
 
 %check
 exit 0
@@ -63,15 +108,119 @@ exit 0
 %files
 %license LICENSE
 %{_bindir}/osbuild
-%{_libexecdir}/%{pypi_name}
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man5/%{name}-manifest.5*
+%{_datadir}/osbuild/schemas
+%{pkgdir}
+# the following files are in the ostree sub-package
+%exclude %{pkgdir}/assemblers/org.osbuild.ostree.commit
+%exclude %{pkgdir}/sources/org.osbuild.ostree
+%exclude %{pkgdir}/stages/org.osbuild.ostree
+%exclude %{pkgdir}/stages/org.osbuild.rpm-ostree
 
-%files -n     python3-%{pypi_name}
+%files -n       python3-%{pypi_name}
 %license LICENSE
-%doc README.md
+%doc README.md NEWS.md
 %{python3_sitelib}/%{pypi_name}-*.egg-info/
 %{python3_sitelib}/%{pypi_name}/
 
+%files ostree
+%{pkgdir}/assemblers/org.osbuild.ostree.commit
+%{pkgdir}/sources/org.osbuild.ostree
+%{pkgdir}/stages/org.osbuild.ostree
+%{pkgdir}/stages/org.osbuild.rpm-ostree
+
 %changelog
+* Mon Oct 12 2020 Christian Kellner <ckellner@redhat.com> - 22-1
+- Upstream release 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.
+
+* 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
+
+* Tue Jun 23 2020 Christian Kellner <ckellner@redhat.com> - 18-1
+- Upstream release 18
+- Add custom SELinux policy that lets osbuild set labels inside
+  the build root that are unknown to the host.
+- All RHEL runners now use platform-python.
+
+* Thu Jun  4 2020 Christian Kellner <ckellner@redhat.com> - 16-1
+- new upstream release 16
+- Drop sources-fix-break-when-secrets-is-None.patch included in
+  the new upstream reelase.
+
+* Tue May 26 2020 Christian Kellner <ckellner@redhat.com> - 15-2
+- 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
+
+* Thu May 21 2020 Christian Kellner <ckellner@redhat.com> - 15-1
+- new upstream release 15
+
+* Wed May  6 2020 Christian Kellner <christian@kellner.me> - 14-2
+- 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
+- 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
+
+* Thu Apr  2 2020 Christian Kellner <ckellner@redhat.com> - 11-1
+- new upstream release 11
+- Turn of dependency generator for internal components
+
+* Thu Mar 19 2020 Christian Kellner <ckellner@redhat.com> - 10-1
+- 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 Mar  5 2020 Christian Kellner <ckellner@redhat.com> - 9-1
+- 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 Jul 29 2019 Martin Sehnoutka <msehnout@redhat.com> - 1-2
 - update upstream URL to the new Github organization
 

sources

@@ -1 +1 @@
-SHA512 (1.tar.gz) = 24339d7d121f01f18a21a026dd495555b119b4c5f7a4d80b7c0a94392bbadcc21cc92439f0035faf39d7fb3921e17d85676db9ff4683be22255b9cd9844b1f2b
+SHA512 (osbuild-22.tar.gz) = 76b2efb083b2c372251b20185f76d59336fd3ddb4dfcf9b33f825a9f93c5dd2449ae2321fcdca1d9d3b0fc9f4547e5850d11b7137e92793d766c6e9383cb2703

tests/tests.yml

@@ -0,0 +1,19 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-source
+    tags:
+    - always
+  - role: standard-test-basic
+    tags:
+    - atomic
+    - classic
+    required_packages:
+    - osbuild
+    tests:
+    - smoke:
+        dir: smoke
+        run: osbuild --help
+    - image:
+        dir: .
+        run: osbuild source/samples/base-qcow2.json