[packages/ppc64-diag] - up to 2.7.9, added rtas bcond

qboosh qboosh at pld-linux.org
Sun Dec 24 15:20:52 CET 2023 

commit 8c0181adb5430af36aad3b65c616e5678b6e3cc2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 24 14:36:46 2023 +0100

    - up to 2.7.9, added rtas bcond

 ppc64-diag-install.patch | 14 ++++++------
 ppc64-diag.spec          | 57 +++++++++++++++++++++++++++++++++---------------
 2 files changed, 46 insertions(+), 25 deletions(-)
---
diff --git a/ppc64-diag.spec b/ppc64-diag.spec
index d5f45dc..bbf5d62 100644
--- a/ppc64-diag.spec
+++ b/ppc64-diag.spec
@@ -1,30 +1,35 @@
 # TODO: PLDify init scripts
+#
+# Conditional build:
+%bcond_without	rtas	# librtas based utils
+
 Summary:	Diagnostics tools for Linux on Power platform
 Summary(pl.UTF-8):	Narzędzia diagnostyczne dla Linuksa na platformie Power
 Name:		ppc64-diag
-Version:	2.7.6
+Version:	2.7.9
 Release:	0.1
 License: 	GPL v2+
 Group:		Applications/System
-Source0:	http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5:	06d356203a432720911189919f6fdeec
+#Source0Download: https://github.com/power-ras/ppc64-diag/tags
+Source0:	https://github.com/power-ras/ppc64-diag/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	42e1e53cda4757b5c18642c55f10a6aa
 Patch0:		%{name}-install.patch
-URL:		http://linux-diag.sourceforge.net/ppc64-diag/
+URL:		https://github.com/power-ras/ppc64-diag
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	bison
 BuildRequires:	flex
-BuildRequires:	librtas-devel
-BuildRequires:	libservicelog-devel
+%{?with_rtas:BuildRequires:	librtas-devel}
+%{?with_rtas:BuildRequires:	libservicelog-devel}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2
-BuildRequires:	libvpd-devel >= 2
+%{?with_rtas:BuildRequires:	libvpd-cxx-devel >= 2.2.9}
 BuildRequires:	ncurses-devel
 BuildRequires:	sqlite3-devel
 BuildRequires:	udev-devel
 Requires(post,preun):	rc-scripts
 Requires(post,preun):	/sbin/chkconfig
-Requires:	lsvpd >= 0.14
+%{?with_rtas:Requires:	libvpd-cxx >= 2.2.9}
 Requires:	rc-scripts
 Requires:	servicelog >= 1.1
 Conflicts:	powerpc-utils-ibm < 1.2.15
@@ -60,6 +65,7 @@ ustawić w /etc/ppc64-diag/ppc64-diag.config.
 %{__autoheader}
 %{__automake}
 %configure \
+	%{!?with_rtas:--without-librtas} \
 	--disable-silent-rules
 
 %{__make}
@@ -97,29 +103,34 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README TODO
+%doc README.md TODO
+%attr(755,root,root) %{_sbindir}/extract_opal_dump
+%attr(755,root,root) %{_sbindir}/opal-dump-parse
+%attr(755,root,root) %{_sbindir}/opal-elog-parse
+%attr(755,root,root) %{_sbindir}/opal_errd
+%if %{with rtas}
 %attr(755,root,root) %{_sbindir}/add_regex
 %attr(755,root,root) %{_sbindir}/convert_dt_node_props
 %attr(755,root,root) %{_sbindir}/diag_encl
+%attr(755,root,root) %{_sbindir}/diag_nvme
 %attr(755,root,root) %{_sbindir}/encl_led
 %attr(755,root,root) %{_sbindir}/explain_syslog
-%attr(755,root,root) %{_sbindir}/extract_opal_dump
 %attr(755,root,root) %{_sbindir}/extract_platdump
 %attr(755,root,root) %{_sbindir}/lp_diag
-%attr(755,root,root) %{_sbindir}/opal-dump-parse
-%attr(755,root,root) %{_sbindir}/opal-elog-parse
-%attr(755,root,root) %{_sbindir}/opal_errd
 %attr(755,root,root) %{_sbindir}/rtas_errd
 %attr(755,root,root) %{_sbindir}/syslog_to_svclog
 %attr(755,root,root) %{_sbindir}/usysattn
 %attr(755,root,root) %{_sbindir}/usysfault
 %attr(755,root,root) %{_sbindir}/usysident
+%endif
 %dir %{_sysconfdir}/ppc64-diag
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ppc64-diag/diag_nvme.config
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ppc64-diag/ppc64-diag.config
-%attr(754,root,root) %{_sysconfdir}/ppc64-diag/lp_diag_notify
-%attr(754,root,root) %{_sysconfdir}/ppc64-diag/lp_diag_setup
 %attr(754,root,root) %{_sysconfdir}/ppc64-diag/ppc64_diag_*
 %{_sysconfdir}/ppc64-diag/servevent_parse.pl
