From 4c48fe78e04c5531f4e9be89174c0fe7ac833549 Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Mon, 16 Nov 2015 20:24:04 +0530 Subject: [PATCH] Update to latest upstream 2.6.10 Signed-off-by: Vasant Hegde --- .gitignore | 1 + ppc64-diag-unusedvar.patch | 34 +++++++++++++++++----------------- ppc64-diag.spec | 7 +++++-- sources | 2 +- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 7e1aad4..c3a50b5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ppc64-diag-2.6.5.tar.gz /ppc64-diag-2.6.6.tar.gz /ppc64-diag-2.6.7.tar.gz +/ppc64-diag-2.6.10.tar.gz diff --git a/ppc64-diag-unusedvar.patch b/ppc64-diag-unusedvar.patch index a07c716..e0bf0df 100644 --- a/ppc64-diag-unusedvar.patch +++ b/ppc64-diag-unusedvar.patch @@ -1,7 +1,7 @@ -From 27342ee4840dcae3e9180966778b7d4c486fede5 Mon Sep 17 00:00:00 2001 +From 41e153fc9dbd4a9dc5046f3200e1d06b32e640fc Mon Sep 17 00:00:00 2001 From: Vasant Hegde -Date: Thu, 25 Sep 2014 16:31:56 +0530 -Subject: [PATCH 4/5] Add unused attribute +Date: Mon, 16 Nov 2015 20:21:57 +0530 +Subject: [PATCH] Add unused attribute Signed-off-by: Vasant Hegde --- @@ -13,12 +13,12 @@ Signed-off-by: Vasant Hegde 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/diags/7031_D24_T24.c b/diags/7031_D24_T24.c -index 924aa66..a466467 100644 +index 8e1d47f..3a9e88e 100644 --- a/diags/7031_D24_T24.c +++ b/diags/7031_D24_T24.c -@@ -69,7 +69,8 @@ get_enclosure_scsi_id(struct pearl_diag_page2 *dp) +@@ -73,7 +73,8 @@ get_enclosure_scsi_id(struct pearl_diag_page2 *dp) static int - print_drive_status(uint32_t status) + pearl_print_drive_status(uint32_t status) { - int fail = 0, printed = 0, rc = OK; + __attribute__((unused)) int fail = 0; @@ -26,7 +26,7 @@ index 924aa66..a466467 100644 if ((status & 0x0F000000) == 0x05000000) { printf("(empty) "); -@@ -167,7 +168,8 @@ print_ps_fan_status(uint32_t status) +@@ -171,7 +172,8 @@ print_ps_fan_status(uint32_t status) static int print_repeater_status(uint32_t status) { @@ -36,7 +36,7 @@ index 924aa66..a466467 100644 if ((status & 0x0F000000) == 0x01000000) printf("ok "); -@@ -351,7 +353,8 @@ int +@@ -355,7 +357,8 @@ int diag_7031_D24_T24(int fd, struct dev_vpd *vpd) { struct pearl_diag_page2 dp; @@ -47,10 +47,10 @@ index 924aa66..a466467 100644 int ps1, ps2, fan1, fan2, fan3, rpt, vpd_card; diff --git a/rtas_errd/ela.c b/rtas_errd/ela.c -index afb9517..72e4b06 100644 +index 26085e9..b0c064c 100644 --- a/rtas_errd/ela.c +++ b/rtas_errd/ela.c -@@ -1787,7 +1787,7 @@ process_v1_epow(struct event *event, int error_type) +@@ -1823,7 +1823,7 @@ process_v1_epow(struct event *event, int error_type) int class; int ext_epow; int ext_epow_nofan; @@ -60,11 +60,11 @@ index afb9517..72e4b06 100644 /* * The following EPOW error logs found in CHRP, Ver. 1 diff --git a/rtas_errd/epow.c b/rtas_errd/epow.c -index e6b309c..add1d57 100644 +index 8e020d6..78c1b9e 100644 --- a/rtas_errd/epow.c +++ b/rtas_errd/epow.c @@ -48,7 +48,7 @@ static int time_remaining = 0; - void + void epow_timer_handler(int sig, siginfo_t siginfo, void *context) { - int rc, state; @@ -91,10 +91,10 @@ index e6b309c..add1d57 100644 /* * Dissect the EPOW extended error information; diff --git a/rtas_errd/files.c b/rtas_errd/files.c -index e233728..b1f53e1 100644 +index 6c9fe0c..3fe851e 100644 --- a/rtas_errd/files.c +++ b/rtas_errd/files.c -@@ -161,7 +161,7 @@ setup_rtas_event_scenario(void) +@@ -162,7 +162,7 @@ setup_rtas_event_scenario(void) { struct stat sbuf; char *tmp; @@ -104,10 +104,10 @@ index e233728..b1f53e1 100644 if (scenario_file == NULL) diff --git a/rtas_errd/guard.c b/rtas_errd/guard.c -index e9cc277..4c5177d 100644 +index db264c0..bbd702a 100644 --- a/rtas_errd/guard.c +++ b/rtas_errd/guard.c -@@ -40,7 +40,7 @@ run_drmgr(enum resource_dealloc_type resource_type, char *drc_name, +@@ -41,7 +41,7 @@ run_drmgr(enum resource_dealloc_type resource_type, char *drc_name, unsigned int value, int wait) { pid_t child; @@ -117,5 +117,5 @@ index e9cc277..4c5177d 100644 char *drmgr_args[] = {DRMGR_PROGRAM_NOPATH, "-r", "-c", NULL, NULL, NULL, NULL, NULL, NULL}; -- -1.8.3.1 +2.1.0 diff --git a/ppc64-diag.spec b/ppc64-diag.spec index 7c0c3b9..4040bf4 100644 --- a/ppc64-diag.spec +++ b/ppc64-diag.spec @@ -1,6 +1,6 @@ Name: ppc64-diag -Version: 2.6.7 -Release: 4%{?dist} +Version: 2.6.10 +Release: 1%{?dist} Summary: PowerLinux Platform Diagnostics URL: http://sourceforge.net/projects/linux-diag/files/ppc64-diag/ Group: System Environment/Base @@ -129,6 +129,9 @@ fi %changelog +* Mon Nov 16 2015 Vasant Hegde - 2.6.10 +- Update to latest upstream 2.6.10 + * Tue Aug 4 2015 Peter Robinson 2.6.7-4 - Make the build verbase as per packaging standards diff --git a/sources b/sources index 1bb2b56..27e11ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a05e1221aa7f44550dde6376d3f0187 ppc64-diag-2.6.7.tar.gz +8f7e517849729e79aa39c4c4824bf395 ppc64-diag-2.6.10.tar.gz