Hello community, here is the log from the commit of package ppc64-diag for openSUSE:Factory checked in at 2014-09-10 17:02:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ppc64-diag (Old) and /work/SRC/openSUSE:Factory/.ppc64-diag.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ppc64-diag" Changes: -------- --- /work/SRC/openSUSE:Factory/ppc64-diag/ppc64-diag.changes 2014-07-25 09:09:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ppc64-diag.new/ppc64-diag.changes 2014-09-10 17:02:48.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Sep 9 11:44:11 UTC 2014 - dvla...@suse.com + +- Fix download service + +------------------------------------------------------------------- +Mon Sep 8 11:11:06 UTC 2014 - jloe...@suse.com + +- version update to 2.6.7 (BNC#894846) + no upstream changelog provided + +- modified patches: + * ppc64-diag-tmpraces.patch + * ppc64-diag.add_ncurses_include_path.patch + * ppc64-diag.opal_errd.patch + * ppc64-diag.rtas_errd.patch + * ppc64-diag.varunused.patch +------------------------------------------------------------------- Old: ---- opal_errd.service ppc64-diag-2.6.6.tar.gz rtas_errd.service New: ---- ppc64-diag-2.6.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppc64-diag.spec ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -18,7 +18,7 @@ Url: http://sourceforge.net/projects/linux-diag/files/ppc64-diag Name: ppc64-diag -Version: 2.6.6 +Version: 2.6.7 Release: 0 Summary: Linux for Power Platform Diagnostics License: EPL-1.0 @@ -34,6 +34,7 @@ BuildRequires: gcc-c++ BuildRequires: librtas-devel BuildRequires: libservicelog-devel +BuildRequires: libudev-devel BuildRequires: libvpd2-devel BuildRequires: ncurses-devel BuildRequires: sqlite3-devel @@ -46,9 +47,7 @@ PreReq: %insserv_prereq PreReq: aaa_base BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/v%{version}/%{name}-%{version}.tar.gz -Source1: rtas_errd.service -Source2: opal_errd.service +Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/v.%{version}/%{name}-%{version}.tar.gz #PATCH-FIX-OPENSUSE - ppc64-diag.rtas_errd.patch - fix rtas_errd initscript to comply with openSUSE standards Patch1: %{name}.rtas_errd.patch #PATCH-FIX-OPENSUSE - ppc64-diag.varunused.patch - fix unused variables @@ -81,6 +80,13 @@ %patch5 -p1 %build +%if 0%{?has_systemd} + sed -i '/LIBEXEC_DIR/c\LIBEXEC_DIR = \%{_libexecdir}' rules.mk + sed -i 's@/usr/libexec/ppc64-diag@%{_libexecdir}@g' scripts/opal_errd.service + sed -i 's@/usr/libexec/ppc64-diag@%{_libexecdir}@g' scripts/rtas_errd.service +%else + sed -i '/LIBEXEC_DIR/c\LIBEXEC_DIR = \%{_initddir}' rules.mk +%endif make %install @@ -89,11 +95,9 @@ mkdir $RPM_BUILD_ROOT/etc/ppc64-diag/ses_pages ln -sf /usr/sbin/usysattn $RPM_BUILD_ROOT/usr/sbin/usysfault %if 0%{?has_systemd} - rm $RPM_BUILD_ROOT/etc/init.d/rtas_errd - rm $RPM_BUILD_ROOT/etc/init.d/opal_errd mkdir -p $RPM_BUILD_ROOT/%{_unitdir} - install -D -m0644 %{S:1} %{buildroot}%{_unitdir}/ - install -D -m0644 %{S:2} %{buildroot}%{_unitdir}/ + install -D -m0644 scripts/rtas_errd.service %{buildroot}%{_unitdir}/ + install -D -m0644 scripts/opal_errd.service %{buildroot}%{_unitdir}/ ln -s /sbin/service %{buildroot}/usr/sbin/rcrtas_errd ln -s /sbin/service %{buildroot}/usr/sbin/rcopal_errd %else @@ -118,13 +122,18 @@ %{_mandir}/man8/usysattn.8.gz %{_mandir}/man8/usysfault.8.gz %{_mandir}/man8/usysident.8.gz +%{_mandir}/man8/opal-dump-parse.8.gz +%{_mandir}/man8/opal-elog-parse.8.gz +%{_mandir}/man8/opal_errd.8.gz %if 0%{?has_systemd} %{_unitdir}/rtas_errd.service %{_unitdir}/opal_errd.service + %{_libexecdir}/rtas_errd + %{_libexecdir}/opal_errd %else - %config %attr(755,root,root) /etc/init.d/rtas_errd - %config %attr(755,root,root) /etc/init.d/opal_errd + %config %attr(755,root,root) %{_initddir}/rtas_errd + %config %attr(755,root,root) %{_initddir}/opal_errd %endif %if 1 @@ -235,7 +244,6 @@ %service_add_pre rtas_errd.service %service_add_pre opal_errd.service %endif - %endif %changelog ++++++ ppc64-diag-2.6.6.tar.gz -> ppc64-diag-2.6.7.tar.gz ++++++ ++++ 143403 lines of diff (skipped) ++++++ ppc64-diag-tmpraces.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -1,7 +1,8 @@ -diff -ur ppc64-diag-2.6.1_orig/lpd/test/lpd_ela_test.sh ppc64-diag-2.6.1/lpd/test/lpd_ela_test.sh ---- ppc64-diag-2.6.1_orig/lpd/test/lpd_ela_test.sh 2014-07-18 13:33:08.351629000 +0200 -+++ ppc64-diag-2.6.1/lpd/test/lpd_ela_test.sh 2014-07-18 13:33:15.323767000 +0200 -@@ -22,7 +22,7 @@ +Index: ppc64-diag-2.6.7/lpd/test/lpd_ela_test.sh +=================================================================== +--- ppc64-diag-2.6.7.orig/lpd/test/lpd_ela_test.sh ++++ ppc64-diag-2.6.7/lpd/test/lpd_ela_test.sh +@@ -22,7 +22,7 @@ EXECUTION_LOG="$LOG_DIR/$SCRIPT_NAME.log ERROR_LOG="$LOG_DIR/$SCRIPT_NAME.err" TMP_DIR="/var/tmp/ras" @@ -10,10 +11,11 @@ MESSAGE_FILE="$TMP_DIR/messages" TMP_FILE="$TMP_DIR/$SCRIPT_NAME.tmp" -diff -ur ppc64-diag-2.6.1_orig/rtas_errd/diag_support.c ppc64-diag-2.6.1/rtas_errd/diag_support.c ---- ppc64-diag-2.6.1_orig/rtas_errd/diag_support.c 2014-07-18 13:33:08.473633000 +0200 -+++ ppc64-diag-2.6.1/rtas_errd/diag_support.c 2014-07-18 13:36:43.569643000 +0200 -@@ -230,27 +230,23 @@ +Index: ppc64-diag-2.6.7/rtas_errd/diag_support.c +=================================================================== +--- ppc64-diag-2.6.7.orig/rtas_errd/diag_support.c ++++ ppc64-diag-2.6.7/rtas_errd/diag_support.c +@@ -230,27 +230,23 @@ get_dt_status(char *dev) char loc_file[80]; char target[80]; char *ptr; @@ -47,7 +49,7 @@ return NULL; } if (fscanf(fp2, "%s", target_status)) { -@@ -259,6 +255,7 @@ +@@ -259,6 +255,7 @@ get_dt_status(char *dev) } else { fprintf(stderr, "read failed on %s\n", loc_file); @@ -55,7 +57,7 @@ return NULL; } -@@ -270,6 +267,7 @@ +@@ -270,6 +267,7 @@ get_dt_status(char *dev) fp2 = fopen(loc_file, "r"); if (fp2 == 0) { fprintf(stderr, "open failed on %s\n", loc_file); @@ -63,7 +65,7 @@ return NULL; } -@@ -278,6 +276,8 @@ +@@ -278,6 +276,8 @@ get_dt_status(char *dev) target, loc_file); if (strcmp(dev, target) == 0) { dbg("status = \"%s\"", target_status); @@ -72,7 +74,7 @@ return target_status; } -@@ -285,11 +285,12 @@ +@@ -285,11 +285,12 @@ get_dt_status(char *dev) } else { fprintf(stderr, "read failed on %s\n", loc_file); @@ -86,10 +88,11 @@ fprintf(stderr, "error: status NOT FOUND\n"); return NULL; } -diff -ur ppc64-diag-2.6.1_orig/scripts/ppc64_diag_mkrsrc ppc64-diag-2.6.1/scripts/ppc64_diag_mkrsrc ---- ppc64-diag-2.6.1_orig/scripts/ppc64_diag_mkrsrc 2014-07-18 13:33:08.189631000 +0200 -+++ ppc64-diag-2.6.1/scripts/ppc64_diag_mkrsrc 2014-07-18 13:33:15.384788000 +0200 -@@ -123,7 +123,7 @@ +Index: ppc64-diag-2.6.7/scripts/ppc64_diag_mkrsrc +=================================================================== +--- ppc64-diag-2.6.7.orig/scripts/ppc64_diag_mkrsrc ++++ ppc64-diag-2.6.7/scripts/ppc64_diag_mkrsrc +@@ -136,7 +136,7 @@ if (-e "/proc/device-tree/ibm,converged- } # Retrieve Extended Error Data (EED) ++++++ ppc64-diag.add_ncurses_include_path.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -1,8 +1,8 @@ -Index: ppc64-diag-2.6.6/rules.mk +Index: ppc64-diag-2.6.7/rules.mk =================================================================== ---- ppc64-diag-2.6.6.orig/rules.mk -+++ ppc64-diag-2.6.6/rules.mk -@@ -93,6 +93,9 @@ CFLAGS += -g -DDEBUG +--- ppc64-diag-2.6.7.orig/rules.mk ++++ ppc64-diag-2.6.7/rules.mk +@@ -94,6 +94,9 @@ CFLAGS += -g -DDEBUG # Build with common directory included CFLAGS += -I $(ROOT_DIR)/$(COM_DIR) ++++++ ppc64-diag.opal_errd.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -1,13 +1,11 @@ -Index: ppc64-diag-2.6.4/scripts/opal_errd +Index: ppc64-diag-2.6.7/scripts/opal_errd =================================================================== ---- ppc64-diag-2.6.4.orig/scripts/opal_errd -+++ ppc64-diag-2.6.4/scripts/opal_errd -@@ -20,8 +20,10 @@ - - ### BEGIN INIT INFO +--- ppc64-diag-2.6.7.orig/scripts/opal_errd ++++ ppc64-diag-2.6.7/scripts/opal_errd +@@ -22,6 +22,10 @@ # Provides: opal_errd --# Required-Start: $local_fs $syslog $time --# Required-Stop: + # Required-Start: $local_fs $syslog $time + # Required-Stop: +# Should-Start: $remote_fs $syslog $time +# Should-Stop: $null +# Required-Start: $null @@ -15,18 +13,18 @@ # Default-Start: 2 3 5 # Default-Stop: 0 1 4 6 # Short-Description: Daemon to retrieve platform errors/events -@@ -58,8 +60,8 @@ opal_errd_start() +@@ -58,8 +62,8 @@ opal_errd_start() daemon $OE_BIN pid=`pidof opal_errd` - if [[ -n "$pid" ]]; then + if [ -n "$pid" ]; then - echo $pid > /var/run/opal_errd.pid - touch /var/lock/subsys/opal_errd + echo $pid > /var/run/rcopal_errd.pid -+ touch /var/run/rcopal_errd ++ touch /var/run/rcopal_errd fi fi } -@@ -71,8 +73,8 @@ opal_errd_stop() +@@ -71,8 +75,8 @@ opal_errd_stop() rc_status -v else killproc opal_errd -TERM ++++++ ppc64-diag.rtas_errd.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -2,27 +2,25 @@ scripts/rtas_errd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -Index: ppc64-diag-2.6.4/scripts/rtas_errd +Index: ppc64-diag-2.6.7/scripts/rtas_errd =================================================================== ---- ppc64-diag-2.6.4.orig/scripts/rtas_errd -+++ ppc64-diag-2.6.4/scripts/rtas_errd -@@ -19,8 +19,10 @@ - - ### BEGIN INIT INFO +--- ppc64-diag-2.6.7.orig/scripts/rtas_errd ++++ ppc64-diag-2.6.7/scripts/rtas_errd +@@ -21,6 +21,10 @@ # Provides: rtas_errd --# Required-Start: $local_fs $syslog $time --# Required-Stop: -+# Should-Start: $remote_fs $syslog $time -+# Should-Stop: $null -+# Required-Start: $null -+# Required-Stop: $null + # Required-Start: $local_fs $syslog $time + # Required-Stop: ++# Should-Start: $remote_fs $syslog $time ++# Should-Stop: $null ++# Required-Start: $null ++# Required-Stop: $null # Default-Start: 2 3 5 # Default-Stop: 0 1 4 6 # Short-Description: Daemon to retrieve platform errors -@@ -63,8 +65,8 @@ case "$1" in +@@ -63,8 +67,8 @@ case "$1" in daemon $RE_BIN pid=`pidof rtas_errd` - if [[ -n "$pid" ]]; then + if [ -n "$pid" ]; then - echo $pid > /var/run/rtas_errd.pid - touch /var/lock/subsys/rtas_errd + echo $pid > /var/run/rcrtas_errd.pid @@ -30,7 +28,7 @@ fi echo fi -@@ -77,8 +79,8 @@ case "$1" in +@@ -77,8 +81,8 @@ case "$1" in rc_status -v else killproc rtas_errd -TERM ++++++ ppc64-diag.varunused.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -1,7 +1,7 @@ -Index: ppc64-diag-2.6.4/diags/7031_D24_T24.c +Index: ppc64-diag-2.6.7/diags/7031_D24_T24.c =================================================================== ---- ppc64-diag-2.6.4.orig/diags/7031_D24_T24.c -+++ ppc64-diag-2.6.4/diags/7031_D24_T24.c +--- ppc64-diag-2.6.7.orig/diags/7031_D24_T24.c ++++ ppc64-diag-2.6.7/diags/7031_D24_T24.c @@ -69,7 +69,8 @@ get_enclosure_scsi_id(struct pearl_diag_ static int print_drive_status(uint32_t status) @@ -32,10 +32,10 @@ int buf_len = sizeof(dp); int ps1, ps2, fan1, fan2, fan3, rpt, vpd_card; -Index: ppc64-diag-2.6.4/rtas_errd/ela.c +Index: ppc64-diag-2.6.7/rtas_errd/ela.c =================================================================== ---- ppc64-diag-2.6.4.orig/rtas_errd/ela.c -+++ ppc64-diag-2.6.4/rtas_errd/ela.c +--- ppc64-diag-2.6.7.orig/rtas_errd/ela.c ++++ ppc64-diag-2.6.7/rtas_errd/ela.c @@ -1787,7 +1787,7 @@ process_v1_epow(struct event *event, int int class; int ext_epow; @@ -45,10 +45,10 @@ /* * The following EPOW error logs found in CHRP, Ver. 1 -Index: ppc64-diag-2.6.4/rtas_errd/epow.c +Index: ppc64-diag-2.6.7/rtas_errd/epow.c =================================================================== ---- ppc64-diag-2.6.4.orig/rtas_errd/epow.c -+++ ppc64-diag-2.6.4/rtas_errd/epow.c +--- ppc64-diag-2.6.7.orig/rtas_errd/epow.c ++++ ppc64-diag-2.6.7/rtas_errd/epow.c @@ -48,7 +48,7 @@ static int time_remaining = 0; void epow_timer_handler(int sig, siginfo_t siginfo, void *context) @@ -76,10 +76,10 @@ /* * Dissect the EPOW extended error information; -Index: ppc64-diag-2.6.4/rtas_errd/files.c +Index: ppc64-diag-2.6.7/rtas_errd/files.c =================================================================== ---- ppc64-diag-2.6.4.orig/rtas_errd/files.c -+++ ppc64-diag-2.6.4/rtas_errd/files.c +--- ppc64-diag-2.6.7.orig/rtas_errd/files.c ++++ ppc64-diag-2.6.7/rtas_errd/files.c @@ -161,7 +161,7 @@ setup_rtas_event_scenario(void) { struct stat sbuf; @@ -89,10 +89,10 @@ int i; if (scenario_file == NULL) -Index: ppc64-diag-2.6.4/rtas_errd/guard.c +Index: ppc64-diag-2.6.7/rtas_errd/guard.c =================================================================== ---- ppc64-diag-2.6.4.orig/rtas_errd/guard.c -+++ ppc64-diag-2.6.4/rtas_errd/guard.c +--- ppc64-diag-2.6.7.orig/rtas_errd/guard.c ++++ ppc64-diag-2.6.7/rtas_errd/guard.c @@ -40,7 +40,7 @@ run_drmgr(enum resource_dealloc_type res unsigned int value, int wait) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
