From 1cd2ea1070cb5c9203ea0287491b48b631a2fe93 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 Nov 2023 03:26:30 +0000 Subject: [PATCH 1/2] import UBI osbuild-93-1.el8 --- .gitignore | 2 +- .osbuild.metadata | 2 +- SPECS/osbuild.spec | 58 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d203455..6f35051 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-81.tar.gz +SOURCES/osbuild-93.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index f31ecdd..f391c26 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -aedf98d437f91663abd531a45bd4abd0060d7938 SOURCES/osbuild-81.tar.gz +4ef37f2c681bcf4f4ae6099726b1617fe1db471e SOURCES/osbuild-93.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 6637d86..7cc8ea8 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 81 +Version: 93 %forgemeta @@ -33,6 +33,7 @@ Requires: glibc Requires: policycoreutils Requires: qemu-img Requires: systemd +Requires: skopeo Requires: tar Requires: util-linux Requires: python3-%{pypi_name} = %{version}-%{release} @@ -115,12 +116,19 @@ Summary: Extra tools and utilities Requires: %{name} = %{version}-%{release} Requires: python3-pyyaml +# These are required for `osbuild-dev`, only packaged for Fedora +%if 0%{?fedora} +Requires: python3-rich +Requires: python3-attrs +Requires: python3-typer +%endif + %description tools Contains additional tools and utilities for development of manifests and osbuild. %prep -%forgesetup +%forgeautosetup -p1 %build %py3_build @@ -180,6 +188,9 @@ install -D -p -m 0644 selinux/osbuild.if %{buildroot}%{_datadir}/selinux/devel/i mkdir -p %{buildroot}%{_udevrulesdir} install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir} +# Remove `osbuild-dev` on non-fedora systems +%{!?fedora:rm %{buildroot}%{_bindir}/osbuild-dev} + %check exit 0 # We have some integration tests, but those require running a VM, so that would @@ -248,9 +259,52 @@ fi %files tools %{_bindir}/osbuild-mpp +%{?fedora:%{_bindir}/osbuild-dev} %changelog +* Wed Aug 23 2023 imagebuilder-bot - 93-1 +- New upstream release + +* Thu Aug 17 2023 imagebuilder-bot - 92-1 +- New upstream release + +* Wed Aug 02 2023 imagebuilder-bot - 91-1 +- New upstream release + +* Thu Jul 20 2023 imagebuilder-bot - 90-1 +- New upstream release + +* Tue Jun 27 2023 imagebuilder-bot - 89-1 +- New upstream release + +* Tue Jun 27 2023 Tomáš Hozza - 88-3 +- Increase unit-test duration to 3h + +* Fri Jun 23 2023 Tomáš Hozza - 88-2 +- Fix unit tests in RHEL CI and rebuild RPM + +* Wed Jun 21 2023 imagebuilder-bot - 88-1 +- New upstream release + +* Wed Jun 07 2023 imagebuilder-bot - 87-1 +- New upstream release + +* Tue May 30 2023 imagebuilder-bot - 86-1 +- New upstream release + +* Tue May 30 2023 Tomáš Hozza - 85-2 +- Backport upstream fixes for unit tests on RHEL-8 (PR#1316, PR#1317) + +* Thu May 11 2023 imagebuilder-bot - 85-1 +- New upstream release + +* Thu Apr 27 2023 imagebuilder-bot - 84-1 +- New upstream release + +* Wed Mar 29 2023 imagebuilder-bot - 82-1 +- New upstream release + * Mon Feb 27 2023 imagebuilder-bot - 81-1 - New upstream release From a1fe17344ee9964d405b81e193e8005f4837e24a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 12 Feb 2024 18:36:27 +0000 Subject: [PATCH 2/2] import UBI osbuild-93-1.el8_9.1 --- ...ld.keymap-create-xorg.conf.d-if-it-d.patch | 35 +++++++++++++++++++ SPECS/osbuild.spec | 8 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 SOURCES/stages-org.osbuild.keymap-create-xorg.conf.d-if-it-d.patch diff --git a/SOURCES/stages-org.osbuild.keymap-create-xorg.conf.d-if-it-d.patch b/SOURCES/stages-org.osbuild.keymap-create-xorg.conf.d-if-it-d.patch new file mode 100644 index 0000000..81593c7 --- /dev/null +++ b/SOURCES/stages-org.osbuild.keymap-create-xorg.conf.d-if-it-d.patch @@ -0,0 +1,35 @@ +From dcb0850a2edccd1067385c4a50dd2aab62778009 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Budai?= +Date: Fri, 1 Sep 2023 14:40:06 +0200 +Subject: [PATCH] stages/org.osbuild.keymap: create xorg.conf.d if it doesn't + exist + +Newer versions of Fedora don't create this directory by default. This +commit modifies the stage so it creates it if it doesn't exist. +--- + stages/org.osbuild.keymap | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stages/org.osbuild.keymap b/stages/org.osbuild.keymap +index 7878fa08..c3a292f5 100755 +--- a/stages/org.osbuild.keymap ++++ b/stages/org.osbuild.keymap +@@ -18,7 +18,6 @@ be configured for the X11 keyboard. + Valid keymaps are generally found in /lib/kbd/keymaps. + """ + +- + import os + import subprocess + import sys +@@ -74,6 +73,7 @@ Section "InputClass" + EndSection + """ + ++ os.makedirs(f"{tree}/etc/X11/xorg.conf.d", mode=0o755, exist_ok=True) + with open(f"{tree}/etc/X11/xorg.conf.d/00-keyboard.conf", "w", encoding="utf8") as f: + f.write(file_content) + +-- +2.43.0 + diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 7cc8ea8..c7fd63c 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -9,7 +9,7 @@ Version: 93 %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Release: 1%{?dist} +Release: 1%{?dist}.1 License: Apache-2.0 URL: %{forgeurl} @@ -18,6 +18,9 @@ Source0: %{forgesource} BuildArch: noarch Summary: A build system for OS images +# https://github.com/osbuild/osbuild/commit/dcb0850a2edccd1067385c4a50dd2aab62778009 +Patch0: stages-org.osbuild.keymap-create-xorg.conf.d-if-it-d.patch + BuildRequires: make BuildRequires: python3-devel BuildRequires: python3-docutils @@ -263,6 +266,9 @@ fi %changelog +* Fri Jan 26 2024 Tomáš Hozza - 93-1.1 +- stages/org.osbuild.keymap: create xorg.conf.d if it doesn't exist (RHEL-22840) + * Wed Aug 23 2023 imagebuilder-bot - 93-1 - New upstream release