+%if %{with rtas}
+%attr(754,root,root) %{_sysconfdir}/ppc64-diag/lp_diag_notify
+%attr(754,root,root) %{_sysconfdir}/ppc64-diag/lp_diag_setup
 %dir %{_sysconfdir}/ppc64-diag/message_catalog
 %config(noreplace) %{_sysconfdir}/ppc64-diag/message_catalog/cxgb3
 %config(noreplace) %{_sysconfdir}/ppc64-diag/message_catalog/e1000e
@@ -130,21 +141,31 @@ fi
 %config(noreplace) %{_sysconfdir}/ppc64-diag/message_catalog/with_regex/cxgb3
 %config(noreplace) %{_sysconfdir}/ppc64-diag/message_catalog/with_regex/e1000e
 %config(noreplace) %{_sysconfdir}/ppc64-diag/message_catalog/with_regex/gpfs
+%endif
 #/etc/cron.daily/run_diag_encl
+#/etc/cron.daily/run_diag_nvme
+%if %{with rtas}
 %config(noreplace) /etc/rc.powerfail
+%endif
 %config(noreplace) /etc/rc.d/init.d/opal_errd
 %config(noreplace) /etc/rc.d/init.d/rtas_errd
 %{systemdunitdir}/opal_errd.service
 %{systemdunitdir}/rtas_errd.service
+%if %{with rtas}
 %dir /var/log/ppc64-diag
+%endif
+%{_mandir}/man8/opal-dump-parse.8*
+%{_mandir}/man8/opal-elog-parse.8*
+%{_mandir}/man8/opal_errd.8*
+%if %{with rtas}
 %{_mandir}/man8/diag_encl.8*
+%{_mandir}/man8/diag_nvme.8*
 %{_mandir}/man8/encl_led.8*
 %{_mandir}/man8/explain_syslog.8*
 %{_mandir}/man8/lp_diag.8*
-%{_mandir}/man8/opal-dump-parse.8*
-%{_mandir}/man8/opal-elog-parse.8*
-%{_mandir}/man8/opal_errd.8*
+%{_mandir}/man8/rtas_errd.8*
 %{_mandir}/man8/syslog_to_svclog.8*
 %{_mandir}/man8/usysattn.8*
 %{_mandir}/man8/usysfault.8*
 %{_mandir}/man8/usysident.8*
+%endif
diff --git a/ppc64-diag-install.patch b/ppc64-diag-install.patch
index f60ae3b..824d125 100644
--- a/ppc64-diag-install.patch
+++ b/ppc64-diag-install.patch
@@ -1,6 +1,6 @@
---- ppc64-diag-2.7.6/scripts/Makefile.am.orig	2019-09-11 11:25:42.000000000 +0200
-+++ ppc64-diag-2.7.6/scripts/Makefile.am	2020-03-18 19:34:34.436725537 +0100
-@@ -10,14 +10,17 @@
+--- ppc64-diag-2.7.9/scripts/Makefile.am.orig	2022-10-14 11:41:34.000000000 +0200
++++ ppc64-diag-2.7.9/scripts/Makefile.am	2023-12-24 13:40:58.975427220 +0100
+@@ -11,14 +11,17 @@ INIT_FILES = scripts/rtas_errd scripts/o
  
  SERVICE_SCRIPT = scripts/rtas_errd.service scripts/opal_errd.service
  
@@ -22,16 +22,16 @@
  
  uninstall-hook-scripts:
  	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_setup
-@@ -26,10 +29,10 @@
- 	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_migrate
+@@ -28,10 +31,10 @@ uninstall-hook-scripts:
  	rm -f $(DESTDIR)/etc/ppc64-diag/servevent_parse.pl
  	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64-diag.config
+ 	rm -f $(DESTDIR)/etc/ppc64-diag/diag_nvme.config
 -	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/rtas_errd
 -	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/opal_errd
 -	rm -f $(DESTDIR)/usr/lib/systemd/system/rtas_errd.service
 -	rm -f $(DESTDIR)/usr/lib/systemd/system/opal_errd.service
-+	rm -f $(DESTDIR)$(initddir)/rtas_errd
-+	rm -f $(DESTDIR)$(initddir)/opal_errd
++	rm -f $(DESTDIR)$(initddir)/ppc64-diag/rtas_errd
++	rm -f $(DESTDIR)$(initddir)/ppc64-diag/opal_errd
 +	rm -f $(DESTDIR)$(systemdunitdir)/rtas_errd.service
 +	rm -f $(DESTDIR)$(systemdunitdir)/opal_errd.service
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ppc64-diag.git/commitdiff/8c0181adb5430af36aad3b65c616e5678b6e3cc2

More information about the pld-cvs-commit mailing list