[packages/ppc64-diag] - up to 2.7.6 - removed outdated verbose patch - added install patch (fix init scripts install dirs)

qboosh qboosh at pld-linux.org
Wed Mar 18 20:00:48 CET 2020 

commit ddc8fc03c60d9a51a74df00e32dd00386c4cdd78
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Mar 18 20:01:55 2020 +0100

    - up to 2.7.6
    - removed outdated verbose patch
    - added install patch (fix init scripts install dirs)

 ppc64-diag-install.patch | 39 +++++++++++++++++++++++++++++++++++++++
 ppc64-diag-verbose.patch | 21 ---------------------
 ppc64-diag.spec          | 43 +++++++++++++++++++++++--------------------
 3 files changed, 62 insertions(+), 41 deletions(-)
---
diff --git a/ppc64-diag.spec b/ppc64-diag.spec
index 1b65221..d5f45dc 100644
--- a/ppc64-diag.spec
+++ b/ppc64-diag.spec
@@ -2,23 +2,26 @@
 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.3
+Version:	2.7.6
 Release:	0.1
 License: 	GPL v2+
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5:	fcda83adad468e5310a5fece5fc8d0d5
-Patch0:		%{name}-verbose.patch
+# Source0-md5:	06d356203a432720911189919f6fdeec
+Patch0:		%{name}-install.patch
 URL:		http://linux-diag.sourceforge.net/ppc64-diag/
+BuildRequires:	autoconf >= 2.69
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	librtas-devel
 BuildRequires:	libservicelog-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libvpd-devel
+BuildRequires:	libtool >= 2:2
+BuildRequires:	libvpd-devel >= 2
 BuildRequires:	ncurses-devel
-BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel
+BuildRequires:	udev-devel
 Requires(post,preun):	rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	lsvpd >= 0.14
@@ -50,28 +53,25 @@ ustawić w /etc/ppc64-diag/ppc64-diag.config.
 %setup -q
 %patch0 -p1
 
-%{__sed} -i -e 's/yacc/\$(YACC)/' ela/Makefile
-
-%{__sed} -i -e 's,/usr/libexec/ppc64-diag/,/etc/rc.d/init.d/,' scripts/*.service
-
 %build
-CFLAGS="%{rpmcflags}" \
-CXXFLAGS="%{rpmcxxflags}" \
-%{__make} \
-	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	YACC="bison -y"
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	--disable-silent-rules
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	LIB_DIR=%{_libdir} \
-	LIBEXEC_DIR=/etc/rc.d/init.d \
-	SYSTEMD_DIR=%{systemdunitdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/packages
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/ppc64-diag
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,6 +97,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%doc README TODO
 %attr(755,root,root) %{_sbindir}/add_regex
 %attr(755,root,root) %{_sbindir}/convert_dt_node_props
 %attr(755,root,root) %{_sbindir}/diag_encl
@@ -111,6 +112,7 @@ fi
 %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
 %dir %{_sysconfdir}/ppc64-diag
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ppc64-diag/ppc64-diag.config
@@ -128,6 +130,7 @@ 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
+#/etc/cron.daily/run_diag_encl
 %config(noreplace) /etc/rc.powerfail
 %config(noreplace) /etc/rc.d/init.d/opal_errd
 %config(noreplace) /etc/rc.d/init.d/rtas_errd
diff --git a/ppc64-diag-install.patch b/ppc64-diag-install.patch
new file mode 100644
index 0000000..f60ae3b
--- /dev/null
+++ b/ppc64-diag-install.patch
@@ -0,0 +1,39 @@
+--- 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 @@
+ 
+ SERVICE_SCRIPT = scripts/rtas_errd.service scripts/opal_errd.service
+ 
++initddir = /etc/rc.d/init.d
++systemdunitdir = /lib/systemd/system
++
+ install-exec-hook-scripts:
+ 	install -d --mode=755 $(DESTDIR)/etc/ppc64-diag/
+ 	install -D --mode=744 $(PPC64_DIAG_SCRIPT) $(DESTDIR)/etc/ppc64-diag/
+ 	install -D --mode=644 $(CONFIG_FILE) $(DESTDIR)/etc/ppc64-diag
+-	install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag/
+-	install -D --mode=755 $(INIT_FILES) $(DESTDIR)/usr/libexec/ppc64-diag/
+-	install -d --mode=755 $(DESTDIR)/usr/lib/systemd/system/
+-	install -D --mode=644 $(SERVICE_SCRIPT) $(DESTDIR)/usr/lib/systemd/system/
++	install -d --mode=755 $(DESTDIR)$(initddir)/
++	install -D --mode=755 $(INIT_FILES) $(DESTDIR)$(initddir)/
++	install -d --mode=755 $(DESTDIR)$(systemdunitdir)/
++	install -D --mode=644 $(SERVICE_SCRIPT) $(DESTDIR)$(systemdunitdir)/
+ 
+ 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
+ 	rm -f $(DESTDIR)/etc/ppc64-diag/servevent_parse.pl
+ 	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64-diag.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)$(systemdunitdir)/rtas_errd.service
++	rm -f $(DESTDIR)$(systemdunitdir)/opal_errd.service
+ 
+ INSTALL_EXEC_HOOKS += install-exec-hook-scripts
+ UNINSTALL_HOOKS += uninstall-hook-scripts
diff --git a/ppc64-diag-verbose.patch b/ppc64-diag-verbose.patch
deleted file mode 100644
index 0f81805..0000000
--- a/ppc64-diag-verbose.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ppc64-diag-2.7.2/rules.mk.orig	2016-10-16 20:16:44.027007075 +0200
-+++ ppc64-diag-2.7.2/rules.mk	2016-10-16 20:17:20.760339988 +0200
-@@ -211,7 +211,6 @@
- 
- # Default target for building object files
- %.o: %.c
--	@echo "CC $(WORK_DIR)/$@"
--	@$(CC) -c $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $<
-+	$(CC) -c $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $<
- 
- 
---- ppc64-diag-2.6.9/Makefile.orig	2015-06-29 12:37:42.000000000 +0200
-+++ ppc64-diag-2.6.9/Makefile	2015-07-02 16:56:03.425139305 +0200
-@@ -4,7 +4,6 @@
- 
- include rules.mk
- 
--.SILENT:
- BUILD_DIR=$(CURDIR)
- 
- SUBDIRS = common rtas_errd diags scripts ela lpd opal_errd opal-dump-parse
================================================================

---- gitweb:

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

More information about the pld-cvs-commit mailing list