From b5d5b56b660d0085ce360ed2149d54497b8170af Mon Sep 17 00:00:00 2001 From: Martin Sehnoutka Date: Wed, 18 Sep 2019 10:43:06 +0200 Subject: [PATCH 01/30] [packit] 2 upstream release Upstream tag: 2 Upstream commit: 209d3fa437678eb79da30ac21659fb01321eeb1a Signed-off-by: Martin Sehnoutka --- .gitignore | 1 + .packit.yaml | 32 ++++++++++++++++++++++++++++++++ README.packit | 2 ++ osbuild.spec | 7 +++++-- sources | 2 +- 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 1a88be8..db51aac 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /1.tar.gz +/2.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..ce4c982 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,32 @@ +# 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-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 f30 + - job: propose_downstream + trigger: release + metadata: + dist-git-branch: f30 diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..c3065d4 --- /dev/null +++ b/README.packit @@ -0,0 +1,2 @@ +This repository is maintained by packit. +https://packit.dev/ diff --git a/osbuild.spec b/osbuild.spec index f2ff748..a929557 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,8 +1,8 @@ %global pypi_name osbuild Name: %{pypi_name} -Version: 1 -Release: 2%{?dist} +Version: 2 +Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/osbuild/osbuild @@ -72,6 +72,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Wed Sep 18 2019 Martin Sehnoutka - 2-1 +- new upstream release: 2 + * Mon Jul 29 2019 Martin Sehnoutka - 1-2 - update upstream URL to the new Github organization diff --git a/sources b/sources index 0fac90d..2fc7868 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (1.tar.gz) = 24339d7d121f01f18a21a026dd495555b119b4c5f7a4d80b7c0a94392bbadcc21cc92439f0035faf39d7fb3921e17d85676db9ff4683be22255b9cd9844b1f2b +SHA512 (2.tar.gz) = 89debb8504dd5cb8cd4f07aad3dbfbb3ce5577a6b9267f862b214a18c2e24b3a16fc5b11d801294ef58c3f0e110bebda0753a9c1ba7d322180a386e75b29335a From 12af8a5f24866981ee70ba3eddbd19841ace1906 Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Fri, 4 Oct 2019 11:32:56 +0200 Subject: [PATCH 02/30] [packit] 3 upstream release Upstream tag: 3 Upstream commit: cd49e2407c83f7fcdf30566af5f7ab470d801e19 Signed-off-by: Lars Karlitski --- .gitignore | 1 + osbuild.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index db51aac..815fd85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /1.tar.gz /2.tar.gz +/3.tar.gz diff --git a/osbuild.spec b/osbuild.spec index a929557..4748672 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,8 @@ %global pypi_name osbuild +%global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 2 +Version: 3 Release: 1%{?dist} License: ASL 2.0 @@ -47,13 +48,13 @@ A build system for OS images %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}/ +install -p -m 0755 osbuild-run %{buildroot}%{pkgdir}/ %check exit 0 @@ -63,7 +64,7 @@ exit 0 %files %license LICENSE %{_bindir}/osbuild -%{_libexecdir}/%{pypi_name} +%{pkgdir} %files -n python3-%{pypi_name} %license LICENSE @@ -72,6 +73,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Fri Oct 04 2019 Lars Karlitski - 3-1 +- new upstream release: 3 + * Wed Sep 18 2019 Martin Sehnoutka - 2-1 - new upstream release: 2 diff --git a/sources b/sources index 2fc7868..62b6ff9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (2.tar.gz) = 89debb8504dd5cb8cd4f07aad3dbfbb3ce5577a6b9267f862b214a18c2e24b3a16fc5b11d801294ef58c3f0e110bebda0753a9c1ba7d322180a386e75b29335a +SHA512 (3.tar.gz) = cc69f022ac5d6cbe2e37d11f750db8e7dfb2c9df2847b4f4a0f0fcfd3c4c1e1fb96fac21f8d9b36662c4d8bc597caf285bd822c7209111a9cae3c6cda57f46f7 From 910ee65ce214a17cc2bf6cd5ac0891d07346e0c4 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Wed, 16 Oct 2019 15:36:46 +0100 Subject: [PATCH 03/30] [packit] 4 upstream release Upstream tag: 4 Upstream commit: f87e1bfb9887462f5a193c80422e59e653b5d52a Signed-off-by: Tom Gundersen --- .gitignore | 1 + .packit.yaml | 7 ++++++- osbuild.spec | 5 ++++- sources | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 815fd85..9eb022d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /1.tar.gz /2.tar.gz /3.tar.gz +/4.tar.gz diff --git a/.packit.yaml b/.packit.yaml index ce4c982..2045f18 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -13,6 +13,7 @@ jobs: 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) @@ -25,7 +26,11 @@ jobs: trigger: release metadata: dist-git-branch: master - # The same as above only for f30 + # The same as above only for f31 + - job: propose_downstream + trigger: release + metadata: + dist-git-branch: f31 - job: propose_downstream trigger: release metadata: diff --git a/osbuild.spec b/osbuild.spec index 4748672..ff7e366 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -2,7 +2,7 @@ %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 3 +Version: 4 Release: 1%{?dist} License: ASL 2.0 @@ -73,6 +73,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Wed Oct 16 2019 Tom Gundersen - 4-1 +- new upstream release: 4 + * Fri Oct 04 2019 Lars Karlitski - 3-1 - new upstream release: 3 diff --git a/sources b/sources index 62b6ff9..2f00f8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.tar.gz) = cc69f022ac5d6cbe2e37d11f750db8e7dfb2c9df2847b4f4a0f0fcfd3c4c1e1fb96fac21f8d9b36662c4d8bc597caf285bd822c7209111a9cae3c6cda57f46f7 +SHA512 (4.tar.gz) = e66d5c771839fb674e3513361f89c141e2b2f1f64a341cf93a7d6ba98b09e5f12ba255c3fe6b6626b9e7083e450366d35017a638ba8c55d8988ae2209ef4253c From 058fc5fbea4236e1a8a46a378113246e3346eb5c Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Wed, 30 Oct 2019 18:59:40 +0100 Subject: [PATCH 04/30] [packit] 5 upstream release Upstream tag: 5 Upstream commit: 1f526477d27ead42360c5bf2e499f3d0f90c0ef2 Signed-off-by: Lars Karlitski --- .gitignore | 1 + osbuild.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9eb022d..965ca20 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /2.tar.gz /3.tar.gz /4.tar.gz +/5.tar.gz diff --git a/osbuild.spec b/osbuild.spec index ff7e366..404a289 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -2,7 +2,7 @@ %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 4 +Version: 5 Release: 1%{?dist} License: ASL 2.0 @@ -73,6 +73,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Wed Oct 30 2019 Lars Karlitski - 5-1 +- new upstream release: 5 + * Wed Oct 16 2019 Tom Gundersen - 4-1 - new upstream release: 4 diff --git a/sources b/sources index 2f00f8d..43c3172 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.tar.gz) = e66d5c771839fb674e3513361f89c141e2b2f1f64a341cf93a7d6ba98b09e5f12ba255c3fe6b6626b9e7083e450366d35017a638ba8c55d8988ae2209ef4253c +SHA512 (5.tar.gz) = 95cafa010f8f223a568ece8bb331fcbcbef350a87922965c97cdcd9dd40a27f354944609fb50ead0a8a47ccbd3768b779601928b47eca331fa50e2b5567bb2f0 From 59f3bb5370fbef3fd04df775fbde28a88f080db3 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 30 Nov 2019 15:38:11 +0100 Subject: [PATCH 05/30] 6 upstream release Signed-off-by: Tom Gundersen --- .gitignore | 1 + osbuild.spec | 16 ++++++++++++---- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 965ca20..065a1f4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /3.tar.gz /4.tar.gz /5.tar.gz +/6.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 404a289..ed9c054 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,9 +1,9 @@ %global pypi_name osbuild -%global pkgdir %{_prefix}/lib/%{pypi_name} +%global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 5 -Release: 1%{?dist} +Version: 6 +Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/osbuild/osbuild @@ -54,7 +54,12 @@ 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/ -install -p -m 0755 osbuild-run %{buildroot}%{pkgdir}/ +mkdir -p %{buildroot}%{pkgdir}/runners +install -p -m 0755 $(find runners -type f) %{buildroot}%{pkgdir}/runners + +# mount points for bind mounting the osbuild library +mkdir -p %{buildroot}%{pkgdir}/stages/osbuild +mkdir -p %{buildroot}%{pkgdir}/assemblers/osbuild %check exit 0 @@ -73,6 +78,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Sat Nov 30 2019 Tom Gundersen - 6-1 +- new upstream release: 6 + * Wed Oct 30 2019 Lars Karlitski - 5-1 - new upstream release: 5 diff --git a/sources b/sources index 43c3172..0ed311c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.tar.gz) = 95cafa010f8f223a568ece8bb331fcbcbef350a87922965c97cdcd9dd40a27f354944609fb50ead0a8a47ccbd3768b779601928b47eca331fa50e2b5567bb2f0 +SHA512 (6.tar.gz) = ad4c7cc76c0b1007dd6f410771a0269265058bd31214dd562f8ce5473f191ab3b229e89add39853ea82b7ba489c1df576f9c2c80119c6c2ccda37131483b1fff From 18d8e3ac5eadf47f87d674d32f495e30db708cb6 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Mon, 16 Dec 2019 00:19:35 +0000 Subject: [PATCH 06/30] [packit] 7 upstream release Upstream tag: 7 Upstream commit: 5b77048e9753b36005704bf44dfcfb773d207d3b Signed-off-by: Packit Service --- .gitignore | 1 + README.packit | 1 + osbuild.spec | 13 ++++++++++++- sources | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 065a1f4..2b55d20 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /4.tar.gz /5.tar.gz /6.tar.gz +/7.tar.gz diff --git a/README.packit b/README.packit index c3065d4..a050a5f 100644 --- a/README.packit +++ b/README.packit @@ -1,2 +1,3 @@ This repository is maintained by packit. https://packit.dev/ +The file was generated using packit 0.7.2.dev96+g8ed72cd. diff --git a/osbuild.spec b/osbuild.spec index ed9c054..513dce7 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -2,7 +2,7 @@ %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 6 +Version: 7 Release: 1%{?dist} License: ASL 2.0 @@ -61,6 +61,14 @@ install -p -m 0755 $(find runners -type f) %{buildroot}%{pkgdir}/runners mkdir -p %{buildroot}%{pkgdir}/stages/osbuild mkdir -p %{buildroot}%{pkgdir}/assemblers/osbuild +# install host runner +%if 0%{?fc30} +ln -s org.osbuild.fedora30 %{buildroot}%{pkgdir}/runners/org.osbuild.host +%endif +%if 0%{?el8} +ln -s org.osbuild.rhel82 %{buildroot}%{pkgdir}/runners/org.osbuild.host +%endif + %check exit 0 # We have some integration tests, but those require running a VM, so that would @@ -78,6 +86,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Mon Dec 16 2019 Packit Service - 7-1 +- new upstream release: 7 + * Sat Nov 30 2019 Tom Gundersen - 6-1 - new upstream release: 6 diff --git a/sources b/sources index 0ed311c..1fad49b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6.tar.gz) = ad4c7cc76c0b1007dd6f410771a0269265058bd31214dd562f8ce5473f191ab3b229e89add39853ea82b7ba489c1df576f9c2c80119c6c2ccda37131483b1fff +SHA512 (7.tar.gz) = 24b52f6a8b9a0b3710a672554cd3af232d2f01e1e04735191c7773df17c8a0da6821afacf620eed5be527bbcf7d2f3d43bb7aea751c3e32fd1705de760d295bf From aafcd86209b350f5d1f345acf036d58365f43384 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 20:34:16 +0000 Subject: [PATCH 07/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- osbuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osbuild.spec b/osbuild.spec index 513dce7..75febff 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -3,7 +3,7 @@ Name: %{pypi_name} Version: 7 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://github.com/osbuild/osbuild @@ -86,6 +86,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 16 2019 Packit Service - 7-1 - new upstream release: 7 From f7e04adaf58d9f42269513251e43e3e15730cf08 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 24 Feb 2020 12:59:13 +0100 Subject: [PATCH 08/30] 8 upstream release Signed-off-by: Tom Gundersen --- osbuild.spec | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/osbuild.spec b/osbuild.spec index 75febff..4080629 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,14 +1,19 @@ +%global forgeurl https://github.com/osbuild/osbuild + +Version: 8 + +%forgemeta + %global pypi_name osbuild %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 7 -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 @@ -16,6 +21,7 @@ BuildRequires: python3-devel Requires: bash Requires: coreutils +Requires: curl Requires: dnf Requires: e2fsprogs Requires: glibc @@ -40,7 +46,7 @@ Summary: %{summary} A build system for OS images %prep -%autosetup -n %{name}-%{version} +%forgesetup %build %py3_build @@ -55,7 +61,10 @@ 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 +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 points for bind mounting the osbuild library mkdir -p %{buildroot}%{pkgdir}/stages/osbuild @@ -65,6 +74,12 @@ mkdir -p %{buildroot}%{pkgdir}/assemblers/osbuild %if 0%{?fc30} ln -s org.osbuild.fedora30 %{buildroot}%{pkgdir}/runners/org.osbuild.host %endif +%if 0%{?fc31} +ln -s org.osbuild.fedora31 %{buildroot}%{pkgdir}/runners/org.osbuild.host +%endif +%if 0%{?fc32} +ln -s org.osbuild.fedora32 %{buildroot}%{pkgdir}/runners/org.osbuild.host +%endif %if 0%{?el8} ln -s org.osbuild.rhel82 %{buildroot}%{pkgdir}/runners/org.osbuild.host %endif From c8a262b0be14fb5f865f3445f0e033733887aee2 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 24 Feb 2020 13:09:06 +0100 Subject: [PATCH 09/30] 8: new sources Signed-off-by: Tom Gundersen --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2b55d20..89a2778 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /5.tar.gz /6.tar.gz /7.tar.gz +/osbuild-8.tar.gz diff --git a/sources b/sources index 1fad49b..c1f3344 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (7.tar.gz) = 24b52f6a8b9a0b3710a672554cd3af232d2f01e1e04735191c7773df17c8a0da6821afacf620eed5be527bbcf7d2f3d43bb7aea751c3e32fd1705de760d295bf +SHA512 (osbuild-8.tar.gz) = c553f6599149e29f3d299a22e9aa543163af38cdd0a5e17530c89c536436c1bc0278166a3bea036b470d5ce7beca5cfca936c5e77c21661c26a0ca85e4c14304 From 96f875e749af7516485f92e9b1b79bee0eabbc4e Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 5 Mar 2020 13:35:49 +0100 Subject: [PATCH 10/30] 9 upstream release - Remove host runner links, now being auto-detected - Cleanup spec file to not mix spaces and tabs --- .gitignore | 1 + osbuild.spec | 23 +++++++---------------- sources | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 89a2778..0f57b26 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /6.tar.gz /7.tar.gz /osbuild-8.tar.gz +/osbuild-9.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 4080629..25425cb 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,6 @@ -%global forgeurl https://github.com/osbuild/osbuild +%global forgeurl https://github.com/osbuild/osbuild -Version: 8 +Version: 9 %forgemeta @@ -70,20 +70,6 @@ install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources mkdir -p %{buildroot}%{pkgdir}/stages/osbuild mkdir -p %{buildroot}%{pkgdir}/assemblers/osbuild -# install host runner -%if 0%{?fc30} -ln -s org.osbuild.fedora30 %{buildroot}%{pkgdir}/runners/org.osbuild.host -%endif -%if 0%{?fc31} -ln -s org.osbuild.fedora31 %{buildroot}%{pkgdir}/runners/org.osbuild.host -%endif -%if 0%{?fc32} -ln -s org.osbuild.fedora32 %{buildroot}%{pkgdir}/runners/org.osbuild.host -%endif -%if 0%{?el8} -ln -s org.osbuild.rhel82 %{buildroot}%{pkgdir}/runners/org.osbuild.host -%endif - %check exit 0 # We have some integration tests, but those require running a VM, so that would @@ -101,6 +87,11 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Mar 5 2020 Christian Kellner - 9-1 +- new upstream release: 8 +- 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 - 7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index c1f3344..c7441cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-8.tar.gz) = c553f6599149e29f3d299a22e9aa543163af38cdd0a5e17530c89c536436c1bc0278166a3bea036b470d5ce7beca5cfca936c5e77c21661c26a0ca85e4c14304 +SHA512 (osbuild-9.tar.gz) = f20fd6c6dbca2cb3b0b88614558495e7f97644a25d2bc8af1af3e15e52f49eacbdb3e3eb93bda19a4085b5a8e086e56442b1cb7e2fd1e51204efe44b4191bea6 From c91f4a19eced4b5b4a9e0f4cf9f606824cce0e32 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 19 Mar 2020 09:58:16 +0100 Subject: [PATCH 11/30] 10 upstream release Following changes: - build and include man pages, this adds 'make' and 'python3-docutils' to the build requirements - add NEWS.md file with the release notes Minor whitespace cleanups and correction of the previous changelog entry that had the wrong version number. --- .gitignore | 1 + osbuild.spec | 53 ++++++++++++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 0f57b26..d4ae143 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /7.tar.gz /osbuild-8.tar.gz /osbuild-9.tar.gz +/osbuild-10.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 25425cb..22b4dc0 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/osbuild/osbuild -Version: 9 +Version: 10 %forgemeta @@ -17,21 +17,23 @@ Source0: %{forgesource} BuildArch: noarch Summary: A build system for OS images +BuildRequires: make BuildRequires: python3-devel +BuildRequires: python3-docutils -Requires: bash -Requires: coreutils -Requires: curl -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: coreutils +Requires: curl +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} @@ -42,7 +44,7 @@ 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 %prep @@ -50,6 +52,7 @@ A build system for OS images %build %py3_build +make man %install %py3_install @@ -70,6 +73,12 @@ install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources mkdir -p %{buildroot}%{pkgdir}/stages/osbuild mkdir -p %{buildroot}%{pkgdir}/assemblers/osbuild +# 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 # We have some integration tests, but those require running a VM, so that would @@ -78,17 +87,25 @@ exit 0 %files %license LICENSE %{_bindir}/osbuild +%{_mandir}/man1/%{name}.1* +%{_mandir}/man5/%{name}-manifest.5* %{pkgdir} -%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}/ %changelog +* Thu Mar 19 2020 Christian Kellner - 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 - 9-1 -- new upstream release: 8 +- new upstream release: 9 - Remove host runner link, it now is being auto-detected - Cleanup use of mixed use of spaces/tabs diff --git a/sources b/sources index c7441cb..2261e56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-9.tar.gz) = f20fd6c6dbca2cb3b0b88614558495e7f97644a25d2bc8af1af3e15e52f49eacbdb3e3eb93bda19a4085b5a8e086e56442b1cb7e2fd1e51204efe44b4191bea6 +SHA512 (osbuild-10.tar.gz) = 0004ee8009ab7186e54c4b1c579a384e06fb3ca6be948b0050965ad341bdfaa73c269832033be3520761da920303e1645aa79c6048accf7670813b172b966622 From fda246374ed78fb3295ce6d144490b154219fbe6 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 2 Apr 2020 10:29:02 +0200 Subject: [PATCH 12/30] ci: add smoke test and enable gating Add a simple smoke test that currently just executes osbuild with the '--help' option to check that it can run at all. Gate for rawhide (via bodhi_update_push_stable) and for stable (via bodhi_update_push_testing) on a minimum of dist checks as well as the smoke test above. --- gating.yaml | 18 ++++++++++++++++++ tests/tests.yml | 17 +++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 gating.yaml create mode 100644 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..d566cae --- /dev/null +++ b/gating.yaml @@ -0,0 +1,18 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +rules: + - !PassingTestCaseRule {test_case_name: dist.rpmgrill.spec-file-sanity} + - !PassingTestCaseRule {test_case_name: dist.python-versions} + - !PassingTestCaseRule {test_case_name: dist.depcheck} + - !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: dist.rpmgrill.spec-file-sanity} + - !PassingTestCaseRule {test_case_name: dist.python-versions} + - !PassingTestCaseRule {test_case_name: dist.depcheck} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..06313a0 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,17 @@ +--- +- 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 + From 24d24233f4f8b969971d49557740110e3e5bcdbd Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 2 Apr 2020 13:58:45 +0200 Subject: [PATCH 13/30] 11 upstream release Turn of dependency generator for internal components since those were generating a dependency for python3.6 due to the rhel runner. --- .gitignore | 1 + osbuild.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d4ae143..b604c05 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /osbuild-8.tar.gz /osbuild-9.tar.gz /osbuild-10.tar.gz +/osbuild-11.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 22b4dc0..f8e8c44 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/osbuild/osbuild -Version: 10 +Version: 11 %forgemeta @@ -35,6 +35,12 @@ Requires: tar Requires: util-linux Requires: python3-%{pypi_name} +# 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} %description @@ -98,6 +104,10 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Apr 2 2020 Christian Kellner - 11-1 +- new upstream release 11 +- Turn of dependency generator for internal components + * Thu Mar 19 2020 Christian Kellner - 10-1 - new upstream release 10 - build and include man pages, this adds 'make' and 'python3-docutils' diff --git a/sources b/sources index 2261e56..85d20a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-10.tar.gz) = 0004ee8009ab7186e54c4b1c579a384e06fb3ca6be948b0050965ad341bdfaa73c269832033be3520761da920303e1645aa79c6048accf7670813b172b966622 +SHA512 (osbuild-11.tar.gz) = b58b2783ae525a65d5ce78faa62fda22ae912f7750e325b8916fa4e81a42e3eaaeb82a2a7c82665d5731aeb2b83344a950d47557220b4814f50eeb7f9f908ab4 From b2fbab54866c0fdf2d6b8db4e785fb85d6058e41 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 2 Apr 2020 15:06:57 +0200 Subject: [PATCH 14/30] tests: try to actually build an image Run osbuild and try to build one of the samples provided, i.e. source/samples/base-rpm-qcow2.json. --- tests/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index 06313a0..30c32b0 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -14,4 +14,6 @@ - smoke: dir: smoke run: osbuild --help - + - image: + dir: . + run: osbuild source/samples/base-rpm-qcow2.json From e88a07e6b18cb2689a6ae34344b21c677d7814bf Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 2 Apr 2020 15:02:09 +0200 Subject: [PATCH 15/30] gating: drop dist.depcheck Although mentioned in the docs, this check is obsolete[1] but the replacement[2] seems to be not running as well, so just drop that check. [1] https://fedoraproject.org/wiki/Taskotron/Tasks/dist.depcheck [2] https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmdeplint --- gating.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index d566cae..77f3d4c 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,7 +5,6 @@ decision_context: bodhi_update_push_testing rules: - !PassingTestCaseRule {test_case_name: dist.rpmgrill.spec-file-sanity} - !PassingTestCaseRule {test_case_name: dist.python-versions} - - !PassingTestCaseRule {test_case_name: dist.depcheck} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} --- !Policy product_versions: @@ -14,5 +13,4 @@ decision_context: bodhi_update_push_stable rules: - !PassingTestCaseRule {test_case_name: dist.rpmgrill.spec-file-sanity} - !PassingTestCaseRule {test_case_name: dist.python-versions} - - !PassingTestCaseRule {test_case_name: dist.depcheck} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 926c5e271b89a5756e251ceea59ab3311ebaafed Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 15 Apr 2020 21:12:04 +0200 Subject: [PATCH 16/30] tests: adjust image test name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The sample file got renamed: base-rpm-qcow2.json → base-qcow2.json Do the same in the test or gating will file. --- tests/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index 30c32b0..74272b3 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -16,4 +16,4 @@ run: osbuild --help - image: dir: . - run: osbuild source/samples/base-rpm-qcow2.json + run: osbuild source/samples/base-qcow2.json From 7d308c7f7faa9053c83c9d5fa619d3b0cd829d50 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 15 Apr 2020 20:44:24 +0200 Subject: [PATCH 17/30] 12 upstream release Specify the exact version in the 'python3-osbuild' requirement to avoid the library and the main binary being out of sync. Add osbuild-ostree sub-package with the necessary bits to create OSTree based images. --- .gitignore | 1 + osbuild.spec | 32 ++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b604c05..cdffad8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /osbuild-9.tar.gz /osbuild-10.tar.gz /osbuild-11.tar.gz +/osbuild-12.tar.gz diff --git a/osbuild.spec b/osbuild.spec index f8e8c44..716cb24 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/osbuild/osbuild -Version: 11 +Version: 12 %forgemeta @@ -33,7 +33,7 @@ Requires: systemd Requires: systemd-container Requires: tar Requires: util-linux -Requires: python3-%{pypi_name} +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 @@ -53,6 +53,16 @@ Summary: %{summary} %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 %forgesetup @@ -96,6 +106,11 @@ exit 0 %{_mandir}/man1/%{name}.1* %{_mandir}/man5/%{name}-manifest.5* %{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} %license LICENSE @@ -103,7 +118,20 @@ exit 0 %{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 +* Wed Apr 15 2020 Christian Kellner - 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 - 11-1 - new upstream release 11 - Turn of dependency generator for internal components diff --git a/sources b/sources index 85d20a5..d951f8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-11.tar.gz) = b58b2783ae525a65d5ce78faa62fda22ae912f7750e325b8916fa4e81a42e3eaaeb82a2a7c82665d5731aeb2b83344a950d47557220b4814f50eeb7f9f908ab4 +SHA512 (osbuild-12.tar.gz) = 9dc2a151ac337bd945cbaa2566f2789bc1d019d916c8a47b66bbd21f9e19f4c56276508fe6a7871bc52d40795078336ad4b56de3fd50f63222dd41303e11619d From 4a7f089bb3f39b5f5bc234f242ef3f8bf3b2e150 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 6 May 2020 20:31:01 +0200 Subject: [PATCH 18/30] 14 upstream release Remove the /usr/lib/osbuild/{assemblers, stages}/osbuild dirs. NB: Release 13 got skipped since it replaced aforementioned directories with symlinks and that would have required a %pretrans script. osbuild was adjusted to use a different mechanism to locate the osbuild module inside the container rendering the symlinks (or 'osbuild' directories) obsolete. --- .gitignore | 2 ++ osbuild.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cdffad8..085e9ae 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /osbuild-10.tar.gz /osbuild-11.tar.gz /osbuild-12.tar.gz +/osbuild-13.tar.gz +/osbuild-14.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 716cb24..3fca4e4 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/osbuild/osbuild -Version: 12 +Version: 14 %forgemeta @@ -85,9 +85,8 @@ 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 -# mount points for bind mounting the osbuild library -mkdir -p %{buildroot}%{pkgdir}/stages/osbuild -mkdir -p %{buildroot}%{pkgdir}/assemblers/osbuild +# mount point for bind mounting the osbuild library +mkdir -p %{buildroot}%{pkgdir}/osbuild # documentation mkdir -p %{buildroot}%{_mandir}/man1 @@ -125,6 +124,11 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Wed May 6 2020 Christian Kellner - 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 - 12-1 - new upstream release 12 - Specify the exact version in the 'python3-osbuild' requirement diff --git a/sources b/sources index d951f8a..496b3fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-12.tar.gz) = 9dc2a151ac337bd945cbaa2566f2789bc1d019d916c8a47b66bbd21f9e19f4c56276508fe6a7871bc52d40795078336ad4b56de3fd50f63222dd41303e11619d +SHA512 (osbuild-14.tar.gz) = fa474cdd8380b042a86be6d6b0202e58de17219b75547dc46b91d61f6e2e631f1ac1a93364046485167d55c23276d0827930ef141278346743f7097ae8e362d8 From 3a5d1e994d7f13d734177a2cb94da54fb5bd7b15 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 6 May 2020 21:06:45 +0200 Subject: [PATCH 19/30] Install schemata Install schemata to /osbuild/schemas and include a symlink to it in /usr/lib/osbuild/schemas. This is needed otherwise schema validation will not work. --- osbuild.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/osbuild.spec b/osbuild.spec index 3fca4e4..27eddf3 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -8,7 +8,7 @@ Version: 14 %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: %{forgeurl} @@ -88,6 +88,11 @@ 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 @@ -104,6 +109,7 @@ exit 0 %{_bindir}/osbuild %{_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 @@ -124,6 +130,10 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Wed May 6 2020 Christian Kellner - 14-2 +- Install schemata to /osbuild/schemas and include a + symlink to it in /usr/lib/osbuild/schemas + * Wed May 6 2020 Christian Kellner - 14-1 - new upstream release 14 - The directories /usr/lib/osbuild/{assemblers, stages}/osbuild From a07f776641306360d73e364547bcdc31e35c03b3 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 21 May 2020 10:41:59 +0200 Subject: [PATCH 20/30] gating: don't gate on dist.* Taskotron is End-of-Life since 2020-04-30 and thus we don't have any dist.* checks; at least for now. Remove it. https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TRQZCXI5IZH3GLJTCO56SMBX5UY6J6LL/ --- gating.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gating.yaml b/gating.yaml index 77f3d4c..f2c6454 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,14 +3,10 @@ product_versions: - fedora-* decision_context: bodhi_update_push_testing rules: - - !PassingTestCaseRule {test_case_name: dist.rpmgrill.spec-file-sanity} - - !PassingTestCaseRule {test_case_name: dist.python-versions} - !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: dist.rpmgrill.spec-file-sanity} - - !PassingTestCaseRule {test_case_name: dist.python-versions} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 036cd44b00a342a7a88cfb9f481a599fa61f7a0b Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 21 May 2020 10:44:15 +0200 Subject: [PATCH 21/30] 15 upstream release no spec file changes. --- .gitignore | 1 + osbuild.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 085e9ae..50d47a9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /osbuild-12.tar.gz /osbuild-13.tar.gz /osbuild-14.tar.gz +/osbuild-15.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 27eddf3..5616bb1 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/osbuild/osbuild -Version: 14 +Version: 15 %forgemeta @@ -8,7 +8,7 @@ Version: 14 %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Release: 2%{?dist} +Release: 1%{?dist} License: ASL 2.0 URL: %{forgeurl} @@ -130,6 +130,9 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Thu May 21 2020 Christian Kellner - 15-1 +- new upstream release 15 + * Wed May 6 2020 Christian Kellner - 14-2 - Install schemata to /osbuild/schemas and include a symlink to it in /usr/lib/osbuild/schemas diff --git a/sources b/sources index 496b3fb..e48deb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-14.tar.gz) = fa474cdd8380b042a86be6d6b0202e58de17219b75547dc46b91d61f6e2e631f1ac1a93364046485167d55c23276d0827930ef141278346743f7097ae8e362d8 +SHA512 (osbuild-15.tar.gz) = 408c1327ea4a8281c6e90c96ffef045235e739352575d28ac63dfbbb1adccfb11f8a4a9ba9ae4aa326be89a0c3aab2607610361623e45ec71dfe44d07e0af317 From c038953185c9e674c7488267b3bdc9852f91f11e Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 26 May 2020 19:05:40 +0200 Subject: [PATCH 22/30] Patch added to allow new files source format 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 --- osbuild.spec | 10 ++++++- sources-fix-break-when-secrets-is-None.patch | 28 ++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 sources-fix-break-when-secrets-is-None.patch diff --git a/osbuild.spec b/osbuild.spec index 5616bb1..d17c637 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -8,12 +8,14 @@ Version: 15 %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: %{forgeurl} Source0: %{forgesource} +# PR416 (merged): https://github.com/osbuild/osbuild/pull/416 +Patch0: sources-fix-break-when-secrets-is-None.patch BuildArch: noarch Summary: A build system for OS images @@ -65,6 +67,7 @@ to build OSTree based images. %prep %forgesetup +%patch0 -p1 %build %py3_build @@ -130,6 +133,11 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Tue May 26 2020 Christian Kellner - 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 - 15-1 - new upstream release 15 diff --git a/sources-fix-break-when-secrets-is-None.patch b/sources-fix-break-when-secrets-is-None.patch new file mode 100644 index 0000000..a206080 --- /dev/null +++ b/sources-fix-break-when-secrets-is-None.patch @@ -0,0 +1,28 @@ +From 9cbedc049671bf2a2eb50caa2759d91acbf7c7f5 Mon Sep 17 00:00:00 2001 +From: Jacob Kozol +Date: Fri, 22 May 2020 19:11:46 +0200 +Subject: [PATCH] sources: fix break when secrets is None + +When the urls' secrets field is not set, an error is thrown when trying +to get the name of the secrets. The secrets now have a default value of +{} when they are checked for the name. +--- + sources/org.osbuild.files | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sources/org.osbuild.files b/sources/org.osbuild.files +index 0444d59..34d5334 100755 +--- a/sources/org.osbuild.files ++++ b/sources/org.osbuild.files +@@ -110,7 +110,7 @@ def main(options, checksums, cache, output): + try: + if isinstance(urls[checksum], dict): + # check if url needs rhsm secrets +- if urls[checksum].get("secrets").get("name") == "org.osbuild.rhsm": ++ if urls[checksum].get("secrets", {}).get("name") == "org.osbuild.rhsm": + # rhsm secrets only need to be retrieved once and can then be reused + if rhsm_secrets is None: + try: +-- +2.26.2 + From 2028c5016a468eaa446c163e04fb0b27b61cbb7b Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 4 Jun 2020 17:13:11 +0200 Subject: [PATCH 23/30] 16 upstream release Drop sources-fix-break-when-secrets-is-None.patch patch included upstream. --- .gitignore | 1 + osbuild.spec | 12 +++++---- sources | 2 +- sources-fix-break-when-secrets-is-None.patch | 28 -------------------- 4 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 sources-fix-break-when-secrets-is-None.patch diff --git a/.gitignore b/.gitignore index 50d47a9..b1ff089 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /osbuild-13.tar.gz /osbuild-14.tar.gz /osbuild-15.tar.gz +/osbuild-16.tar.gz diff --git a/osbuild.spec b/osbuild.spec index d17c637..7c6367e 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/osbuild/osbuild -Version: 15 +Version: 16 %forgemeta @@ -8,14 +8,12 @@ Version: 15 %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Release: 2%{?dist} +Release: 1%{?dist} License: ASL 2.0 URL: %{forgeurl} Source0: %{forgesource} -# PR416 (merged): https://github.com/osbuild/osbuild/pull/416 -Patch0: sources-fix-break-when-secrets-is-None.patch BuildArch: noarch Summary: A build system for OS images @@ -67,7 +65,6 @@ to build OSTree based images. %prep %forgesetup -%patch0 -p1 %build %py3_build @@ -133,6 +130,11 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Thu Jun 4 2020 Christian Kellner - 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 - 15-2 - Add a patch to allow org.osbuild.files source in the new format but without actually containing the secrets key. diff --git a/sources b/sources index e48deb7..12cb433 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-15.tar.gz) = 408c1327ea4a8281c6e90c96ffef045235e739352575d28ac63dfbbb1adccfb11f8a4a9ba9ae4aa326be89a0c3aab2607610361623e45ec71dfe44d07e0af317 +SHA512 (osbuild-16.tar.gz) = 21041af1b617ef30ae7e6e27a986d094a13bcbc3a4d52d69272f24a88c49a0d4b5f57e4d54a7dd322053d607a2c859ff7586f0392d0e1efae163a9bfe6b5c065 diff --git a/sources-fix-break-when-secrets-is-None.patch b/sources-fix-break-when-secrets-is-None.patch deleted file mode 100644 index a206080..0000000 --- a/sources-fix-break-when-secrets-is-None.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9cbedc049671bf2a2eb50caa2759d91acbf7c7f5 Mon Sep 17 00:00:00 2001 -From: Jacob Kozol -Date: Fri, 22 May 2020 19:11:46 +0200 -Subject: [PATCH] sources: fix break when secrets is None - -When the urls' secrets field is not set, an error is thrown when trying -to get the name of the secrets. The secrets now have a default value of -{} when they are checked for the name. ---- - sources/org.osbuild.files | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sources/org.osbuild.files b/sources/org.osbuild.files -index 0444d59..34d5334 100755 ---- a/sources/org.osbuild.files -+++ b/sources/org.osbuild.files -@@ -110,7 +110,7 @@ def main(options, checksums, cache, output): - try: - if isinstance(urls[checksum], dict): - # check if url needs rhsm secrets -- if urls[checksum].get("secrets").get("name") == "org.osbuild.rhsm": -+ if urls[checksum].get("secrets", {}).get("name") == "org.osbuild.rhsm": - # rhsm secrets only need to be retrieved once and can then be reused - if rhsm_secrets is None: - try: --- -2.26.2 - From 44cef34e6a663d0a48a30e144a8c9cb770af034e Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 23 Jun 2020 20:23:31 +0200 Subject: [PATCH 24/30] 18 upstream release All RHEL runners use platform-python now. Add a custom SELinux policy, shipped in a new osbuild-selinux subpackage, to allow setting labels unknown to the host. --- .gitignore | 3 +++ osbuild.spec | 9 +++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b1ff089..6e33fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ /osbuild-14.tar.gz /osbuild-15.tar.gz /osbuild-16.tar.gz +/osbuild-17.tar.gz +/osbuild-18.tar.gz + diff --git a/osbuild.spec b/osbuild.spec index 7c6367e..2c0fa63 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,6 +1,5 @@ %global forgeurl https://github.com/osbuild/osbuild - -Version: 16 +Version: 18 %forgemeta @@ -130,6 +129,12 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Tue Jun 23 2020 Christian Kellner - 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 - 16-1 - new upstream release 16 - Drop sources-fix-break-when-secrets-is-None.patch included in diff --git a/sources b/sources index 12cb433..6e9c161 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-16.tar.gz) = 21041af1b617ef30ae7e6e27a986d094a13bcbc3a4d52d69272f24a88c49a0d4b5f57e4d54a7dd322053d607a2c859ff7586f0392d0e1efae163a9bfe6b5c065 +SHA512 (osbuild-18.tar.gz) = 0fda0cde9da80828069e8f1e7a9fd77d356f54ef95a19308b9dd46ab6e3411d1908a7e8d1f5ec7011711ee163e99b9c64ea851a494d272fa19599eccedda88dc \ No newline at end of file From 1b9ae1e305b8663251e5fa43b92ebd720a18ed0a Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Fri, 26 Jun 2020 13:54:26 +0200 Subject: [PATCH 25/30] Add a patch to not use floats in sources Do not pass floats to curl, because the format of the float is locale specific (comma vs dot) but curl only likes dots. See the patch for details. --- no-floats-in-sources.patch | 53 ++++++++++++++++++++++++++++++++++++++ osbuild.spec | 8 +++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 no-floats-in-sources.patch diff --git a/no-floats-in-sources.patch b/no-floats-in-sources.patch new file mode 100644 index 0000000..61ce923 --- /dev/null +++ b/no-floats-in-sources.patch @@ -0,0 +1,53 @@ +From 7b0db90c76c6b0de6a4d481e63450e8f0d1a1d9d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Budai?= +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 + diff --git a/osbuild.spec b/osbuild.spec index 2c0fa63..b5321a0 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -7,12 +7,13 @@ Version: 18 %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: %{forgeurl} Source0: %{forgesource} +Patch0: no-floats-in-sources.patch BuildArch: noarch Summary: A build system for OS images @@ -64,6 +65,7 @@ to build OSTree based images. %prep %forgesetup +%patch0 -p1 %build %py3_build @@ -129,6 +131,10 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Fri Jun 26 2020 Christian Kellner - 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 - 18-1 - Upstream release 18 - Add custom SELinux policy that lets osbuild set labels inside From 7a935cefc7e9ec2e50102e8dcd2946cbc8ac59b3 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Fri, 26 Jun 2020 14:29:38 +0200 Subject: [PATCH 26/30] sources: fix missing newline --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 6e9c161..d486892 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-18.tar.gz) = 0fda0cde9da80828069e8f1e7a9fd77d356f54ef95a19308b9dd46ab6e3411d1908a7e8d1f5ec7011711ee163e99b9c64ea851a494d272fa19599eccedda88dc \ No newline at end of file +SHA512 (osbuild-18.tar.gz) = 0fda0cde9da80828069e8f1e7a9fd77d356f54ef95a19308b9dd46ab6e3411d1908a7e8d1f5ec7011711ee163e99b9c64ea851a494d272fa19599eccedda88dc From 0720c5d0cad3db3d3f19e69eafefdf7f0b6c768f Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Fri, 7 Aug 2020 13:43:35 +0200 Subject: [PATCH 27/30] 19 upstream release Sandboxing mechanism changed from systemd-nspawn to bubblewrap, change requirements accordingly. Drop no-floats-in-sources.patch, included in the release. --- .gitignore | 1 + no-floats-in-sources.patch | 53 -------------------------------------- osbuild.spec | 16 ++++++++---- sources | 2 +- 4 files changed, 13 insertions(+), 59 deletions(-) delete mode 100644 no-floats-in-sources.patch diff --git a/.gitignore b/.gitignore index 6e33fb8..4a58897 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ /osbuild-16.tar.gz /osbuild-17.tar.gz /osbuild-18.tar.gz +/osbuild-19.tar.gz diff --git a/no-floats-in-sources.patch b/no-floats-in-sources.patch deleted file mode 100644 index 61ce923..0000000 --- a/no-floats-in-sources.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7b0db90c76c6b0de6a4d481e63450e8f0d1a1d9d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Budai?= -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 - diff --git a/osbuild.spec b/osbuild.spec index b5321a0..9e59ed9 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,5 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild -Version: 18 +%global selinuxtype targeted + +Version: 19 %forgemeta @@ -7,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 @@ -22,6 +23,7 @@ BuildRequires: python3-devel BuildRequires: python3-docutils Requires: bash +Requires: bubblewrap Requires: coreutils Requires: curl Requires: dnf @@ -30,7 +32,6 @@ Requires: glibc Requires: policycoreutils Requires: qemu-img Requires: systemd -Requires: systemd-container Requires: tar Requires: util-linux Requires: python3-%{pypi_name} = %{version}-%{release} @@ -65,7 +66,6 @@ to build OSTree based images. %prep %forgesetup -%patch0 -p1 %build %py3_build @@ -131,6 +131,12 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Fri Aug 7 2020 Christian Kellner - 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 - 18-2 - Add patch to not pass floats to curl in the files source https://github.com/osbuild/osbuild/pull/459 diff --git a/sources b/sources index d486892..60886a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-18.tar.gz) = 0fda0cde9da80828069e8f1e7a9fd77d356f54ef95a19308b9dd46ab6e3411d1908a7e8d1f5ec7011711ee163e99b9c64ea851a494d272fa19599eccedda88dc +SHA512 (osbuild-19.tar.gz) = 88d3851b4034930a73dddd175521be58cba5be6bb9a66ebb7264b1f4df1dc1fac3dba480c136e689abf25c651f81ec9241078a90a84fe047e5e78de6165d1b23 From 3279d1f999e925d4b9eadd1039277c454eab3ec3 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 13 Aug 2020 18:45:43 +0200 Subject: [PATCH 28/30] 20 upstream release --- .gitignore | 2 +- osbuild.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4a58897..2f64049 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,4 @@ /osbuild-17.tar.gz /osbuild-18.tar.gz /osbuild-19.tar.gz - +/osbuild-20.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 9e59ed9..ee6b7b5 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 19 +Version: 20 %forgemeta @@ -131,6 +131,9 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Thu Aug 13 2020 Christian Kellner - 20-1 +- Upstream reelase 20 + * Fri Aug 7 2020 Christian Kellner - 19-1 - Upstream release 19 - Drop no-floats-in-sources.patch included in release 19 diff --git a/sources b/sources index 60886a9..dc1c609 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-19.tar.gz) = 88d3851b4034930a73dddd175521be58cba5be6bb9a66ebb7264b1f4df1dc1fac3dba480c136e689abf25c651f81ec9241078a90a84fe047e5e78de6165d1b23 +SHA512 (osbuild-20.tar.gz) = 29a1345fd21bc89fe8b6de920f152753fdec696ff944d86a5d6fdd3ad6e665c49a0b4cf14662d222e630ea032687d97d6551b4f9a08299d959b9e7f1d2c3e66c From 2a8c87aa831d1f69096b9c26aff1948acc929ef4 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 10 Sep 2020 15:01:45 +0200 Subject: [PATCH 29/30] 21 upstream release --- .gitignore | 1 + osbuild.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2f64049..21192a6 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /osbuild-18.tar.gz /osbuild-19.tar.gz /osbuild-20.tar.gz +/osbuild-21.tar.gz diff --git a/osbuild.spec b/osbuild.spec index ee6b7b5..016672e 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 20 +Version: 21 %forgemeta @@ -131,6 +131,9 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Thu Sep 10 2020 Christian Kellner - 21-1 +- Upstream reelase 21 + * Thu Aug 13 2020 Christian Kellner - 20-1 - Upstream reelase 20 diff --git a/sources b/sources index dc1c609..44bae04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-20.tar.gz) = 29a1345fd21bc89fe8b6de920f152753fdec696ff944d86a5d6fdd3ad6e665c49a0b4cf14662d222e630ea032687d97d6551b4f9a08299d959b9e7f1d2c3e66c +SHA512 (osbuild-21.tar.gz) = c99cd0e9699f4523445900ceef5fbac2d799e5a1b88be296c1f4b38a01e2b6f27f8a793a6fab78014598b8290c8dc629a952cda4bbc9b778a7b8b880ab55225a From 05394da2b28ac4b4065f5cfb70c4cf654b5a05a0 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Mon, 12 Oct 2020 15:39:41 +0200 Subject: [PATCH 30/30] 22 upstream release no spec file changes. --- .gitignore | 1 + osbuild.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 21192a6..1fb490b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /osbuild-19.tar.gz /osbuild-20.tar.gz /osbuild-21.tar.gz +/osbuild-22.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 016672e..336fbd0 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 21 +Version: 22 %forgemeta @@ -131,6 +131,9 @@ exit 0 %{pkgdir}/stages/org.osbuild.rpm-ostree %changelog +* Mon Oct 12 2020 Christian Kellner - 22-1 +- Upstream release 22 + * Thu Sep 10 2020 Christian Kellner - 21-1 - Upstream reelase 21 diff --git a/sources b/sources index 44bae04..2aa174b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-21.tar.gz) = c99cd0e9699f4523445900ceef5fbac2d799e5a1b88be296c1f4b38a01e2b6f27f8a793a6fab78014598b8290c8dc629a952cda4bbc9b778a7b8b880ab55225a +SHA512 (osbuild-22.tar.gz) = 76b2efb083b2c372251b20185f76d59336fd3ddb4dfcf9b33f825a9f93c5dd2449ae2321fcdca1d9d3b0fc9f4547e5850d11b7137e92793d766c6e9383cb2703