update to latest upstream 2.7.4
This commit is contained in:
parent
fcf36e62d5
commit
ac7c87f14a
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@
|
||||
/ppc64-diag-2.6.10.tar.gz
|
||||
/ppc64-diag-2.7.0.tar.gz
|
||||
/ppc64-diag-2.7.1.tar.gz
|
||||
/ppc64-diag-2.7.4.tar.gz
|
||||
|
@ -1,40 +1,46 @@
|
||||
diff --git a/lpd/scripts/Makefile b/lpd/scripts/Makefile
|
||||
index d028d09..9cb1ae5 100644
|
||||
--- a/lpd/scripts/Makefile
|
||||
+++ b/lpd/scripts/Makefile
|
||||
@@ -8,9 +8,9 @@ SCRIPTS = lp_diag_setup lp_diag_notify
|
||||
all: $(SCRIPTS)
|
||||
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: all
|
||||
- @$(call install_files,$(SCRIPTS),744,$(DESTDIR)/etc/ppc64-diag)
|
||||
+ @$(call install_files,$(SCRIPTS),744,$(DESTDIR)/usr/libexec/ppc64-diag)
|
||||
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
|
||||
|
||||
uninstall:
|
||||
- @$(call uninstall_files,$(SCRIPTS),$(DESTDIR)/etc/ppc64-diag)
|
||||
+ @$(call uninstall_files,$(SCRIPTS),$(DESTDIR)/usr/libexec/ppc64-diag)
|
||||
INSTALL_EXEC_HOOKS += install-exec-hook-lpd
|
||||
|
||||
clean:
|
||||
diff --git a/lpd/scripts/lp_diag_notify b/lpd/scripts/lp_diag_notify
|
||||
index 9cb9b04..fb67138 100755
|
||||
--- a/lpd/scripts/lp_diag_notify
|
||||
+++ b/lpd/scripts/lp_diag_notify
|
||||
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
|
||||
@@ -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 7d7cc94..acbe05a 100755
|
||||
--- a/lpd/scripts/lp_diag_setup
|
||||
+++ b/lpd/scripts/lp_diag_setup
|
||||
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
|
||||
@@ -78,10 +78,10 @@ sub unregister {
|
||||
@@ -91,10 +91,10 @@ sub unregister {
|
||||
}
|
||||
|
||||
@notification_tools = (
|
||||
|
@ -1,45 +1,44 @@
|
||||
From 47c29d1884912af81e392cbae3b17f6cfb720c1f Mon Sep 17 00:00:00 2001
|
||||
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
||||
Date: Thu, 25 Sep 2014 16:28:35 +0530
|
||||
Subject: [PATCH 1/5] Update message location
|
||||
|
||||
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
||||
---
|
||||
ela/Makefile | 8 ++++----
|
||||
ela/catalogs.h | 2 +-
|
||||
ela/explain_syslog.cpp | 2 +-
|
||||
ela/syslog_to_svclog.cpp | 2 +-
|
||||
4 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/ela/Makefile b/ela/Makefile
|
||||
index 2205cd2..ad52c5e 100644
|
||||
--- a/ela/Makefile
|
||||
+++ b/ela/Makefile
|
||||
@@ -67,8 +67,8 @@ catalogs.o: catalogs.h
|
||||
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: all
|
||||
@$(call install_sbin,$(CMDS),$(DESTDIR))
|
||||
- @$(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_files,$(CATALOG),744,$(DESTDIR)/usr/share/ppc64-diag/message_catalog)
|
||||
+ @$(call install_files,$(CATALOG_REGEX),744,$(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex)
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)/var/log/ppc64-diag
|
||||
@$(foreach d,$(SUBDIRS), $(MAKE) -C $d install;)
|
||||
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/
|
||||
|
||||
@@ -78,6 +78,6 @@ clean:
|
||||
INSTALL_EXEC_HOOKS += install-exec-hook-ela
|
||||
|
||||
uninstall:
|
||||
@$(call uninstall_sbin,$(CMDS),$(DESTDIR))
|
||||
- @$(call uninstall_files,$(CATALOG),$(DESTDIR)/etc/ppc64-diag/)
|
||||
- @$(call uninstall_files,$(CATALOG_REGEX),$(DESTDIR)/etc/ppc64-diag/)
|
||||
+ @$(call uninstall_files,$(CATALOG),$(DESTDIR)/usr/share/ppc64-diag/)
|
||||
+ @$(call uninstall_files,$(CATALOG_REGEX),$(DESTDIR)/usr/share/ppc64-diag/)
|
||||
@$(foreach d,$(SUBDIRS), $(MAKE) -C $d uninstall;)
|
||||
diff --git a/ela/catalogs.h b/ela/catalogs.h
|
||||
index 71ad14c..a8f82c2 100644
|
||||
--- a/ela/catalogs.h
|
||||
+++ b/ela/catalogs.h
|
||||
@@ -21,7 +21,7 @@ using namespace std;
|
||||
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
|
||||
@@ -34,7 +34,7 @@ using namespace std;
|
||||
#include <stdio.h>
|
||||
#include <regex.h>
|
||||
|
||||
@ -48,10 +47,9 @@ index 71ad14c..a8f82c2 100644
|
||||
|
||||
class Parser {
|
||||
protected:
|
||||
diff --git a/ela/explain_syslog.cpp b/ela/explain_syslog.cpp
|
||||
index 87bda1c..85eae68 100644
|
||||
--- a/ela/explain_syslog.cpp
|
||||
+++ b/ela/explain_syslog.cpp
|
||||
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"
|
||||
@ -61,11 +59,10 @@ index 87bda1c..85eae68 100644
|
||||
"-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 c62e92a..de5c2c8 100644
|
||||
--- a/ela/syslog_to_svclog.cpp
|
||||
+++ b/ela/syslog_to_svclog.cpp
|
||||
@@ -657,7 +657,7 @@ print_help(void)
|
||||
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"
|
||||
@ -74,6 +71,3 @@ index c62e92a..de5c2c8 100644
|
||||
"-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"
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
@ -1,127 +0,0 @@
|
||||
diff -up ppc64-diag-2.7.1/Makefile.optflags ppc64-diag-2.7.1/Makefile
|
||||
--- ppc64-diag-2.7.1/Makefile.optflags 2016-05-09 08:26:55.000000000 +0200
|
||||
+++ ppc64-diag-2.7.1/Makefile 2018-03-07 16:57:02.947694729 +0100
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
include rules.mk
|
||||
|
||||
-.SILENT:
|
||||
BUILD_DIR=$(CURDIR)
|
||||
|
||||
SUBDIRS = common rtas_errd diags scripts ela lpd opal_errd opal-dump-parse
|
||||
@@ -16,19 +15,19 @@ TARBALL_FILES += $(DOXYGEN_CFG)
|
||||
|
||||
all:
|
||||
@echo "Building common files..."
|
||||
- @$(MAKE) -C common
|
||||
+ $(MAKE) -C common
|
||||
@echo "Building rtas_errd files..."
|
||||
- @$(MAKE) -C rtas_errd
|
||||
+ $(MAKE) -C rtas_errd
|
||||
@echo "Building diags files..."
|
||||
- @$(MAKE) -C diags
|
||||
+ $(MAKE) -C diags
|
||||
@echo "Building ela files..."
|
||||
- @$(MAKE) -C ela
|
||||
+ $(MAKE) -C ela
|
||||
@echo "Building lpd files..."
|
||||
- @$(MAKE) -C lpd
|
||||
+ $(MAKE) -C lpd
|
||||
@echo "Building opal_errd files..."
|
||||
- @$(MAKE) -C opal_errd
|
||||
+ $(MAKE) -C opal_errd
|
||||
@echo "Building opal-dump-parse files..."
|
||||
- @$(MAKE) -C opal-dump-parse
|
||||
+ $(MAKE) -C opal-dump-parse
|
||||
|
||||
|
||||
install: all
|
||||
diff -up ppc64-diag-2.7.1/common/tests/Makefile.optflags ppc64-diag-2.7.1/common/tests/Makefile
|
||||
--- ppc64-diag-2.7.1/common/tests/Makefile.optflags 2016-05-09 08:26:55.000000000 +0200
|
||||
+++ ppc64-diag-2.7.1/common/tests/Makefile 2018-03-07 16:57:02.967695095 +0100
|
||||
@@ -3,7 +3,6 @@
|
||||
#
|
||||
|
||||
CC = gcc
|
||||
-CFLAGS = -g -Wall
|
||||
INCLUDE = -I../
|
||||
|
||||
PROGS = spopen
|
||||
diff -up ppc64-diag-2.7.1/diags/Makefile.optflags ppc64-diag-2.7.1/diags/Makefile
|
||||
--- ppc64-diag-2.7.1/diags/Makefile.optflags 2016-05-09 08:26:55.000000000 +0200
|
||||
+++ ppc64-diag-2.7.1/diags/Makefile 2018-03-07 16:57:02.937694546 +0100
|
||||
@@ -23,12 +23,10 @@ all: $(PROGS)
|
||||
@$(foreach d,$(SUBDIRS), $(MAKE) -C $d;)
|
||||
|
||||
diag_encl: $(DIAG_ENCL_OBJS)
|
||||
- @echo "LD $(WORK_DIR)/$@"
|
||||
- @$(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^ $(DIAG_ENCL_LIBS)
|
||||
+ $(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^ $(DIAG_ENCL_LIBS)
|
||||
|
||||
encl_led: $(ENCL_LED_OBJS)
|
||||
- @echo "LD $(WORK_DIR)/$@"
|
||||
- @$(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^
|
||||
+ $(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^
|
||||
|
||||
diag_encl.o: encl_util.h diag_encl.h
|
||||
|
||||
diff -up ppc64-diag-2.7.1/rtas_errd/Makefile.optflags ppc64-diag-2.7.1/rtas_errd/Makefile
|
||||
--- ppc64-diag-2.7.1/rtas_errd/Makefile.optflags 2018-03-07 16:57:02.937694546 +0100
|
||||
+++ ppc64-diag-2.7.1/rtas_errd/Makefile 2018-03-07 16:57:02.947694729 +0100
|
||||
@@ -26,16 +26,13 @@ DOXYGEN_CFG = doxygen.config
|
||||
all: $(CMDS) $(SCRIPTS)
|
||||
|
||||
rtas_errd: $(RTAS_ERRD_OBJS) $(COMMON_UTILS_OBJ)
|
||||
- @echo "LD $(WORK_DIR)/$@"
|
||||
$(CC) $(CFLAGS) -o $@ $^ $(RTAS_ERRD_LIBS)
|
||||
|
||||
convert_dt_node_props: $(DT_NODE_OBJS)
|
||||
- @echo "LD $(WORK_DIR)/$@"
|
||||
- @$(CC) $(CFLAGS) -o $@ $^
|
||||
+ $(CC) $(CFLAGS) -o $@ $^
|
||||
|
||||
extract_platdump: $(EXTRACT_PLATDUMP_OBJS)
|
||||
- @echo "LD $(WORK_DIR)/$@"
|
||||
- @$(CC) $(CFLAGS) -o $@ $^ $(EXTRACT_PLATDUMP_LIBS)
|
||||
+ $(CC) $(CFLAGS) -o $@ $^ $(EXTRACT_PLATDUMP_LIBS)
|
||||
|
||||
install: all
|
||||
@$(call install_sbin,$(CMDS),$(DESTDIR))
|
||||
diff -up ppc64-diag-2.7.1/rules.mk.optflags ppc64-diag-2.7.1/rules.mk
|
||||
--- ppc64-diag-2.7.1/rules.mk.optflags 2016-05-09 08:26:55.000000000 +0200
|
||||
+++ ppc64-diag-2.7.1/rules.mk 2018-03-07 16:58:40.219475082 +0100
|
||||
@@ -85,11 +85,7 @@ BUILD_TARBALL = \
|
||||
# Current build directory
|
||||
WORK_DIR = $(patsubst /%,%,$(subst $(ROOT_DIR),,$(PWD)))
|
||||
|
||||
-# You should always build with -Wall
|
||||
-CFLAGS += -Wall
|
||||
-
|
||||
-# Uncomment this for debug builds
|
||||
-CFLAGS += -g -DDEBUG
|
||||
+CC = gcc
|
||||
|
||||
# Build with common directory included
|
||||
CFLAGS += -I$(COMMON_DIR)
|
||||
@@ -100,12 +96,6 @@ CFLAGS += -I $(INC_DIR)/ncurses
|
||||
# Build with version string
|
||||
AM_CFLAGS = -DVERSION='"$(VERSION)"'
|
||||
|
||||
-# You should always build with -Wall
|
||||
-CXXFLAGS += -Wall
|
||||
-
|
||||
-# Uncomment this for debug builds
|
||||
-CXXFLAGS += -g -DDEBUG
|
||||
-
|
||||
# Build with common directory included
|
||||
CXXFLAGS += -I$(COMMON_DIR)
|
||||
|
||||
@@ -211,7 +201,6 @@ CLEAN = @echo ""
|
||||
|
||||
# Default target for building object files
|
||||
%.o: %.c
|
||||
- @echo "CC $(WORK_DIR)/$@"
|
||||
- @$(CC) -c $(AM_CFLAGS) $(CFLAGS) $<
|
||||
+ $(CC) -c $(AM_CFLAGS) $(CFLAGS) $<
|
||||
|
||||
|
63
ppc64-diag-permission.patch
Normal file
63
ppc64-diag-permission.patch
Normal file
@ -0,0 +1,63 @@
|
||||
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/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
|
||||
@@ -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.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
|
||||
@@ -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 -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
|
||||
|
@ -1,46 +0,0 @@
|
||||
From f4700ecb071a3510803e6c68a012d17ea011ada4 Mon Sep 17 00:00:00 2001
|
||||
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
||||
Date: Thu, 25 Sep 2014 16:33:07 +0530
|
||||
Subject: [PATCH 5/5] Update PRRN location
|
||||
|
||||
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
||||
---
|
||||
rtas_errd/Makefile | 4 ++--
|
||||
rtas_errd/prrn.c | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/rtas_errd/Makefile b/rtas_errd/Makefile
|
||||
index 021fa65..ab1223c 100644
|
||||
--- a/rtas_errd/Makefile
|
||||
+++ b/rtas_errd/Makefile
|
||||
@@ -38,12 +38,12 @@ extract_platdump: $(EXTRACT_PLATDUMP_OBJS)
|
||||
install: all
|
||||
@$(call install_sbin,$(CMDS),$(DESTDIR))
|
||||
@$(call install_files,$(SCRIPTS),744,$(DESTDIR)/etc)
|
||||
- @$(call install_files,$(PRRN_HOTPLUG),744,$(DESTDIR)/etc/ppc64-diag)
|
||||
+ @$(call install_files,$(PRRN_HOTPLUG),744,$(DESTDIR)/usr/libexec/ppc64-diag)
|
||||
|
||||
uninstall:
|
||||
@$(call uninstall_sbin,$(CMDS),$(DESTDIR))
|
||||
@$(call uninstall_files,$(SCRIPTS),$(DESTDIR)/etc)
|
||||
- @$(call uninstall_files,$(PRRN_HOTPLUG),$(DESTDIR)/etc/ppc64-diag)
|
||||
+ @$(call uninstall_files,$(PRRN_HOTPLUG),$(DESTDIR)/usr/libexec/ppc64-diag)
|
||||
|
||||
doc: $(DOXYGEN_CFG)
|
||||
@echo "Creating doxygen docs..."
|
||||
diff --git a/rtas_errd/prrn.c b/rtas_errd/prrn.c
|
||||
index 7a791cb..222e6e5 100644
|
||||
--- a/rtas_errd/prrn.c
|
||||
+++ b/rtas_errd/prrn.c
|
||||
@@ -40,7 +40,7 @@ static int prrn_log_fd = -1;
|
||||
|
||||
#define OFDT_BASE "/proc/device-tree"
|
||||
#define OFDTPATH "/proc/ppc64/ofdt"
|
||||
-#define PRRN_HOTPLUG "/etc/ppc64-diag/prrn_hotplug"
|
||||
+#define PRRN_HOTPLUG "/usr/libexec/ppc64-diag/prrn_hotplug"
|
||||
#define DRCONF_PATH "/proc/device-tree/ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory"
|
||||
|
||||
static int write_prrn_log(const char *buf, int len)
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -1,42 +1,47 @@
|
||||
From ee0ceb1cf421409c2839a70925c7947bedabae73 Mon Sep 17 00:00:00 2001
|
||||
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
||||
Date: Mon, 21 Mar 2016 16:19:10 +0530
|
||||
Subject: [PATCH] Update script location
|
||||
|
||||
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
||||
---
|
||||
scripts/Makefile | 4 ++--
|
||||
scripts/ppc64_diag_mkrsrc | 4 ++--
|
||||
scripts/ppc64_diag_notify | 4 ++--
|
||||
scripts/ppc64_diag_servagent | 4 ++--
|
||||
scripts/ppc64_diag_setup | 6 +++---
|
||||
scripts/rtas_errd | 2 +-
|
||||
6 files changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/scripts/Makefile b/scripts/Makefile
|
||||
index 1ab0d2c..9a3acf5 100644
|
||||
--- a/scripts/Makefile
|
||||
+++ b/scripts/Makefile
|
||||
@@ -13,13 +13,13 @@ CFG_FILES = ppc64-diag.config
|
||||
all: $(SCRIPTS) $(INIT_FILES) $(CFG_FILES)
|
||||
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: all
|
||||
- @$(call install_files,$(SCRIPTS),744,$(DESTDIR)/etc/ppc64-diag)
|
||||
+ @$(call install_files,$(SCRIPTS),744,$(DESTDIR)/usr/libexec/ppc64-diag)
|
||||
@$(call install_files,$(INIT_FILES),755,$(DESTDIR)/$(LIBEXEC_DIR))
|
||||
@$(call install_files,$(SERVICE_SCRIPT),755,$(DESTDIR)/$(SYSTEMD_DIR))
|
||||
@$(call install_files,$(CFG_FILES),644,$(DESTDIR)/etc/ppc64-diag)
|
||||
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:
|
||||
- @$(call uninstall_files,$(SCRIPTS),$(DESTDIR)/etc/ppc64-diag)
|
||||
+ @$(call uninstall_files,$(SCRIPTS),$(DESTDIR)/usr/libexec/ppc64-diag)
|
||||
@$(call uninstall_files,$(INIT_FILES),$(DESTDIR)/$(LIBEXEC_DIR))
|
||||
@$(call uninstall_files,$(SERVICE_SCRIPT),755,$(DESTDIR)/$(SYSTEMD_DIR))
|
||||
@$(call uninstall_files,$(CFG_FILES),$(DESTDIR)/etc/ppc64-diag)
|
||||
diff --git a/scripts/ppc64_diag_mkrsrc b/scripts/ppc64_diag_mkrsrc
|
||||
index bf3c5f5..6023a71 100755
|
||||
--- a/scripts/ppc64_diag_mkrsrc
|
||||
+++ b/scripts/ppc64_diag_mkrsrc
|
||||
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
|
||||
@ -52,10 +57,9 @@ index bf3c5f5..6023a71 100755
|
||||
|
||||
# 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..87fc384 100755
|
||||
--- a/scripts/ppc64_diag_notify
|
||||
+++ b/scripts/ppc64_diag_notify
|
||||
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
|
||||
@ -71,10 +75,18 @@ index 9f198d9..87fc384 100755
|
||||
|
||||
sub usage {
|
||||
print "$0 [OPTIONS]\n";
|
||||
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
|
||||
@@ -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
|
||||
@ -90,10 +102,9 @@ index 4f45983..9966302 100755
|
||||
|
||||
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
|
||||
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 = (
|
||||
@ -113,11 +124,10 @@ index 283c357..2c80c5c 100755
|
||||
"--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
|
||||
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
|
||||
@ -126,6 +136,3 @@ index d5d40fe..fd9d5d2 100755
|
||||
fi
|
||||
echo -n "Starting rtas_errd (platform error handling) daemon: "
|
||||
if [ $INSSERV -eq 1 ]; then
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
@ -1,121 +0,0 @@
|
||||
From 41e153fc9dbd4a9dc5046f3200e1d06b32e640fc Mon Sep 17 00:00:00 2001
|
||||
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
||||
Date: Mon, 16 Nov 2015 20:21:57 +0530
|
||||
Subject: [PATCH] Add unused attribute
|
||||
|
||||
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
||||
---
|
||||
diags/7031_D24_T24.c | 9 ++++++---
|
||||
rtas_errd/ela.c | 2 +-
|
||||
rtas_errd/epow.c | 6 +++---
|
||||
rtas_errd/files.c | 2 +-
|
||||
rtas_errd/guard.c | 2 +-
|
||||
5 files changed, 12 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/diags/7031_D24_T24.c b/diags/7031_D24_T24.c
|
||||
index 8e1d47f..3a9e88e 100644
|
||||
--- a/diags/7031_D24_T24.c
|
||||
+++ b/diags/7031_D24_T24.c
|
||||
@@ -73,7 +73,8 @@ get_enclosure_scsi_id(struct pearl_diag_page2 *dp)
|
||||
static int
|
||||
pearl_print_drive_status(uint32_t status)
|
||||
{
|
||||
- int fail = 0, printed = 0, rc = OK;
|
||||
+ __attribute__((unused)) int fail = 0;
|
||||
+ int printed = 0, rc = OK;
|
||||
|
||||
if ((status & 0x0F000000) == 0x05000000) {
|
||||
printf("(empty) ");
|
||||
@@ -171,7 +172,8 @@ print_ps_fan_status(uint32_t status)
|
||||
static int
|
||||
print_repeater_status(uint32_t status)
|
||||
{
|
||||
- int printed = 0, fail = 0, rc = OK;
|
||||
+ int printed = 0, rc = OK;
|
||||
+ __attribute__((unused)) int fail = 0;
|
||||
|
||||
if ((status & 0x0F000000) == 0x01000000)
|
||||
printf("ok ");
|
||||
@@ -355,7 +357,8 @@ int
|
||||
diag_7031_D24_T24(int fd, struct dev_vpd *vpd)
|
||||
{
|
||||
struct pearl_diag_page2 dp;
|
||||
- int failure = 0, rc, encl_id;
|
||||
+ int failure = 0, encl_id;
|
||||
+ __attribute__((unused)) int rc;
|
||||
int buf_len = sizeof(dp);
|
||||
int ps1, ps2, fan1, fan2, fan3, rpt, vpd_card;
|
||||
|
||||
diff --git a/rtas_errd/ela.c b/rtas_errd/ela.c
|
||||
index 26085e9..b0c064c 100644
|
||||
--- a/rtas_errd/ela.c
|
||||
+++ b/rtas_errd/ela.c
|
||||
@@ -1823,7 +1823,7 @@ process_v1_epow(struct event *event, int error_type)
|
||||
int class;
|
||||
int ext_epow;
|
||||
int ext_epow_nofan;
|
||||
- int fan_num;
|
||||
+ __attribute__((unused)) int fan_num;
|
||||
|
||||
/*
|
||||
* The following EPOW error logs found in CHRP, Ver. 1
|
||||
diff --git a/rtas_errd/epow.c b/rtas_errd/epow.c
|
||||
index 8e020d6..78c1b9e 100644
|
||||
--- a/rtas_errd/epow.c
|
||||
+++ b/rtas_errd/epow.c
|
||||
@@ -48,7 +48,7 @@ static int time_remaining = 0;
|
||||
void
|
||||
epow_timer_handler(int sig, siginfo_t siginfo, void *context)
|
||||
{
|
||||
- int rc, state;
|
||||
+ int __attribute__((unused)) rc, state;
|
||||
struct itimerval tv;
|
||||
|
||||
if (time_remaining <= 0) {
|
||||
@@ -149,7 +149,7 @@ parse_epow(struct event *event)
|
||||
struct rtas_epow_scn *epow;
|
||||
struct itimerval tv;
|
||||
char *event_type;
|
||||
- int rc, state;
|
||||
+ int __attribute__((unused)) rc, state;
|
||||
|
||||
/*
|
||||
* Check the sensor state; this will be used to ensure
|
||||
@@ -380,7 +380,7 @@ check_epow(struct event *event)
|
||||
{
|
||||
pid_t child;
|
||||
char *childargs[2];
|
||||
- int rc, current_status;
|
||||
+ int __attribute__((unused)) rc, current_status;
|
||||
|
||||
/*
|
||||
* Dissect the EPOW extended error information;
|
||||
diff --git a/rtas_errd/files.c b/rtas_errd/files.c
|
||||
index 6c9fe0c..3fe851e 100644
|
||||
--- a/rtas_errd/files.c
|
||||
+++ b/rtas_errd/files.c
|
||||
@@ -162,7 +162,7 @@ setup_rtas_event_scenario(void)
|
||||
{
|
||||
struct stat sbuf;
|
||||
char *tmp;
|
||||
- int fd, len;
|
||||
+ int fd, __attribute__((unused)) len;
|
||||
int i;
|
||||
|
||||
if (scenario_file == NULL)
|
||||
diff --git a/rtas_errd/guard.c b/rtas_errd/guard.c
|
||||
index db264c0..bbd702a 100644
|
||||
--- a/rtas_errd/guard.c
|
||||
+++ b/rtas_errd/guard.c
|
||||
@@ -41,7 +41,7 @@ run_drmgr(enum resource_dealloc_type resource_type, char *drc_name,
|
||||
unsigned int value, int wait)
|
||||
{
|
||||
pid_t child;
|
||||
- int status, rc;
|
||||
+ int status, __attribute__((unused)) rc;
|
||||
char capacity[6], quant_str[5];
|
||||
char *drmgr_args[] = {DRMGR_PROGRAM_NOPATH, "-r", "-c", NULL,
|
||||
NULL, NULL, NULL, NULL, NULL};
|
||||
--
|
||||
2.1.0
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: ppc64-diag
|
||||
Version: 2.7.1
|
||||
Release: 6%{?dist}
|
||||
Version: 2.7.4
|
||||
Release: 1%{?dist}
|
||||
Summary: PowerLinux Platform Diagnostics
|
||||
URL: http://sourceforge.net/projects/linux-diag/files/ppc64-diag/
|
||||
Group: System Environment/Base
|
||||
@ -11,6 +11,7 @@ BuildRequires: libvpd-devel, systemd-units
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: librtas-devel >= 1.4.0
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: libtool
|
||||
|
||||
Requires: servicelog, lsvpd
|
||||
# PCI hotplug support on PowerKVM guest depends on below
|
||||
@ -21,10 +22,8 @@ Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/%
|
||||
Patch0: ppc64-diag-messagecatalog-location.patch
|
||||
Patch1: ppc64-diag-chkconfig.patch
|
||||
Patch2: ppc64-diag-scriptlocation.patch
|
||||
Patch3: ppc64-diag-unusedvar.patch
|
||||
Patch4: ppc64-diag-lpdscriptloc.patch
|
||||
Patch5: ppc64-diag-prrnscriptloc.patch
|
||||
Patch6: ppc64-diag-optflags.patch
|
||||
Patch3: ppc64-diag-lpdscriptloc.patch
|
||||
Patch4: ppc64-diag-permission.patch
|
||||
|
||||
%description
|
||||
This package contains various diagnostic tools for PowerLinux.
|
||||
@ -44,56 +43,49 @@ administrators or connected service frameworks.
|
||||
%patch0 -p1 -b .msg_loc
|
||||
%patch1 -p1 -b .chkconfig
|
||||
%patch2 -p1 -b .script_loc
|
||||
%patch3 -p1 -b .unusevar
|
||||
%patch4 -p1 -b .lpdscriptloc
|
||||
%patch5 -p1 -b .prrnscriptloc
|
||||
%patch6 -p1 -b .optflags
|
||||
%patch3 -p1 -b .lpdscriptloc
|
||||
%patch4 -p1 -b .permission
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
%configure
|
||||
LDFLAGS="%{__global_ldflags}" CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" make %{?_smp_mflags} V=1
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
chmod 644 COPYING
|
||||
rm -f $RPM_BUILD_ROOT/usr/share/doc/packages/ppc64-diag/COPYING
|
||||
rm -f $RPM_BUILD_ROOT%{_docdir}/ppc64-diag/*
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/%{name}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
|
||||
mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/ses_pages
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/ses_pages
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_var}/log/dump
|
||||
ln -sfv %{_sbindir}/usysattn $RPM_BUILD_ROOT/%{_sbindir}/usysfault
|
||||
|
||||
|
||||
%files
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING
|
||||
%license COPYING README
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
%dir %{_sysconfdir}/%{name}/ses_pages
|
||||
%dir %{_var}/log/dump
|
||||
%{_mandir}/man8/*
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/%{name}/ppc64-diag.config
|
||||
%attr(755,root,root) %{_sbindir}/*
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/ppc64-diag.config
|
||||
%{_sbindir}/*
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %attr(755,root,root) %{_datadir}/%{name}/message_catalog/
|
||||
%attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_migrate
|
||||
%attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_mkrsrc
|
||||
%attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_notify
|
||||
#%attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_servagent
|
||||
%attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_setup
|
||||
%attr(755,root,root) %{_libexecdir}/%{name}/lp_diag_setup
|
||||
%attr(755,root,root) %{_libexecdir}/%{name}/lp_diag_notify
|
||||
%attr(744,root,root) %{_libexecdir}/%{name}/prrn_hotplug
|
||||
%attr(644,root,root) %{_libexecdir}/%{name}/servevent_parse.pl
|
||||
%attr(644,root,root) %{_datadir}/%{name}/message_catalog/cxgb3
|
||||
%attr(644,root,root) %{_datadir}/%{name}/message_catalog/e1000e
|
||||
%attr(644,root,root) %{_datadir}/%{name}/message_catalog/exceptions
|
||||
%attr(644,root,root) %{_datadir}/%{name}/message_catalog/gpfs
|
||||
%attr(644,root,root) %{_datadir}/%{name}/message_catalog/reporters
|
||||
%attr(644,root,root) %{_datadir}/%{name}/message_catalog/with_regex/*
|
||||
%attr(755,root,root) %{_sysconfdir}/rc.powerfail
|
||||
%attr(755,root,root) %{_libexecdir}/%{name}/rtas_errd
|
||||
%attr(755,root,root) %{_libexecdir}/%{name}/opal_errd
|
||||
%attr(644,root,root) %{_unitdir}/rtas_errd.service
|
||||
%attr(644,root,root) %{_unitdir}/opal_errd.service
|
||||
%dir %{_datadir}/%{name}/message_catalog/
|
||||
%{_libexecdir}/%{name}/ppc64_diag_migrate
|
||||
%{_libexecdir}/%{name}/ppc64_diag_mkrsrc
|
||||
%{_libexecdir}/%{name}/ppc64_diag_notify
|
||||
%{_libexecdir}/%{name}/ppc64_diag_setup
|
||||
%{_libexecdir}/%{name}/lp_diag_setup
|
||||
%{_libexecdir}/%{name}/lp_diag_notify
|
||||
%{_libexecdir}/%{name}/servevent_parse.pl
|
||||
%{_datadir}/%{name}/message_catalog/*
|
||||
%{_sysconfdir}/rc.powerfail
|
||||
%{_libexecdir}/%{name}/rtas_errd
|
||||
%{_libexecdir}/%{name}/opal_errd
|
||||
%{_unitdir}/rtas_errd.service
|
||||
%{_unitdir}/opal_errd.service
|
||||
%{_sysconfdir}/cron.daily/run_diag_encl
|
||||
|
||||
%post
|
||||
# Post-install script --------------------------------------------------
|
||||
@ -129,6 +121,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 09 2018 Than Ngo <than@redhat.com> - 2.7.4.1
|
||||
- update to latest upstream 2.7.4
|
||||
|
||||
* Wed Mar 07 2018 Than Ngo <than@redhat.com> - - 2.7.1-6
|
||||
- fixed bz#1552653 - ppc64-diag: Missing Fedora build flags injection
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user