From 4acc12852cdb387bd7c83498f75de6daf0edea1fc847db5e741ef7ba7b26afca Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Thu, 21 Sep 2023 09:23:59 +0000
Subject: [PATCH 1/3] - removed the upstream ipxe binaries

OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=38
---
 warewulf4.changes |  5 +++++
 warewulf4.spec    | 15 +++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/warewulf4.changes b/warewulf4.changes
index 90a55f4..954c44e 100644
--- a/warewulf4.changes
+++ b/warewulf4.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 21 09:23:31 UTC 2023 - Christian Goll <cgoll@suse.com>
+
+- removed the upstream ipxe binaries 
+
 -------------------------------------------------------------------
 Thu Feb 16 10:54:19 UTC 2023 - Christian Goll <cgoll@suse.com>
 
diff --git a/warewulf4.spec b/warewulf4.spec
index b9389a8..8e51670 100644
--- a/warewulf4.spec
+++ b/warewulf4.spec
@@ -33,6 +33,7 @@ Source3:        warewulf4-rpmlintrc
 Source10:       config-ww4.sh
 Patch1:         make-ipxe-binary-source-configureable.patch
 Patch2:         CreateMt-Targets.patch
+Patch3:         use-right-path-for-building-driver-module-package.patch
 Patch10:        Fix-for-CVE-2022-41723.patch
 
 # no firewalld in sle12
@@ -84,15 +85,6 @@ Summary:        Contains the service for the warewulf rest API
 %description api
 Containts the binaries for the access of warewulf through a rest API and from the commandline from an external host.
 
-%package ipxe
-Summary:        Binaries of iPXE for ww4 installation
-BuildArch:      noarch
-
-%description ipxe
-For the boot of the nodes iPXE binaries are needed. As these package includes these files for
-x86, i386 and ARM.
-These are the binaries from the upstream project.
-
 %package slurm
 Summary:        Configuration template for slurm
 Requires:       %{name} = %{version}
@@ -176,6 +168,8 @@ mkdir -p %{buildroot}%{_datadir}/warewulf/overlays/generic/etc/slurm
 cat >  %{buildroot}%{_datadir}/warewulf/overlays/generic/etc/slurm/slurm.conf.ww <<EOF
 {{ Include "/etc/slurm/slurm.conf" }}
 EOF
+# remove upstream ipxe stuff
+rm -r %{buildroot}/%{_datadir}/ipxe
 
 %pre -f %{name}.pre
 %service_add_pre warewulfd.service
@@ -222,9 +216,6 @@ EOF
 %exclude  %{_datadir}/warewulf/overlays/generic/etc/slurm
 %exclude  %{_datadir}/warewulf/overlays/generic/etc/munge
 
-%files ipxe
-%{_datadir}/ipxe
-
 %files api
 %{_bindir}/wwapic
 %{_bindir}/wwapid

From cd54d6c2ca27ce767335759bc987d2dd732a922aab7da543c0de7ad9c508ec7e Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Thu, 21 Sep 2023 12:27:13 +0000
Subject: [PATCH 2/3] removed badness for binary in template

OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=39
---
 warewulf4-rpmlintrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/warewulf4-rpmlintrc b/warewulf4-rpmlintrc
index c43e4f0..88f497b 100644
--- a/warewulf4-rpmlintrc
+++ b/warewulf4-rpmlintrc
@@ -8,3 +8,6 @@ addFilter("non-executable-script /var/lib/warewulf/overlays/.*")
 addFilter("statically-linked-binary /var/lib/warewulf/overlays/system/default/warewulf/bin/wwclient")
 # go binaries are hard to strip
 addFilter("unstripped-binary-or-object.*")
+# ignore the binary in /usr/share as this binary will to the nodes and not run on
+# the host where the rpm is installed
+addFilter("arch-dependent-file-in-usr-share")

From 1a1882fa3396728003389e972f28677702a8991ede53a9ec55dec8bae3e9bfce Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Thu, 21 Sep 2023 12:51:44 +0000
Subject: [PATCH 3/3] removed unused patch

OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=40
---
 warewulf4.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/warewulf4.spec b/warewulf4.spec
index 8e51670..04ce03c 100644
--- a/warewulf4.spec
+++ b/warewulf4.spec
@@ -33,7 +33,6 @@ Source3:        warewulf4-rpmlintrc
 Source10:       config-ww4.sh
 Patch1:         make-ipxe-binary-source-configureable.patch
 Patch2:         CreateMt-Targets.patch
-Patch3:         use-right-path-for-building-driver-module-package.patch
 Patch10:        Fix-for-CVE-2022-41723.patch
 
 # no firewalld in sle12