From bc62c96794ce84c47efdea11f5f8ace656a1d822 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 5 Nov 2025 08:01:53 +0000
Subject: [PATCH] import UBI osinfo-db-20250124-2.el10_0

---
 ...-fix-x86_64-pxeboot-set-release-date.patch | 55 +++++++++++++++++++
 osinfo-db.spec                                | 23 ++++++--
 2 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 0001-rhel10-fix-x86_64-pxeboot-set-release-date.patch

diff --git a/0001-rhel10-fix-x86_64-pxeboot-set-release-date.patch b/0001-rhel10-fix-x86_64-pxeboot-set-release-date.patch
new file mode 100644
index 0000000..5928cb0
--- /dev/null
+++ b/0001-rhel10-fix-x86_64-pxeboot-set-release-date.patch
@@ -0,0 +1,55 @@
+From 8be0d55bda7ee7ec8fea38cae5e0e65eaf134b29 Mon Sep 17 00:00:00 2001
+From: Victor Toso <victortoso@redhat.com>
+Date: Sun, 31 Aug 2025 08:42:11 +0200
+Subject: [PATCH] rhel10: fix x86_64 pxeboot, set release date
+
+upstream:
+ - 9c808d5b rhel10: set x86_64 pxeboot path
+ - 2a374acd rhel10: set release date, add test data
+
+Resolves: RHEL-109774
+Signed-off-by: Victor Toso <victortoso@redhat.com>
+---
+ os/redhat.com/rhel-10-unknown.xml | 4 ++--
+ os/redhat.com/rhel-10.0.xml       | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/os/redhat.com/rhel-10-unknown.xml b/os/redhat.com/rhel-10-unknown.xml
+index ee3519e..df22aca 100644
+--- a/os/redhat.com/rhel-10-unknown.xml
++++ b/os/redhat.com/rhel-10-unknown.xml
+@@ -39,8 +39,8 @@
+       <iso>
+         <volume-id>RHEL-10-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
+       </iso>
+-      <kernel>isolinux/vmlinuz</kernel>
+-      <initrd>isolinux/initrd.img</initrd>
++      <kernel>images/pxeboot/vmlinuz</kernel>
++      <initrd>images/pxeboot/initrd.img</initrd>
+     </media>
+     <media arch="aarch64">
+       <iso>
+diff --git a/os/redhat.com/rhel-10.0.xml b/os/redhat.com/rhel-10.0.xml
+index 9f11c48..d44e415 100644
+--- a/os/redhat.com/rhel-10.0.xml
++++ b/os/redhat.com/rhel-10.0.xml
+@@ -35,13 +35,13 @@
+     <codename>Coughlan</codename>
+     <upgrades id="http://redhat.com/rhel/9.5"/>
+     <derives-from id="http://redhat.com/rhel/9.5"/>
+-    <release-status>prerelease</release-status>
++    <release-date>2025-05-20</release-date>
+     <media arch="x86_64">
+       <iso>
+         <volume-id>RHEL-10-0(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
+       </iso>
+-      <kernel>isolinux/vmlinuz</kernel>
+-      <initrd>isolinux/initrd.img</initrd>
++      <kernel>images/pxeboot/vmlinuz</kernel>
++      <initrd>images/pxeboot/initrd.img</initrd>
+     </media>
+     <media arch="aarch64">
+       <iso>
+-- 
+2.51.0
+
diff --git a/osinfo-db.spec b/osinfo-db.spec
index b56e2c8..6c7a7a3 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -2,7 +2,7 @@
 ## (rpmautospec version 0.6.5)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 1;
+    release_number = 2;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@@ -10,6 +10,9 @@
 
 # -*- rpm-spec -*-
 
+%define PatchedSource ../%{name}-%{version}-patched.tar.xz
+%define ExtractedSource %{name}-%{version}
+
 %define with_mingw 0
 %if 0%{?fedora}
     %define with_mingw 0%{!?_without_mingw:1}
@@ -23,7 +26,9 @@ License: GPL-2.0-or-later
 Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz
 Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc
 URL: http://libosinfo.org/
+Patch0001: 0001-rhel10-fix-x86_64-pxeboot-set-release-date.patch
 BuildRequires: intltool
+BuildRequires: git-core
 BuildRequires: osinfo-db-tools
 BuildArch: noarch
 Requires: hwdata
@@ -55,16 +60,23 @@ operating systems for use with virtualization provisioning tools
 
 %endif
 
+%prep
+%autosetup -S git_am
+
+%build
+rm -rf ../%{ExtractedSource}/.git
+tar -cvJf %{PatchedSource} ../%{ExtractedSource}/
+
 %install
-osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
+osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
 %if 0%{?rhel}
 # Remove the upstream virtio-win / spice-guest-tools drivers
 find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
 %endif
 
 %if %{with_mingw}
-osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{SOURCE0}
-osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0}
+osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{PatchedSource}
+osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSource}
 %endif
 
 %files
@@ -104,6 +116,9 @@ osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0}
 
 %changelog
 ## START: Generated by rpmautospec
+* Sun Aug 31 2025 Victor Toso <victortoso@redhat.com> - 20250124-2
+- Fixes x86_64 pxeboot in RHEL 10
+
 * Mon Jan 27 2025 Victor Toso <victortoso@redhat.com> - 20250124-1
 - Update to v20250124