diff --git a/.gitignore b/.gitignore
index eb5d427..c90dd74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/ppc64-diag-2.7.7.tar.gz
+SOURCES/ppc64-diag-2.7.8.tar.gz
diff --git a/.ppc64-diag.metadata b/.ppc64-diag.metadata
index aa639e7..1b95bf0 100644
--- a/.ppc64-diag.metadata
+++ b/.ppc64-diag.metadata
@@ -1 +1 @@
-c1886780f9e5133f0b05594b0f7c6b961dd9a481 SOURCES/ppc64-diag-2.7.7.tar.gz
+11da2a442ca94f4e06b68de0c4dcbc3432585611 SOURCES/ppc64-diag-2.7.8.tar.gz
diff --git a/SOURCES/ppc64-diag-2.7.5-getopt-help.patch b/SOURCES/ppc64-diag-2.7.5-getopt-help.patch
deleted file mode 100644
index 0dcbe44..0000000
--- a/SOURCES/ppc64-diag-2.7.5-getopt-help.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ppc64-diag-2.7.5/opal-dump-parse/opal-dump-parse.c.me ppc64-diag-2.7.5/opal-dump-parse/opal-dump-parse.c
---- ppc64-diag-2.7.5/opal-dump-parse/opal-dump-parse.c.me	2019-04-30 05:45:13.441888580 -0400
-+++ ppc64-diag-2.7.5/opal-dump-parse/opal-dump-parse.c	2019-04-30 06:02:49.102876167 -0400
-@@ -461,7 +461,7 @@ int main(int argc, char *argv[])
- {
- 	int opt = 0;
- 
--	while ((opt = getopt(argc, argv, "lh:s:o:")) != -1) {
-+	while ((opt = getopt(argc, argv, ":s:o:lh")) != -1) {
- 		switch (opt) {
- 		case 'l':
- 			opt_mdst = 1;
diff --git a/SOURCES/ppc64-diag-fedora.patch b/SOURCES/ppc64-diag-fedora.patch
new file mode 100644
index 0000000..8f16fcb
--- /dev/null
+++ b/SOURCES/ppc64-diag-fedora.patch
@@ -0,0 +1,397 @@
+From 9e2a0ee2356b2416479affe5e56903a265303cf4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Thu, 7 Apr 2022 19:08:47 +0200
+Subject: [PATCH 1/4] fix message catalog location
+
+---
+ ela/Makefile.am          | 22 +++++++++++-----------
+ ela/catalogs.h           |  2 +-
+ ela/explain_syslog.cpp   |  2 +-
+ ela/syslog_to_svclog.cpp |  2 +-
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/ela/Makefile.am b/ela/Makefile.am
+index 9dcb81c..a7d5a3f 100644
+--- a/ela/Makefile.am
++++ b/ela/Makefile.am
+@@ -62,22 +62,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=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/ela/catalogs.h b/ela/catalogs.h
+index ce68a86..f77ee01 100644
+--- a/ela/catalogs.h
++++ b/ela/catalogs.h
+@@ -34,7 +34,7 @@ using namespace std;
+ #include <stdio.h>
+ #include <regex.h>
+ 
+-#define ELA_CATALOG_DIR "/etc/ppc64-diag/message_catalog"
++#define ELA_CATALOG_DIR "/usr/share/ppc64-diag/message_catalog"
+ 
+ class Parser {
+ protected:
+diff --git a/ela/explain_syslog.cpp b/ela/explain_syslog.cpp
+index f8a0dc7..4b26418 100644
+--- a/ela/explain_syslog.cpp
++++ b/ela/explain_syslog.cpp
+@@ -97,7 +97,7 @@ print_help(void)
+ 	printf(
+ "-b begin_time\tIgnore messages with timestamps prior to begin_time.\n"
+ "-C catalog_dir\tUse message catalog in catalog_dir.  Defaults to\n"
+-"\t\t\t/etc/ppc64-diag/message_catalog.\n"
++"\t\t\t/usr/share/ppc64-diag/message_catalog.\n"
+ "-d\t\tPrint debugging output on stderr.\n"
+ "-e end_time\tStop upon reading message with timestamp after end_time.\n"
+ "-h\t\tPrint this help text and exit.\n"
+diff --git a/ela/syslog_to_svclog.cpp b/ela/syslog_to_svclog.cpp
+index 35adca2..2b3d945 100644
+--- a/ela/syslog_to_svclog.cpp
++++ b/ela/syslog_to_svclog.cpp
+@@ -682,7 +682,7 @@ print_help(void)
+ 	printf(
+ "-b begin_time\tIgnore messages with timestamps prior to begin_time.\n"
+ "-C catalog_dir\tUse message catalog in catalog_dir.  Defaults to\n"
+-"\t\t\t/etc/ppc64-diag/message_catalog.\n"
++"\t\t\t/usr/share/ppc64-diag/message_catalog.\n"
+ "-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"
+-- 
+2.34.1
+
+
+From 1f962c902b170f073af51693182d2b4e3ec4f174 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Thu, 7 Apr 2022 19:09:21 +0200
+Subject: [PATCH 2/4] fix script location
+
+---
+ scripts/Makefile.am          | 15 ++++++++-------
+ scripts/ppc64_diag_migrate   |  2 +-
+ scripts/ppc64_diag_mkrsrc    |  4 ++--
+ scripts/ppc64_diag_notify    |  6 +++---
+ scripts/ppc64_diag_servagent |  4 ++--
+ scripts/ppc64_diag_setup     |  6 +++---
+ scripts/rtas_errd            |  2 +-
+ 7 files changed, 20 insertions(+), 19 deletions(-)
+
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index 29dcb78..dc88ab9 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -11,20 +11,21 @@ INIT_FILES = scripts/rtas_errd scripts/opal_errd
+ SERVICE_SCRIPT = scripts/rtas_errd.service scripts/opal_errd.service
+ 
+ install-exec-hook-scripts:
++	install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag/
+ 	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=744 $(PPC64_DIAG_SCRIPT) $(DESTDIR)/usr/libexec/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/
+ 
+ uninstall-hook-scripts:
+-	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_setup
+-	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_mkrsrc
+-	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_notify
+-	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_migrate
+-	rm -f $(DESTDIR)/etc/ppc64-diag/servevent_parse.pl
++	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_setup
++	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_mkrsrc
++	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_notify
++	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_migrate
++	rm -f $(DESTDIR)/usr/libexec/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
+diff --git a/scripts/ppc64_diag_migrate b/scripts/ppc64_diag_migrate
+index 50b5dd2..5c608eb 100755
+--- a/scripts/ppc64_diag_migrate
++++ b/scripts/ppc64_diag_migrate
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -I /etc/ppc64-diag
++#! /usr/bin/perl -I /usr/libexec/ppc64-diag
+ #
+ # This script is to be registered with servicelog as a notification tool.  It
+ # is responsible for performing whatever actions may be necessary following
+diff --git a/scripts/ppc64_diag_mkrsrc b/scripts/ppc64_diag_mkrsrc
+index 53e7a27..4df8b72 100755
+--- a/scripts/ppc64_diag_mkrsrc
++++ b/scripts/ppc64_diag_mkrsrc
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -I /etc/ppc64-diag
++#! /usr/bin/perl -I /usr/libexec/ppc64-diag
+ #
+ # This script is to be registered with servicelog as a notification tool.  It
+ # is responsible for creating a new IBM.ServiceEvent RMC resource when a
+@@ -27,7 +27,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+-require "/etc/ppc64-diag/servevent_parse.pl";
++require "/usr/libexec/ppc64-diag/servevent_parse.pl";
+ 
+ # Check to make sure that devices.chrp.base.ServiceRM is installed
+ $rc = system("which rpm >/dev/null 2>&1");
+diff --git a/scripts/ppc64_diag_notify b/scripts/ppc64_diag_notify
+index 9f198d9..607bb7f 100755
+--- a/scripts/ppc64_diag_notify
++++ b/scripts/ppc64_diag_notify
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -I /etc/ppc64-diag
++#! /usr/bin/perl -I /usr/libexec/ppc64-diag
+ #
+ # This script is to be registered with servicelog as a notification tool.  It
+ # is responsible for sending out e-mail notifications of new ppc64 platform
+@@ -22,7 +22,7 @@
+  
+ use Getopt::Long;
+ 
+-require "/etc/ppc64-diag/servevent_parse.pl";
++require "/usr/libexec/ppc64-diag/servevent_parse.pl";
+ 
+ sub usage {
+ 	print "$0 [OPTIONS]\n";
+@@ -156,7 +156,7 @@ if ($flag_email) {
+ 	chomp $hostname;
+ 	$subject = "$hostname: serviceable platform event logged";
+ 
+-	if (open(MAILLIST, "< /etc/ppc64-diag/mail_list")) {
++	if (open(MAILLIST, "< /usr/libexec/ppc64-diag/mail_list")) {
+ 		while (<MAILLIST>) {
+ 			chomp;
+ 			$pos = index($_, "#");
+diff --git a/scripts/ppc64_diag_servagent b/scripts/ppc64_diag_servagent
+index 4f45983..9966302 100755
+--- a/scripts/ppc64_diag_servagent
++++ b/scripts/ppc64_diag_servagent
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -I /etc/ppc64-diag
++#! /usr/bin/perl -I /usr/libexec/ppc64-diag
+ #
+ # This script is to be registered with servicelog as a notification tool.  It
+ # is responsible for invoking Electronic Service Agent in response to a
+@@ -25,7 +25,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  
+-require "/etc/ppc64-diag/servevent_parse.pl";
++require "/usr/libexec/ppc64-diag/servevent_parse.pl";
+ 
+ if (!-e "/usr/svcagent/bin/callsa2") {
+ 	# eSA is not installed; exit quietly
+diff --git a/scripts/ppc64_diag_setup b/scripts/ppc64_diag_setup
+index 283c357..2c80c5c 100755
+--- a/scripts/ppc64_diag_setup
++++ b/scripts/ppc64_diag_setup
+@@ -89,15 +89,15 @@ sub unregister {
+ 
+ @notification_tools = (
+ 
+-    ["/etc/ppc64-diag/ppc64_diag_notify -q -e root -l /var/log/platform",
++    ["/usr/libexec/ppc64-diag/ppc64_diag_notify -q -e root -l /var/log/platform",
+      "--match='serviceable=1' ".
+      "--type=EVENT --method=pairs_stdin"],
+ 
+-    ["/etc/ppc64-diag/ppc64_diag_mkrsrc",
++    ["/usr/libexec/ppc64-diag/ppc64_diag_mkrsrc",
+      "--match='serviceable=1' ".
+      "--type=EVENT --method=pairs_stdin"],
+ 
+-    ["/etc/ppc64-diag/ppc64_diag_migrate",
++    ["/usr/libexec/ppc64-diag/ppc64_diag_migrate",
+      "--match=\'refcode=\"#MIGRATE\" and serviceable=0\' ".
+      "--type=EVENT --method=pairs_stdin"],
+ );
+diff --git a/scripts/rtas_errd b/scripts/rtas_errd
+index d5d40fe..fd9d5d2 100755
+--- a/scripts/rtas_errd
++++ b/scripts/rtas_errd
+@@ -66,7 +66,7 @@ case "$1" in
+ 		echo "registering ppc64-diag with system"
+ 		rm -f /var/cache/ppc64-diag.registered
+ 		mkdir -v /var/cache/ppc64-diag.registered
+-		/etc/ppc64-diag/ppc64_diag_setup --register
++		/usr/libexec/ppc64-diag/ppc64_diag_setup --register
+ 	fi
+ 	echo -n "Starting rtas_errd (platform error handling) daemon: "
+ 	if [ $INSSERV -eq 1 ]; then
+-- 
+2.34.1
+
+
+From 6d56d9d7b96232d2e75800282a86760ba87b9204 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Thu, 7 Apr 2022 19:10:32 +0200
+Subject: [PATCH 3/4] fix lpd script location
+
+---
+ lpd/Makefile.am            | 8 ++++----
+ lpd/scripts/lp_diag_notify | 2 +-
+ lpd/scripts/lp_diag_setup  | 6 +++---
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/lpd/Makefile.am b/lpd/Makefile.am
+index 4e0c03f..df362c0 100644
+--- a/lpd/Makefile.am
++++ b/lpd/Makefile.am
+@@ -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/lpd/scripts/lp_diag_notify b/lpd/scripts/lp_diag_notify
+index 52dc242..f500299 100755
+--- a/lpd/scripts/lp_diag_notify
++++ b/lpd/scripts/lp_diag_notify
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -I /etc/ppc64-diag
++#!/usr/bin/perl -I /usr/libexec/ppc64-diag
+ # @file		lp_diag_notify
+ #
+ # This script is to be registered with servicelog as a notification tool.
+diff --git a/lpd/scripts/lp_diag_setup b/lpd/scripts/lp_diag_setup
+index 8dabb75..4b4d0a2 100755
+--- a/lpd/scripts/lp_diag_setup
++++ b/lpd/scripts/lp_diag_setup
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -I /etc/ppc64-diag
++#!/usr/bin/perl -I /usr/libexec/ppc64-diag
+ # @file		lp_diag_setup
+ # @brief	Register/unregister Light Path notification tools
+ #		with servicelog
+@@ -91,10 +91,10 @@ sub unregister {
+ }
+ 
+ @notification_tools = (
+-    ["/etc/ppc64-diag/lp_diag_notify -e",
++    ["/usr/libexec/ppc64-diag/lp_diag_notify -e",
+      "--match='disposition>=1 and severity>=4 and serviceable=1' ".
+      "--type=EVENT --method=num_arg"],
+-    ["/etc/ppc64-diag/lp_diag_notify -r",
++    ["/usr/libexec/ppc64-diag/lp_diag_notify -r",
+      "--type=REPAIR --method=num_arg"],
+ );
+ 
+-- 
+2.34.1
+
+
+From 156ec91278ba350a4cd7a722a2431e07e4f461bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Thu, 7 Apr 2022 19:11:02 +0200
+Subject: [PATCH 4/4] fix permissions
+
+---
+ diags/Makefile.am     | 2 +-
+ lpd/Makefile.am       | 2 +-
+ rtas_errd/Makefile.am | 2 +-
+ scripts/Makefile.am   | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/diags/Makefile.am b/diags/Makefile.am
+index f513cec..268d5f4 100644
+--- a/diags/Makefile.am
++++ b/diags/Makefile.am
+@@ -43,7 +43,7 @@ DIAG_CRONTAB_SCRIPT = diags/run_diag_encl
+ install-exec-hook-diag:
+ 	install -d --mode=755 $(DESTDIR)/var/log/ppc64-diag/diag_disk
+ 	install -d --mode=755 $(DESTDIR)/etc/cron.daily/
+-	install -D --mode=744 $(DIAG_CRONTAB_SCRIPT) $(DESTDIR)/etc/cron.daily/
++	install -D --mode=644 $(DIAG_CRONTAB_SCRIPT) $(DESTDIR)/etc/cron.daily/
+ 
+ INSTALL_EXEC_HOOKS += install-exec-hook-diag
+ 
+diff --git a/lpd/Makefile.am b/lpd/Makefile.am
+index df362c0..c430b9a 100644
+--- a/lpd/Makefile.am
++++ b/lpd/Makefile.am
+@@ -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 --git a/rtas_errd/Makefile.am b/rtas_errd/Makefile.am
+index f475840..ed70978 100644
+--- a/rtas_errd/Makefile.am
++++ b/rtas_errd/Makefile.am
+@@ -47,7 +47,7 @@ dist_man_MANS += rtas_errd/man/rtas_errd.8
+ 
+ install-exec-hook-rtas-errd:
+ 	install -d --mode=755 $(DESTDIR)/etc/
+-	install -D --mode=744 $(rtas_scripts) $(DESTDIR)/etc/
++	install -D --mode=755 $(rtas_scripts) $(DESTDIR)/etc/
+ 
+ uninstall-hook-rtas-errd:
+ 	rm -f $(DESTDIR)/etc/rc.powerfail
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index dc88ab9..637168f 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -13,7 +13,7 @@ SERVICE_SCRIPT = scripts/rtas_errd.service scripts/opal_errd.service
+ install-exec-hook-scripts:
+ 	install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag/
+ 	install -d --mode=755 $(DESTDIR)/etc/ppc64-diag/
+-	install -D --mode=744 $(PPC64_DIAG_SCRIPT) $(DESTDIR)/usr/libexec/ppc64-diag/
++	install -D --mode=755 $(PPC64_DIAG_SCRIPT) $(DESTDIR)/usr/libexec/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/
+-- 
+2.34.1
+
diff --git a/SOURCES/ppc64-diag-lpdscriptloc.patch b/SOURCES/ppc64-diag-lpdscriptloc.patch
deleted file mode 100644
index 64b79c7..0000000
--- a/SOURCES/ppc64-diag-lpdscriptloc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -I /etc/ppc64-diag
-+#!/usr/bin/perl -I /usr/libexec/ppc64-diag
- # @file		lp_diag_notify
- #
- # This script is to be registered with servicelog as a notification tool.
-diff -up ppc64-diag-2.7.4/lpd/scripts/lp_diag_setup.than ppc64-diag-2.7.4/lpd/scripts/lp_diag_setup
---- ppc64-diag-2.7.4/lpd/scripts/lp_diag_setup.than	2018-03-08 16:43:46.263078928 +0100
-+++ ppc64-diag-2.7.4/lpd/scripts/lp_diag_setup	2018-03-08 16:44:04.193406516 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -I /etc/ppc64-diag
-+#!/usr/bin/perl -I /usr/libexec/ppc64-diag
- # @file		lp_diag_setup
- # @brief	Register/unregister Light Path notification tools
- #		with servicelog
-@@ -91,10 +91,10 @@ sub unregister {
- }
- 
- @notification_tools = (
--    ["/etc/ppc64-diag/lp_diag_notify -e",
-+    ["/usr/libexec/ppc64-diag/lp_diag_notify -e",
-      "--match='disposition>=1 and severity>=4 and serviceable=1' ".
-      "--type=EVENT --method=num_arg"],
--    ["/etc/ppc64-diag/lp_diag_notify -r",
-+    ["/usr/libexec/ppc64-diag/lp_diag_notify -r",
-      "--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
deleted file mode 100644
index 2d7bdf5..0000000
--- a/SOURCES/ppc64-diag-messagecatalog-location.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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
-@@ -34,7 +34,7 @@ using namespace std;
- #include <stdio.h>
- #include <regex.h>
- 
--#define ELA_CATALOG_DIR "/etc/ppc64-diag/message_catalog"
-+#define ELA_CATALOG_DIR "/usr/share/ppc64-diag/message_catalog"
- 
- class Parser {
- protected:
-diff -up ppc64-diag-2.7.4/ela/explain_syslog.cpp.than ppc64-diag-2.7.4/ela/explain_syslog.cpp
---- ppc64-diag-2.7.4/ela/explain_syslog.cpp.than	2018-03-08 15:46:24.470123596 +0100
-+++ ppc64-diag-2.7.4/ela/explain_syslog.cpp	2018-03-08 15:46:49.630583070 +0100
-@@ -97,7 +97,7 @@ print_help(void)
- 	printf(
- "-b begin_time\tIgnore messages with timestamps prior to begin_time.\n"
- "-C catalog_dir\tUse message catalog in catalog_dir.  Defaults to\n"
--"\t\t\t/etc/ppc64-diag/message_catalog.\n"
-+"\t\t\t/usr/share/ppc64-diag/message_catalog.\n"
- "-d\t\tPrint debugging output on stderr.\n"
- "-e end_time\tStop upon reading message with timestamp after end_time.\n"
- "-h\t\tPrint this help text and exit.\n"
-diff -up ppc64-diag-2.7.4/ela/syslog_to_svclog.cpp.than ppc64-diag-2.7.4/ela/syslog_to_svclog.cpp
---- ppc64-diag-2.7.4/ela/syslog_to_svclog.cpp.than	2018-03-08 15:47:03.030827782 +0100
-+++ ppc64-diag-2.7.4/ela/syslog_to_svclog.cpp	2018-03-08 15:47:10.770969131 +0100
-@@ -682,7 +682,7 @@ print_help(void)
- 	printf(
- "-b begin_time\tIgnore messages with timestamps prior to begin_time.\n"
- "-C catalog_dir\tUse message catalog in catalog_dir.  Defaults to\n"
--"\t\t\t/etc/ppc64-diag/message_catalog.\n"
-+"\t\t\t/usr/share/ppc64-diag/message_catalog.\n"
- "-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
deleted file mode 100644
index 27f0bc6..0000000
--- a/SOURCES/ppc64-diag-permission.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up ppc64-diag-2.7.4/diags/Makefile.am.than ppc64-diag-2.7.4/diags/Makefile.am
---- ppc64-diag-2.7.4/diags/Makefile.am.than	2018-03-09 14:23:50.504115816 +0100
-+++ ppc64-diag-2.7.4/diags/Makefile.am	2018-03-09 14:24:31.454855174 +0100
-@@ -43,7 +43,7 @@ DIAG_CRONTAB_SCRIPT = diags/run_diag_enc
- install-exec-hook-diag:
- 	install -d --mode=755 $(DESTDIR)/var/log/ppc64-diag/diag_disk
- 	install -d --mode=755 $(DESTDIR)/etc/cron.daily/
--	install -D --mode=744 $(DIAG_CRONTAB_SCRIPT) $(DESTDIR)/etc/cron.daily/
-+	install -D --mode=644 $(DIAG_CRONTAB_SCRIPT) $(DESTDIR)/etc/cron.daily/
- 
- INSTALL_EXEC_HOOKS += install-exec-hook-diag
- 
-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
-@@ -46,7 +46,7 @@ rtas_scripts = rtas_errd/rc.powerfail
- 
- install-exec-hook-rtas-errd:
- 	install -d --mode=755 $(DESTDIR)/etc/
--	install -D --mode=744 $(rtas_scripts) $(DESTDIR)/etc/
-+	install -D --mode=755 $(rtas_scripts) $(DESTDIR)/etc/
- 
- uninstall-hook-rtas-errd:
- 	rm -f $(DESTDIR)/etc/rc.powerfail
-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/
- 	install -d --mode=755 $(DESTDIR)/etc/ppc64-diag/
--	install -D --mode=744 $(PPC64_DIAG_SCRIPT) $(DESTDIR)/usr/libexec/ppc64-diag/
-+	install -D --mode=755 $(PPC64_DIAG_SCRIPT) $(DESTDIR)/usr/libexec/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/
diff --git a/SOURCES/ppc64-diag-scriptlocation.patch b/SOURCES/ppc64-diag-scriptlocation.patch
deleted file mode 100644
index 6f358aa..0000000
--- a/SOURCES/ppc64-diag-scriptlocation.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -up ppc64-diag-2.7.4/scripts/Makefile.am.script_loc ppc64-diag-2.7.4/scripts/Makefile.am
---- ppc64-diag-2.7.4/scripts/Makefile.am.script_loc	2017-07-24 06:43:44.000000000 +0200
-+++ ppc64-diag-2.7.4/scripts/Makefile.am	2018-03-08 17:14:52.827188427 +0100
-@@ -11,20 +11,21 @@ INIT_FILES = scripts/rtas_errd scripts/o
- SERVICE_SCRIPT = scripts/rtas_errd.service scripts/opal_errd.service
- 
- install-exec-hook-scripts:
-+	install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag/
- 	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=744 $(PPC64_DIAG_SCRIPT) $(DESTDIR)/usr/libexec/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/
- 
- uninstall-hook-scripts:
--	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_setup
--	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_mkrsrc
--	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_notify
--	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_migrate
--	rm -f $(DESTDIR)/etc/ppc64-diag/servevent_parse.pl
-+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_setup
-+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_mkrsrc
-+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_notify
-+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_migrate
-+	rm -f $(DESTDIR)/usr/libexec/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
-diff -up ppc64-diag-2.7.4/scripts/ppc64_diag_migrate.script_loc ppc64-diag-2.7.4/scripts/ppc64_diag_migrate
---- ppc64-diag-2.7.4/scripts/ppc64_diag_migrate.script_loc	2017-07-24 06:43:44.000000000 +0200
-+++ ppc64-diag-2.7.4/scripts/ppc64_diag_migrate	2018-03-08 17:11:16.843240860 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -I /etc/ppc64-diag
-+#! /usr/bin/perl -I /usr/libexec/ppc64-diag
- #
- # This script is to be registered with servicelog as a notification tool.  It
- # is responsible for performing whatever actions may be necessary following
-diff -up ppc64-diag-2.7.4/scripts/ppc64_diag_mkrsrc.script_loc ppc64-diag-2.7.4/scripts/ppc64_diag_mkrsrc
---- ppc64-diag-2.7.4/scripts/ppc64_diag_mkrsrc.script_loc	2017-07-24 06:43:44.000000000 +0200
-+++ ppc64-diag-2.7.4/scripts/ppc64_diag_mkrsrc	2018-03-08 17:11:16.843240860 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -I /etc/ppc64-diag
-+#! /usr/bin/perl -I /usr/libexec/ppc64-diag
- #
- # This script is to be registered with servicelog as a notification tool.  It
- # is responsible for creating a new IBM.ServiceEvent RMC resource when a
-@@ -27,7 +27,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- 
--require "/etc/ppc64-diag/servevent_parse.pl";
-+require "/usr/libexec/ppc64-diag/servevent_parse.pl";
- 
- # Check to make sure that devices.chrp.base.ServiceRM is installed
- $rc = system("which rpm >/dev/null 2>&1");
-diff -up ppc64-diag-2.7.4/scripts/ppc64_diag_notify.script_loc ppc64-diag-2.7.4/scripts/ppc64_diag_notify
---- ppc64-diag-2.7.4/scripts/ppc64_diag_notify.script_loc	2017-07-24 06:43:44.000000000 +0200
-+++ ppc64-diag-2.7.4/scripts/ppc64_diag_notify	2018-03-08 17:11:16.843240860 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -I /etc/ppc64-diag
-+#! /usr/bin/perl -I /usr/libexec/ppc64-diag
- #
- # This script is to be registered with servicelog as a notification tool.  It
- # is responsible for sending out e-mail notifications of new ppc64 platform
-@@ -22,7 +22,7 @@
-  
- use Getopt::Long;
- 
--require "/etc/ppc64-diag/servevent_parse.pl";
-+require "/usr/libexec/ppc64-diag/servevent_parse.pl";
- 
- sub usage {
- 	print "$0 [OPTIONS]\n";
-@@ -156,7 +156,7 @@ if ($flag_email) {
- 	chomp $hostname;
- 	$subject = "$hostname: serviceable platform event logged";
- 
--	if (open(MAILLIST, "< /etc/ppc64-diag/mail_list")) {
-+	if (open(MAILLIST, "< /usr/libexec/ppc64-diag/mail_list")) {
- 		while (<MAILLIST>) {
- 			chomp;
- 			$pos = index($_, "#");
-diff -up ppc64-diag-2.7.4/scripts/ppc64_diag_servagent.script_loc ppc64-diag-2.7.4/scripts/ppc64_diag_servagent
---- ppc64-diag-2.7.4/scripts/ppc64_diag_servagent.script_loc	2017-07-24 06:43:44.000000000 +0200
-+++ ppc64-diag-2.7.4/scripts/ppc64_diag_servagent	2018-03-08 17:11:16.843240860 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -I /etc/ppc64-diag
-+#! /usr/bin/perl -I /usr/libexec/ppc64-diag
- #
- # This script is to be registered with servicelog as a notification tool.  It
- # is responsible for invoking Electronic Service Agent in response to a
-@@ -25,7 +25,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-  
--require "/etc/ppc64-diag/servevent_parse.pl";
-+require "/usr/libexec/ppc64-diag/servevent_parse.pl";
- 
- if (!-e "/usr/svcagent/bin/callsa2") {
- 	# eSA is not installed; exit quietly
-diff -up ppc64-diag-2.7.4/scripts/ppc64_diag_setup.script_loc ppc64-diag-2.7.4/scripts/ppc64_diag_setup
---- ppc64-diag-2.7.4/scripts/ppc64_diag_setup.script_loc	2017-07-24 06:43:44.000000000 +0200
-+++ ppc64-diag-2.7.4/scripts/ppc64_diag_setup	2018-03-08 17:11:16.843240860 +0100
-@@ -89,15 +89,15 @@ sub unregister {
- 
- @notification_tools = (
- 
--    ["/etc/ppc64-diag/ppc64_diag_notify -q -e root -l /var/log/platform",
-+    ["/usr/libexec/ppc64-diag/ppc64_diag_notify -q -e root -l /var/log/platform",
-      "--match='serviceable=1' ".
-      "--type=EVENT --method=pairs_stdin"],
- 
--    ["/etc/ppc64-diag/ppc64_diag_mkrsrc",
-+    ["/usr/libexec/ppc64-diag/ppc64_diag_mkrsrc",
-      "--match='serviceable=1' ".
-      "--type=EVENT --method=pairs_stdin"],
- 
--    ["/etc/ppc64-diag/ppc64_diag_migrate",
-+    ["/usr/libexec/ppc64-diag/ppc64_diag_migrate",
-      "--match=\'refcode=\"#MIGRATE\" and serviceable=0\' ".
-      "--type=EVENT --method=pairs_stdin"],
- );
-diff -up ppc64-diag-2.7.4/scripts/rtas_errd.script_loc ppc64-diag-2.7.4/scripts/rtas_errd
---- ppc64-diag-2.7.4/scripts/rtas_errd.script_loc	2018-03-08 17:11:16.833240678 +0100
-+++ ppc64-diag-2.7.4/scripts/rtas_errd	2018-03-08 17:11:16.843240860 +0100
-@@ -69,7 +69,7 @@ case "$1" in
- 		echo "registering ppc64-diag with system"
- 		rm -f /var/cache/ppc64-diag.registered
- 		mkdir -v /var/cache/ppc64-diag.registered
--		/etc/ppc64-diag/ppc64_diag_setup --register
-+		/usr/libexec/ppc64-diag/ppc64_diag_setup --register
- 	fi
- 	echo -n "Starting rtas_errd (platform error handling) daemon: "
- 	if [ $INSSERV -eq 1 ]; then
diff --git a/SPECS/ppc64-diag.spec b/SPECS/ppc64-diag.spec
index 4f63995..c681d65 100644
--- a/SPECS/ppc64-diag.spec
+++ b/SPECS/ppc64-diag.spec
@@ -2,7 +2,7 @@
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}\/usr\/libexec\/ppc64-diag\/servevent_parse.pl
 
 Name:           ppc64-diag
-Version:        2.7.7
+Version:        2.7.8
 Release:        1%{?dist}
 Summary:        PowerLinux Platform Diagnostics
 URL:            https://github.com/power-ras/ppc64-diag
@@ -10,14 +10,16 @@ Group:          System Environment/Base
 License:        GPLv2
 ExclusiveArch:  ppc %{power64}
 
+BuildRequires:  make
+BuildRequires:  gcc-c++
 BuildRequires:  libservicelog-devel
 BuildRequires:  flex
 BuildRequires:  perl-interpreter
 BuildRequires:  byacc
-BuildRequires:  libvpd-devel
-BuildRequires:  systemd-units
+BuildRequires:  libvpd-devel >= 2.2.9
 BuildRequires:  ncurses-devel
 BuildRequires:  librtas-devel >= 1.4.0
+BuildRequires:  systemd-units
 BuildRequires:  systemd-devel
 BuildRequires:  libtool
 BuildRequires:  bison
@@ -25,7 +27,6 @@ BuildRequires:  bison
 Requires:       ppc64-diag-rtas >= 2.7.6
 Requires:       servicelog
 Requires:       lsvpd
-# PCI hotplug support on PowerKVM guest depends on below powerpc-utils version.
 Requires:       powerpc-utils >= 1.3.0
 
 Source0:        https://github.com/power-ras/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -36,11 +37,7 @@ Source4:        extract_platdump.8
 Source5:        rtas_errd.8
 
 # fix paths and permissions
-Patch0:         ppc64-diag-messagecatalog-location.patch
-Patch2:         ppc64-diag-scriptlocation.patch
-Patch3:         ppc64-diag-lpdscriptloc.patch
-Patch4:         ppc64-diag-permission.patch
-Patch5:         ppc64-diag-2.7.5-getopt-help.patch
+Patch0:         ppc64-diag-fedora.patch
 
 %description
 This package contains various diagnostic tools for PowerLinux.
@@ -76,8 +73,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/ses_pages
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/dump
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/opal-elog
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/%{name}
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/%{name}/diag_disk
  
 ln -sfv %{_sbindir}/usysattn $RPM_BUILD_ROOT/%{_sbindir}/usysfault
 install -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/%{_mandir}/man8/
@@ -87,7 +82,6 @@ install -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD
 %doc README.md
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/ses_pages
-%dir %{_localstatedir}/log/%{name}
 %dir %{_localstatedir}/log/%{name}/diag_disk
 %dir %{_localstatedir}/log/dump
 %dir %{_localstatedir}/log/opal-elog
@@ -136,18 +130,18 @@ install -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD
 %{_libexecdir}/%{name}/lp_diag_setup --register >/dev/null 2>&1
 %{_libexecdir}/%{name}/ppc64_diag_setup --register >/dev/null 2>&1
 if [ "$1" = "1" ]; then # first install
-    systemctl -q enable opal_errd.service >/dev/null
-    systemctl start opal_errd.service >/dev/null
+    systemctl -q enable opal_errd.service >/dev/null 2>&1
+    systemctl start opal_errd.service >/dev/null 2>&1
 elif [ "$1" = "2" ]; then # upgrade
-    systemctl restart opal_errd.service >/dev/null
+    systemctl restart opal_errd.service >/dev/null 2>&1
     systemctl daemon-reload > /dev/null 2>&1
 fi
 
 %preun
 # Pre-uninstall script -------------------------------------------------
 if [ "$1" = "0" ]; then # last uninstall
-    systemctl stop opal_errd.service >/dev/null
-    systemctl -q disable opal_errd.service
+    systemctl stop opal_errd.service >/dev/null 2>&1
+    systemctl -q disable opal_errd.service >/dev/null 2>&1
     %{_libexecdir}/%{name}/ppc64_diag_setup --unregister >/dev/null
     %{_libexecdir}/%{name}/lp_diag_setup --unregister >/dev/null
     systemctl daemon-reload > /dev/null 2>&1
@@ -156,8 +150,8 @@ fi
 %triggerin -- librtas
 # trigger on librtas upgrades ------------------------------------------
 if [ "$2" = "2" ]; then
-    systemctl restart opal_errd.service >/dev/null
-    systemctl restart rtas_errd.service >/dev/null
+    systemctl restart opal_errd.service >/dev/null 2>&1
+    systemctl restart rtas_errd.service >/dev/null 2>&1
 fi
 
 %post rtas
@@ -177,6 +171,9 @@ if [ "$1" = "0" ]; then # last uninstall
 fi
 
 %changelog
+* Fri May 13 2022 Than Ngo <than@redhat.com> - 2.7.8-1
+- Resolves: #2051313, rebase to 2.7.8
+
 * Mon May 17 2021 Than Ngo <than@redhat.com> - 2.7.7-1
 - Resolves: #1779206, rebase to 2.7.7