From 3139453c34d7baf7bd111ad86fd7fc7db17ae13a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sep 11 2023 11:51:21 +0000 Subject: Release mkosi v16 for Hyperscale SIG We add back a setup.py for compat with older setuptools and gate out the py3_test_envvars test if the macro is not defined. We also get rid of the rpmautospec macros as those do not work in CBS. --- diff --git a/add-back-setup.py-file.patch b/add-back-setup.py-file.patch new file mode 100644 index 0000000..ad0ab1c --- /dev/null +++ b/add-back-setup.py-file.patch @@ -0,0 +1,43 @@ +From acf3caf7eb28767185e782815f145e373ca03923 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Fri, 8 Sep 2023 10:28:15 +0200 +Subject: [PATCH] Add back setup.py file + +The pyproject metadata stuff depends on +https://peps.python.org/pep-0621/ for which support is only available +in a recent version of setuptools that isn't available in all distributions +just yet. So let's add back a setup.py file to allow building on older +distributions. +--- + setup.py | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + create mode 100644 setup.py + +diff --git a/setup.py b/setup.py +new file mode 100644 +index 0000000..077691d +--- /dev/null ++++ b/setup.py +@@ -0,0 +1,19 @@ ++#!/usr/bin/python3 ++# SPDX-License-Identifier: LGPL-2.1+ ++ ++from setuptools import setup, find_packages ++ ++setup( ++ name="mkosi", ++ version="16", ++ description="Build Bespoke OS Images", ++ url="https://github.com/systemd/mkosi", ++ maintainer="mkosi contributors", ++ maintainer_email="systemd-devel@lists.freedesktop.org", ++ license="LGPLv2+", ++ python_requires=">=3.9", ++ packages = find_packages(".", exclude=["tests"]), ++ package_data = {"": ['*.conf', 'mkosi.md', 'mkosi.1']}, ++ include_package_data = True, ++ entry_points = { "console_scripts": ["mkosi = mkosi.__main__:main"] }, ++) +-- +2.41.0 + diff --git a/changelog b/changelog index 48756c2..dff9cd8 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* Mon Sep 11 2023 Daan De Meyer - 16.1-1 +- Release v16 for CentOS Hyperscale SIG + * Sun Aug 13 2023 Leif Liddy - 15.1-2 - Require systemd version 254, recommend systemd-nspawn (rhbz#2232233) diff --git a/mkosi.spec b/mkosi.spec index 3627bea..53e80cc 100644 --- a/mkosi.spec +++ b/mkosi.spec @@ -1,12 +1,16 @@ Name: mkosi Version: 16 -Release: %autorelease +Release: 1.1%{?dist} Summary: Create bespoke OS images License: LGPL-2.1-or-later URL: https://github.com/systemd/mkosi Source: https://github.com/systemd/mkosi/archive/v%{version}/%{name}-%{version}.tar.gz +# setuptools in c9s does not support all sections from pyproject.toml yet so we +# add back a setup.py file to get the build working. +Patch1: add-back-setup.py-file.patch + BuildArch: noarch BuildRequires: python3-devel BuildRequires: pyproject-rpm-macros @@ -119,9 +123,128 @@ ln -s -t %{buildroot}%{_mandir}/man1/ \ %if %{with tests} %pytest tests/ -v +%if %{defined py3_test_envvars} # just a smoke test for syntax or import errors %py3_test_envvars %{buildroot}%{_bindir}/mkosi --help >/dev/null %endif +%endif %changelog -%autochangelog +* Mon Sep 11 2023 Daan De Meyer - 16.1-1 +- Release v16 for CentOS Hyperscale SIG + +* Sun Aug 13 2023 Leif Liddy - 15.1-2 +- Require systemd version 254, recommend systemd-nspawn (rhbz#2232233) + +* Thu Aug 10 2023 Zbigniew Jędrzejewski-Szmek - 15.1-1 +- Version 15.1 +- dnf5 is recommended over dnf, because it is faster. + +* Thu Jul 20 2023 Fedora Release Engineering - 14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 14 2023 Python Maint - 14-5 +- Rebuilt for Python 3.12 + +* Thu Jan 19 2023 Fedora Release Engineering - 14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Oct 27 2022 Zbigniew Jędrzejewski-Szmek - 14-3 +- Skip test file that fails in koji + +* Thu Oct 27 2022 Zbigniew Jędrzejewski-Szmek - 14-2 +- Skip test that fails in koji + +* Thu Oct 27 2022 Zbigniew Jędrzejewski-Szmek - 14-1 +- Version 14 + +* Thu Jul 21 2022 Fedora Release Engineering - 13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 21 2022 Zbigniew Jędrzejewski-Szmek - 13-2 +- Skip test that fails in koji + +* Tue Jun 21 2022 Zbigniew Jędrzejewski-Szmek - 13-1 +- Version 13 + +* Mon Jun 13 2022 Python Maint - 12-4 +- Rebuilt for Python 3.11 + +* Sun Apr 24 2022 Zbigniew Jędrzejewski-Szmek - 12-3 +- Add patch to fix compatibility with python3.11-a7 (rhbz#2057363) + +* Thu Jan 20 2022 Fedora Release Engineering - 12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 30 2021 Zbigniew Jędrzejewski-Szmek - 12-1 +- Version 12 + +* Wed Nov 24 2021 Zbigniew Jędrzejewski-Szmek - 11-1 +- Version 11 + +* Thu Oct 21 2021 Zbigniew Jędrzejewski-Szmek - 10-2 +- Add Recommends for tools to build initrds + +* Fri Jul 30 2021 Zbigniew Jędrzejewski-Szmek - 10-1 +- Version 10 + +* Thu Jul 22 2021 Fedora Release Engineering - 9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 11 2021 Davide Cavalca - 9-4 +- Only gate out Recommends on el7 + +* Fri Jun 04 2021 Python Maint - 9-3 +- Rebuilt for Python 3.10 + +* Tue Jan 26 2021 Fedora Release Engineering - 9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Jan 2 2021 Zbigniew Jędrzejewski-Szmek - 9-1 +- Update to latest version (#1903407) + +* Thu Dec 3 2020 Zbigniew Jędrzejewski-Szmek - 8-1 +- Update to latest version (#1903407) + +* Sat Oct 3 2020 Zbigniew Jędrzejewski-Szmek - 6-1 +- Update to latest version (#1884879) + +* Tue Jul 28 2020 Fedora Release Engineering - 5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 30 2019 Zbigniew Jędrzejewski-Szmek - 5-1 +- Update to latest version + +* Fri Feb 01 2019 Fedora Release Engineering - 4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Feb 10 2018 Zbigniew Jędrzejewski-Szmek - 4-2 +- Update to latest version (#1544123) + +* Thu Feb 08 2018 Fedora Release Engineering - 2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jun 23 2017 Zbigniew Jędrzejewski-Szmek - 2-1 +- Update to latest version (#1464285) + +* Fri Feb 10 2017 Fedora Release Engineering - 1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1-2 +- Rebuild for Python 3.6 + +* Thu Nov 3 2016 Zbigniew Jędrzejewski-Szmek - 1-1 +- Initial version +