From 5b9d8c019044b3914b71e1c12afe9e4b06a8f414 Mon Sep 17 00:00:00 2001
From: Thomas Crawley <thomas.crawley@amd.com>
Date: Thu, 19 Sep 2024 14:57:50 +0100
Subject: [PATCH] ON-15949: Allow optional build of debug binaries in rpm spec

---
 scripts/tcpdirect_misc/tcpdirect.spec | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/scripts/tcpdirect_misc/tcpdirect.spec b/scripts/tcpdirect_misc/tcpdirect.spec
index 9fc8410..f3f10bd 100644
--- a/scripts/tcpdirect_misc/tcpdirect.spec
+++ b/scripts/tcpdirect_misc/tcpdirect.spec
@@ -8,13 +8,16 @@
 #
 # To build a binary RPM from a source RPM:
 #   rpmbuild --define "onload_tarball <onload_tarball>" --rebuild ~/rpmbuild/SRPMS/tcpdirect-<version>-1.src.rpm
+#
+# If you want debug binary packages add:
+#   --define "debug true"
 
 %define _unpackaged_files_terminate_build 0
 %{!?pkgversion: %global pkgversion 9.0.0}
 
 Name:           tcpdirect
 Version:        %{pkgversion}
-Release:        1
+Release:        1%{?debug:DEBUG}
 Summary:        TCPDirect
 
 License:        MIT AND BSD-3-Clause AND LGPL-3.0
@@ -44,7 +47,8 @@ mkdir -p $RPM_BUILD_ROOT
 %setup -n %{name}-%{pkgversion}
 
 %build
-scripts/zf_mkdist --version "%{pkgversion}" --name tcpdirect "%{?onload_tarball:%onload_tarball}"
+scripts/zf_mkdist --version "%{pkgversion}" %{?debug:--debug} \
+  --name tcpdirect "%{?onload_tarball:%onload_tarball}"
 
 tar -xzvf build/tcpdirect-"%{pkgversion}".tgz -C "${RPM_BUILD_ROOT}"
 
@@ -55,12 +59,10 @@ ls -la $RPM_BUILD_ROOT/tcpdirect-%{pkgversion}/scripts
 
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}/
 mv $RPM_BUILD_ROOT/tcpdirect-%{pkgversion}/scripts/zf_debug $RPM_BUILD_ROOT/%{_bindir}/
-mv $RPM_BUILD_ROOT/tcpdirect-%{pkgversion}/release/bin/* $RPM_BUILD_ROOT/%{_bindir}/
+mv $RPM_BUILD_ROOT/tcpdirect-%{pkgversion}/bin/* $RPM_BUILD_ROOT/%{_bindir}/
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/zf
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/zf/debug
-mv $RPM_BUILD_ROOT/tcpdirect-%{pkgversion}/release/lib/* $RPM_BUILD_ROOT/%{_libdir}/
-mv $RPM_BUILD_ROOT/tcpdirect-%{pkgversion}/debug/lib/* $RPM_BUILD_ROOT/%{_libdir}/zf/debug/
+mv $RPM_BUILD_ROOT/tcpdirect-%{pkgversion}/lib/* $RPM_BUILD_ROOT/%{_libdir}
 
 mkdir -p $RPM_BUILD_ROOT/%{_includedir}/zf
 mv $RPM_BUILD_ROOT/tcpdirect-%{pkgversion}/src/include/zf/* $RPM_BUILD_ROOT/%{_includedir}/zf
@@ -74,9 +76,6 @@ mv $RPM_BUILD_ROOT/tcpdirect-%{pkgversion}/src/tests/* $RPM_BUILD_ROOT/%{_datadi
 %defattr(-,root,root)
 %{_bindir}/zf_debug
 %{_bindir}/zf_stackdump
-# Ownership for debug binaries
-%{_libdir}/zf/*
-# Ownership for release binaries
 %{_libdir}/libonload_zf* 
 %{_includedir}/zf/*
 %{_datadir}/doc/tcpdirect/*