From a1fe17344ee9964d405b81e193e8005f4837e24a Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Mon, 12 Feb 2024 18:36:27 +0000
Subject: [PATCH] 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?= <ondrej@budai.cz>
+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 <thozza@redhat.com> - 93-1.1
+- stages/org.osbuild.keymap: create xorg.conf.d if it doesn't exist (RHEL-22840)
+
 * Wed Aug 23 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 93-1
 - New upstream release