From 41820156b4d39ca4f1b4aa3f61f9ca672d6a37df Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Sun, 7 Nov 2021 00:18:45 +0100
Subject: [PATCH] build and package fiptool; rel 2

---
 arm-trusted-firmware.spec | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/arm-trusted-firmware.spec b/arm-trusted-firmware.spec
index cde67e9..1d809d8 100644
--- a/arm-trusted-firmware.spec
+++ b/arm-trusted-firmware.spec
@@ -1,7 +1,7 @@
 Summary:	ARM Trusted Firmware
 Name:		arm-trusted-firmware
 Version:	2.5
-Release:	1
+Release:	2
 License:	BSD
 Group:		Base/Kernel
 Source0:	https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-%{version}.tar.gz
@@ -52,10 +52,15 @@ for soc in rk3399; do
 	PLAT="$soc" \
 	bl31
 done
+%{__make} -C tools/fiptool \
+	V=1 \
+	HOSTCC="%{__cc}" \
+	HOSTCCFLAGS="%{rpmcflags}" \
+	CPPFLAGS="%{rpmcppflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}}
 
 for soc in rk3399; do
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/$soc
@@ -66,10 +71,13 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/$soc
  done
 done
 
+cp -p tools/fiptool/fiptool $RPM_BUILD_ROOT%{_bindir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -n arm-trusted-firmware-armv8
 %defattr(644,root,root,755)
 %doc readme.rst
+%attr(755,root,root) %{_bindir}/fiptool
 %{_datadir}/%{name}
-- 
2.44.0