[packages/ppc64-diag] - up to 2.6.9 - removed obsolete destdir,glibc patches - added verbose patch (verbose make)

Thu Jul 2 21:21:34 CEST 2015

commit 201bea2ad0318fb8332af33bc8f231890e51f454
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jul 2 21:23:25 2015 +0200

    - up to 2.6.9
    - removed obsolete destdir,glibc patches
    - added verbose patch (verbose make)

 ppc64-diag-destdir.patch | 11 -----------
 ppc64-diag-glibc.patch   | 11 -----------
 ppc64-diag-verbose.patch | 21 +++++++++++++++++++++
 ppc64-diag.spec          | 38 +++++++++++++++++++++++++-------------
 4 files changed, 46 insertions(+), 35 deletions(-)
---

diff --git a/ppc64-diag.spec b/ppc64-diag.spec
index e12f2d0..487f2ce 100644
--- a/ppc64-diag.spec
+++ b/ppc64-diag.spec
@@ -1,21 +1,21 @@
-# TODO: PLDify init script
+# TODO: PLDify init scripts
 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.6.1
+Version:	2.6.9
 Release:	0.1
 License: 	International License Agreement for Non-Warranted Programs (ILAN) 
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5:	5905899657dad48016fbf1e79fb93766
-Patch0:		%{name}-destdir.patch
-Patch1:		%{name}-glibc.patch
+# Source0-md5:	3f2eb7bcd8a79558eede3e313c2b5e14
+Patch0:		%{name}-verbose.patch
 URL:		http://linux-diag.sourceforge.net/ppc64-diag/
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	librtas-devel
 BuildRequires:	libservicelog-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libvpd-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel
@@ -49,26 +49,27 @@ ustawić w /etc/ppc64-diag/ppc64-diag.config.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
-%{__sed} -i -e 's/yacc/bison -y/' ela/Makefile
+%{__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}" \
-	CFLAGS="%{rpmcflags} -Wall -I/usr/include/ncurses" \
-	CXXFLAGS="%{rpmcxxflags} -Wall" \
 	YACC="bison -y"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT/etc/rc.d
-mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
+	DESTDIR=$RPM_BUILD_ROOT \
+	LIB_DIR=%{_libdir} \
+	LIBEXEC_DIR=/etc/rc.d/init.d \
+	SYSTEMD_DIR=%{systemdunitdir}
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/packages
 
@@ -102,9 +103,14 @@ fi
 %attr(755,root,root) %{_sbindir}/diag_encl
 %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}/usysident
 %dir %{_sysconfdir}/ppc64-diag
@@ -125,12 +131,18 @@ fi
 %config(noreplace) %{_sysconfdir}/ppc64-diag/message_catalog/with_regex/e1000e
 %config(noreplace) %{_sysconfdir}/ppc64-diag/message_catalog/with_regex/gpfs
 %config(noreplace) /etc/rc.powerfail
+%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
 %dir /var/log/ppc64-diag
 %{_mandir}/man8/diag_encl.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/syslog_to_svclog.8*
 %{_mandir}/man8/usysattn.8*
 %{_mandir}/man8/usysfault.8*
diff --git a/ppc64-diag-destdir.patch b/ppc64-diag-destdir.patch
deleted file mode 100644
index 2200da8..0000000
--- a/ppc64-diag-destdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ppc64-diag-2.4.0/ela/Makefile.orig	2011-05-02 19:51:45.007928944 +0200
-+++ ppc64-diag-2.4.0/ela/Makefile	2011-05-02 19:54:08.461267082 +0200
-@@ -76,7 +76,7 @@
- 	@$(call install_files,$(CATALOG),744,$(DESTDIR)/etc/ppc64-diag/message_catalog)
- 	@$(call install_files,$(CATALOG_REGEX),744,$(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex)
- 	@$(call install_man,$(MANPAGES),$(DESTDIR))
--	$(INSTALL) -d -m 755 /var/log/ppc64-diag
-+	$(INSTALL) -d -m 755 $(DESTDIR)/var/log/ppc64-diag
- 
- clean:
- 	@rm -rf $(CMDS) *.o lex.*.c *.tab.c *.tab.h
diff --git a/ppc64-diag-glibc.patch b/ppc64-diag-glibc.patch
deleted file mode 100644
index 4e005c4..0000000
--- a/ppc64-diag-glibc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ppc64-diag-2.6.1/rtas_errd/dump.c.orig	2013-02-08 10:06:13.000000000 +0100
-+++ ppc64-diag-2.6.1/rtas_errd/dump.c	2013-03-24 08:04:35.423174347 +0100
-@@ -161,7 +161,7 @@
- 		goto scanlog_error;
- 	}
- 
--	out = open(scanlog_filename, O_WRONLY | O_CREAT | O_TRUNC);
-+	out = open(scanlog_filename, O_WRONLY | O_CREAT | O_TRUNC, 0600);
- 	if (out <= 0) {
- 		log_msg(NULL, "Could not open %s for writing, %s", 
- 			scanlog_filename, strerror(errno));
diff --git a/ppc64-diag-verbose.patch b/ppc64-diag-verbose.patch
new file mode 100644
index 0000000..66acddf
--- /dev/null
+++ b/ppc64-diag-verbose.patch
@@ -0,0 +1,21 @@
+--- ppc64-diag-2.6.9/rules.mk.orig	2015-06-29 12:37:42.000000000 +0200
++++ ppc64-diag-2.6.9/rules.mk	2015-07-02 16:55:52.475139765 +0200
+@@ -211,7 +211,6 @@
+ 
+ # Default target for building object files
+ %.o: %.c
+-	@echo "CC $(WORK_DIR)/$@"
+-	@$(CC) -c $(AM_CFLAGS) $(CFLAGS) $<
++	$(CC) -c $(AM_CFLAGS) $(CFLAGS) $<
+ 
+ 
+--- 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/201bea2ad0318fb8332af33bc8f231890e51f454

