From 1183f7783b0ddb853a1014fae6546fa22c55c292 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 6 Oct 2021 10:26:11 -0400 Subject: [PATCH] import ppc64-diag-2.7.7-1.el8 --- .gitignore | 2 +- .ppc64-diag.metadata | 2 +- SOURCES/ppc64-diag-lpdscriptloc.patch | 48 ++++++------ .../ppc64-diag-messagecatalog-location.patch | 74 +++++++++---------- SOURCES/ppc64-diag-permission.patch | 45 ++++------- SPECS/ppc64-diag.spec | 9 ++- 6 files changed, 84 insertions(+), 96 deletions(-) diff --git a/.gitignore b/.gitignore index ccee23e..eb5d427 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ppc64-diag-2.7.6.tar.gz +SOURCES/ppc64-diag-2.7.7.tar.gz diff --git a/.ppc64-diag.metadata b/.ppc64-diag.metadata index 807104f..aa639e7 100644 --- a/.ppc64-diag.metadata +++ b/.ppc64-diag.metadata @@ -1 +1 @@ -1e787343b4b9fa598fd5882bbad2c7f4ac541786 SOURCES/ppc64-diag-2.7.6.tar.gz +c1886780f9e5133f0b05594b0f7c6b961dd9a481 SOURCES/ppc64-diag-2.7.7.tar.gz diff --git a/SOURCES/ppc64-diag-lpdscriptloc.patch b/SOURCES/ppc64-diag-lpdscriptloc.patch index 42ada14..64b79c7 100644 --- a/SOURCES/ppc64-diag-lpdscriptloc.patch +++ b/SOURCES/ppc64-diag-lpdscriptloc.patch @@ -1,27 +1,3 @@ -diff -up ppc64-diag-2.7.4/lpd/Makefile.am.than ppc64-diag-2.7.4/lpd/Makefile.am ---- ppc64-diag-2.7.4/lpd/Makefile.am.than 2018-03-08 16:44:34.393958279 +0100 -+++ ppc64-diag-2.7.4/lpd/Makefile.am 2018-03-08 16:45:29.624967349 +0100 -@@ -46,16 +46,16 @@ all-local-lpd: - AM_LOCALS += all-local-lpd - - install-exec-hook-lpd: -- install -d --mode=755 $(DESTDIR)/etc/ppc64-diag -- install -D --mode=744 $(LPD_SCRIPT) $(DESTDIR)/etc/ppc64-diag/ -+ install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag -+ install -D --mode=744 $(LPD_SCRIPT) $(DESTDIR)/usr/libexec/ppc64-diag/ - $(LN_S) $(sbindir)/usysident $(DESTDIR)/$(sbindir)/usysattn - $(LN_S) $(sbindir)/usysident $(DESTDIR)/$(sbindir)/usysfault - - INSTALL_EXEC_HOOKS += install-exec-hook-lpd - - uninstall-hook-lpd: -- rm -f $(DESTDIR)/etc/ppc64-diag/lp_diag_setup -- rm -f $(DESTDIR)/etc/ppc64-diag/lp_diag_notify -+ rm -f $(DESTDIR)/usr/libexec/ppc64-diag/lp_diag_setup -+ rm -f $(DESTDIR)/usr/libexec/ppc64-diag/lp_diag_notify - rm -f $(sbindir)/usysattn - rm -f $(sbindir)/usysfault - diff -up ppc64-diag-2.7.4/lpd/scripts/lp_diag_notify.than ppc64-diag-2.7.4/lpd/scripts/lp_diag_notify --- ppc64-diag-2.7.4/lpd/scripts/lp_diag_notify.than 2018-03-08 16:43:08.482388675 +0100 +++ ppc64-diag-2.7.4/lpd/scripts/lp_diag_notify 2018-03-08 16:43:32.732831731 +0100 @@ -53,3 +29,27 @@ diff -up ppc64-diag-2.7.4/lpd/scripts/lp_diag_setup.than ppc64-diag-2.7.4/lpd/sc "--type=REPAIR --method=num_arg"], ); +diff -up ppc64-diag-2.7.7/lpd/Makefile.am.orig ppc64-diag-2.7.7/lpd/Makefile.am +--- ppc64-diag-2.7.7/lpd/Makefile.am.orig 2021-05-17 09:41:42.414331949 +0200 ++++ ppc64-diag-2.7.7/lpd/Makefile.am 2021-05-17 09:42:54.463293519 +0200 +@@ -46,16 +46,16 @@ all-local-lpd: + AM_LOCALS += all-local-lpd + + install-exec-hook-lpd: +- install -d --mode=755 $(DESTDIR)/etc/ppc64-diag +- install -D --mode=744 $(LPD_SCRIPT) $(DESTDIR)/etc/ppc64-diag/ ++ install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag ++ install -D --mode=744 $(LPD_SCRIPT) $(DESTDIR)/usr/libexec/ppc64-diag/ + (cd $(DESTDIR)/$(sbindir) && $(LN_S) -f usysident usysattn) + (cd $(DESTDIR)/$(sbindir) && $(LN_S) -f usysident usysfault) + + INSTALL_EXEC_HOOKS += install-exec-hook-lpd + + uninstall-hook-lpd: +- rm -f $(DESTDIR)/etc/ppc64-diag/lp_diag_setup +- rm -f $(DESTDIR)/etc/ppc64-diag/lp_diag_notify ++ rm -f $(DESTDIR)/usr/libexec/ppc64-diag/lp_diag_setup ++ rm -f $(DESTDIR)/usr/libexec/ppc64-diag/lp_diag_notify + rm -f $(sbindir)/usysattn + rm -f $(sbindir)/usysfault + diff --git a/SOURCES/ppc64-diag-messagecatalog-location.patch b/SOURCES/ppc64-diag-messagecatalog-location.patch index c7cc522..2d7bdf5 100644 --- a/SOURCES/ppc64-diag-messagecatalog-location.patch +++ b/SOURCES/ppc64-diag-messagecatalog-location.patch @@ -1,40 +1,3 @@ -diff -up ppc64-diag-2.7.4/ela/Makefile.am.than ppc64-diag-2.7.4/ela/Makefile.am ---- ppc64-diag-2.7.4/ela/Makefile.am.than 2018-03-08 15:41:37.994892051 +0100 -+++ ppc64-diag-2.7.4/ela/Makefile.am 2018-03-08 15:43:58.847464269 +0100 -@@ -68,22 +68,22 @@ clean-local-ela: - CLEAN_LOCALS += clean-local-ela - - install-exec-hook-ela: -- install -d --mode=755 $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/ -- install -D --mode=744 $(CATALOG) $(DESTDIR)/etc/ppc64-diag/message_catalog/ -+ install -d --mode=755 $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/ -+ install -D --mode=744 $(CATALOG) $(DESTDIR)/usr/share/ppc64-diag/message_catalog/ - install -D --mode=744 $(CATALOG_REGEX) \ -- $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/ -+ $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/ - - INSTALL_EXEC_HOOKS += install-exec-hook-ela - - uninstall-hook-ela: -- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/cxgb3 -- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/e1000e -- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/exceptions -- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/reporters -- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/gpfs -- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/cxgb3 -- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/e1000e -- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/gpfs -+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/cxgb3 -+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/e1000e -+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/exceptions -+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/reporters -+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/gpfs -+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/cxgb3 -+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/e1000e -+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/gpfs - - UNINSTALL_HOOKS += uninstall-hook-ela - diff -up ppc64-diag-2.7.4/ela/catalogs.h.than ppc64-diag-2.7.4/ela/catalogs.h --- ppc64-diag-2.7.4/ela/catalogs.h.than 2018-03-08 15:44:23.267910229 +0100 +++ ppc64-diag-2.7.4/ela/catalogs.h 2018-03-08 15:46:08.669835054 +0100 @@ -71,3 +34,40 @@ diff -up ppc64-diag-2.7.4/ela/syslog_to_svclog.cpp.than ppc64-diag-2.7.4/ela/sys "-d\t\tPrint debugging output on stderr.\n" "-e end_time\tStop upon reading message with timestamp after end_time.\n" "-F\t\tDon't stop at EOF; process newly logged messages as they occur.\n" +diff -up ppc64-diag-2.7.7/ela/Makefile.am.orig ppc64-diag-2.7.7/ela/Makefile.am +--- ppc64-diag-2.7.7/ela/Makefile.am.orig 2021-05-17 09:33:12.892415129 +0200 ++++ ppc64-diag-2.7.7/ela/Makefile.am 2021-05-17 09:39:06.332399898 +0200 +@@ -62,22 +62,22 @@ clean-local-ela: + CLEAN_LOCALS += clean-local-ela + + install-exec-hook-ela: +- install -d --mode=655 $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/ +- install -D --mode=644 $(CATALOG) $(DESTDIR)/etc/ppc64-diag/message_catalog/ ++ install -d --mode=755 $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/ ++ install -D --mode=644 $(CATALOG) $(DESTDIR)/usr/share/ppc64-diag/message_catalog/ + install -D --mode=644 $(CATALOG_REGEX) \ +- $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/ ++ $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/ + + INSTALL_EXEC_HOOKS += install-exec-hook-ela + + uninstall-hook-ela: +- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/cxgb3 +- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/e1000e +- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/exceptions +- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/reporters +- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/gpfs +- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/cxgb3 +- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/e1000e +- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/gpfs ++ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/cxgb3 ++ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/e1000e ++ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/exceptions ++ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/reporters ++ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/gpfs ++ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/cxgb3 ++ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/e1000e ++ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/gpfs + + UNINSTALL_HOOKS += uninstall-hook-ela + diff --git a/SOURCES/ppc64-diag-permission.patch b/SOURCES/ppc64-diag-permission.patch index feb0894..27f0bc6 100644 --- a/SOURCES/ppc64-diag-permission.patch +++ b/SOURCES/ppc64-diag-permission.patch @@ -10,20 +10,6 @@ diff -up ppc64-diag-2.7.4/diags/Makefile.am.than ppc64-diag-2.7.4/diags/Makefile INSTALL_EXEC_HOOKS += install-exec-hook-diag -diff -up ppc64-diag-2.7.4/ela/Makefile.am.than ppc64-diag-2.7.4/ela/Makefile.am ---- ppc64-diag-2.7.4/ela/Makefile.am.than 2018-03-09 14:12:39.942018046 +0100 -+++ ppc64-diag-2.7.4/ela/Makefile.am 2018-03-09 14:13:19.962739978 +0100 -@@ -69,8 +69,8 @@ CLEAN_LOCALS += clean-local-ela - - install-exec-hook-ela: - install -d --mode=755 $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/ -- install -D --mode=744 $(CATALOG) $(DESTDIR)/usr/share/ppc64-diag/message_catalog/ -- install -D --mode=744 $(CATALOG_REGEX) \ -+ install -D --mode=644 $(CATALOG) $(DESTDIR)/usr/share/ppc64-diag/message_catalog/ -+ install -D --mode=644 $(CATALOG_REGEX) \ - $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/ - - INSTALL_EXEC_HOOKS += install-exec-hook-ela diff -up ppc64-diag-2.7.4/rtas_errd/Makefile.am.than ppc64-diag-2.7.4/rtas_errd/Makefile.am --- ppc64-diag-2.7.4/rtas_errd/Makefile.am.than 2018-03-09 14:21:08.211186688 +0100 +++ ppc64-diag-2.7.4/rtas_errd/Makefile.am 2018-03-09 14:21:16.781341284 +0100 @@ -36,10 +22,21 @@ diff -up ppc64-diag-2.7.4/rtas_errd/Makefile.am.than ppc64-diag-2.7.4/rtas_errd/ uninstall-hook-rtas-errd: rm -f $(DESTDIR)/etc/rc.powerfail -diff -up ppc64-diag-2.7.4/scripts/Makefile.am.than ppc64-diag-2.7.4/scripts/Makefile.am -diff -up ppc64-diag-2.7.4/scripts/Makefile.am.than ppc64-diag-2.7.4/scripts/Makefile.am ---- ppc64-diag-2.7.4/scripts/Makefile.am.than 2018-03-09 14:32:56.393971751 +0100 -+++ ppc64-diag-2.7.4/scripts/Makefile.am 2018-03-09 14:33:18.374368602 +0100 +diff -up ppc64-diag-2.7.7/lpd/Makefile.am.orig ppc64-diag-2.7.7/lpd/Makefile.am +--- ppc64-diag-2.7.7/lpd/Makefile.am.orig 2021-05-17 09:50:40.176840226 +0200 ++++ ppc64-diag-2.7.7/lpd/Makefile.am 2021-05-17 09:51:00.464126336 +0200 +@@ -47,7 +47,7 @@ AM_LOCALS += all-local-lpd + + install-exec-hook-lpd: + install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag +- install -D --mode=744 $(LPD_SCRIPT) $(DESTDIR)/usr/libexec/ppc64-diag/ ++ install -D --mode=755 $(LPD_SCRIPT) $(DESTDIR)/usr/libexec/ppc64-diag/ + (cd $(DESTDIR)/$(sbindir) && $(LN_S) -f usysident usysattn) + (cd $(DESTDIR)/$(sbindir) && $(LN_S) -f usysident usysfault) + +diff -up ppc64-diag-2.7.7/scripts/Makefile.am.m ppc64-diag-2.7.7/scripts/Makefile.am +--- ppc64-diag-2.7.7/scripts/Makefile.am.m 2021-05-17 10:38:25.896078135 +0200 ++++ ppc64-diag-2.7.7/scripts/Makefile.am 2021-05-17 10:40:41.884984190 +0200 @@ -13,7 +13,7 @@ SERVICE_SCRIPT = scripts/rtas_errd.servi install-exec-hook-scripts: install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag/ @@ -49,15 +46,3 @@ diff -up ppc64-diag-2.7.4/scripts/Makefile.am.than ppc64-diag-2.7.4/scripts/Make 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/ -diff -up ppc64-diag-2.7.4/lpd/Makefile.am.than ppc64-diag-2.7.4/lpd/Makefile.am ---- ppc64-diag-2.7.4/lpd/Makefile.am.than 2018-03-09 14:35:40.576936043 +0100 -+++ ppc64-diag-2.7.4/lpd/Makefile.am 2018-03-09 14:36:05.927393740 +0100 -@@ -47,7 +47,7 @@ AM_LOCALS += all-local-lpd - - install-exec-hook-lpd: - install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag -- install -D --mode=744 $(LPD_SCRIPT) $(DESTDIR)/usr/libexec/ppc64-diag/ -+ install -D --mode=755 $(LPD_SCRIPT) $(DESTDIR)/usr/libexec/ppc64-diag/ - $(LN_S) $(sbindir)/usysident $(DESTDIR)/$(sbindir)/usysattn - $(LN_S) $(sbindir)/usysident $(DESTDIR)/$(sbindir)/usysfault - diff --git a/SPECS/ppc64-diag.spec b/SPECS/ppc64-diag.spec index 8cae2c8..4f63995 100644 --- a/SPECS/ppc64-diag.spec +++ b/SPECS/ppc64-diag.spec @@ -2,8 +2,8 @@ %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}\/usr\/libexec\/ppc64-diag\/servevent_parse.pl Name: ppc64-diag -Version: 2.7.6 -Release: 2%{?dist} +Version: 2.7.7 +Release: 1%{?dist} Summary: PowerLinux Platform Diagnostics URL: https://github.com/power-ras/ppc64-diag Group: System Environment/Base @@ -84,7 +84,7 @@ install -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD %files %license COPYING -%doc README +%doc README.md %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/ses_pages %dir %{_localstatedir}/log/%{name} @@ -177,6 +177,9 @@ if [ "$1" = "0" ]; then # last uninstall fi %changelog +* Mon May 17 2021 Than Ngo - 2.7.7-1 +- Resolves: #1779206, rebase to 2.7.7 + * Thu Mar 26 2020 Than Ngo - 2.7.6-2 - Resolves: #1814335, create rtas subpackage to avoid the perl dependency