Hello community, here is the log from the commit of package ppc64-diag for openSUSE:Factory checked in at 2014-04-04 16:41:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-11 17:28:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ppc64-diag.new/ppc64-diag.changes 2014-04-04 16:41:28.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Mar 28 11:41:49 UTC 2014 - [email protected] + +- remove ppc64.stop_service.patch (already fixed by + ppc64.opal_errd.patch) + +------------------------------------------------------------------- +Tue Mar 25 13:28:10 UTC 2014 - [email protected] + +- version update to 2.6.4 (BNC#869845) + new opal error daemon added + No upstream changelog provided +- add opal_errd.service file +- add ppc64-diag.opal_errd.patch: fix opal_errd init script +- fix rtas_errd init script: $pid to correct pid file + (init scripts might be obsolete due to systemd) + +------------------------------------------------------------------- Old: ---- ppc64-diag-2.6.3.tar.gz New: ---- opal_errd.service ppc64-diag-2.6.4.tar.gz ppc64-diag.opal_errd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppc64-diag.spec ++++++ --- /var/tmp/diff_new_pack.hicJth/_old 2014-04-04 16:41:29.000000000 +0200 +++ /var/tmp/diff_new_pack.hicJth/_new 2014-04-04 16:41:29.000000000 +0200 @@ -18,14 +18,14 @@ Url: http://sourceforge.net/projects/linux-diag/files/ppc64-diag Name: ppc64-diag -Version: 2.6.3 +Version: 2.6.4 Release: 0 Summary: Linux for Power Platform Diagnostics License: EPL-1.0 Group: System/Monitoring ExclusiveArch: ppc ppc64 ppc64le %if 0%{?suse_version} >= 1210 -BuildRequires: systemd +BuildRequires: systemd-rpm-macros %{?systemd_requires} %define has_systemd 1 %endif @@ -49,10 +49,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/%{version}/%{name}-%{version}.tar.gz Source1: rtas_errd.service +Source2: opal_errd.service #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 Patch2: %{name}.varunused.patch +#PATCH-FIX-OPENSUSE - ppc64-diag.opal_errd.patch - fix opal_errd initscript to comply with openSUSE standards +Patch3: %{name}.opal_errd.patch %description This package contains various diagnostic tools for PowerLinux. @@ -73,6 +76,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make @@ -81,13 +85,20 @@ make install DESTDIR=$RPM_BUILD_ROOT chmod 644 $RPM_BUILD_ROOT/etc/ppc64-diag/servevent_parse.pl mkdir $RPM_BUILD_ROOT/etc/ppc64-diag/ses_pages -pushd $RPM_BUILD_ROOT/etc/init.d -ln -s rtas_errd $RPM_BUILD_ROOT/usr/sbin/rcrtas_errd -popd ln -sf /usr/sbin/usysattn $RPM_BUILD_ROOT/usr/sbin/usysfault %if 0%{?has_systemd} -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -install -D -m0644 %{S:1} %{buildroot}%{_unitdir}/ + 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}/ + ln -s /sbin/service %{buildroot}/usr/sbin/rcrtas_errd + ln -s /sbin/service %{buildroot}/usr/sbin/rcopal_errd +%else + pushd $RPM_BUILD_ROOT/etc/init.d + ln -s rtas_errd $RPM_BUILD_ROOT/usr/sbin/rcrtas_errd + ln -s opal_errd $RPM_BUILD_ROOT/usr/sbin/rcopal_errd + popd %endif %files @@ -97,7 +108,6 @@ %dir /etc/ppc64-diag %config /etc/ppc64-diag/* %config /etc/rc.powerfail -%config %attr(755,root,root) /etc/init.d/rtas_errd %{_mandir}/man8/explain_syslog.8.gz %{_mandir}/man8/syslog_to_svclog.8.gz %{_mandir}/man8/diag_encl.8.gz @@ -108,7 +118,11 @@ %{_mandir}/man8/usysident.8.gz %if 0%{?has_systemd} -%{_unitdir}/rtas_errd.service + %{_unitdir}/rtas_errd.service + %{_unitdir}/opal_errd.service +%else + %config %attr(755,root,root) /etc/init.d/rtas_errd + %config %attr(755,root,root) /etc/init.d/opal_errd %endif %if 1 @@ -119,9 +133,12 @@ if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then %if 0%{?has_systemd} %service_add_post rtas_errd.service + %service_add_post opal_errd.service %else %{insserv_force_if_yast rtas_errd} + %{insserv_force_if_yast opal_errd} rcrtas_errd start || : + rcopal_errd start || : %endif fi fi @@ -132,16 +149,21 @@ fi %if 0%{?has_systemd} %service_del_preun rtas_errd.service + %service_del_preun opal_errd.service %else %stop_on_removal rtas_errd + %stop_on_removal opal_errd %endif %postun %if 0%{?has_systemd} %service_del_postun rtas_errd.service + %service_del_postun opal_errd.service %else %restart_on_update rtas_errd %insserv_cleanup rtas_errd + %restart_on_update opal_errd + %insserv_cleanup opal_errd %endif %else @@ -153,15 +175,20 @@ if [ "$1" = "1" ]; then # first install %if 0%{?has_systemd} %service_add_post rtas_errd.service + %service_add_post opal_errd.service %else chkconfig --add rtas_errd rcrtas_errd start + chkconfig --add opal_errd + rcopal_errd start %endif elif [ "$1" = "2" ]; then # upgrade %if 0%{?has_systemd} systemctl restart rtas_errd.service + systemctl restart opal_errd.service %else rcrtas_errd restart + rcopal_errd restart %endif fi @@ -170,9 +197,12 @@ if [ "$1" = "0" ]; then # last uninstall %if 0%{?has_systemd} %service_del_preun rtas_errd.service + %service_del_preun opal_errd.service %else rcrtas_errd stop chkconfig --del rtas_errd + rcopal_errd stop + chkconfig --del opal_errd %endif /etc/ppc64-diag/ppc64_diag_setup --unregister >/dev/null /etc/ppc64-diag/lp_diag_setup --unregister >/dev/null @@ -183,8 +213,10 @@ if [ "$2" = "2" ]; then %if 0%{?has_systemd} systemctl restart rtas_errd.service + systemctl restart opal_errd.service %else rcrtas_errd restart + rcopal_errd restart %endif fi %endif ++++++ opal_errd.service ++++++ [Unit] Description=ppc64-diag opal_errd (platform error handling) Service After=syslog.target [Service] Type=forking ExecStart=/usr/sbin/opal_errd start ExecStop=/usr/sbin/opal_errd stop StandardOutput=syslog StandardError=syslog [Install] WantedBy=multi-user.target ++++++ ppc64-diag-2.6.3.tar.gz -> ppc64-diag-2.6.4.tar.gz ++++++ ++++ 2630 lines of diff (skipped) ++++++ ppc64-diag.opal_errd.patch ++++++ Index: ppc64-diag-2.6.4/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 # Provides: opal_errd -# 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/events @@ -58,8 +60,8 @@ opal_errd_start() daemon $OE_BIN pid=`pidof opal_errd` 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 fi fi } @@ -71,8 +73,8 @@ opal_errd_stop() rc_status -v else killproc opal_errd -TERM - rm -f /var/lock/subsys/opal_errd - rm -f /var/run/opal_errd.pid + rm -f /var/run/rcopal_errd + rm -f /var/run/rcopal_errd.pid echo fi } ++++++ ppc64-diag.rtas_errd.patch ++++++ --- /var/tmp/diff_new_pack.hicJth/_old 2014-04-04 16:41:29.000000000 +0200 +++ /var/tmp/diff_new_pack.hicJth/_new 2014-04-04 16:41:29.000000000 +0200 @@ -2,10 +2,10 @@ scripts/rtas_errd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -Index: ppc64-diag-2.6.0/scripts/rtas_errd +Index: ppc64-diag-2.6.4/scripts/rtas_errd =================================================================== ---- ppc64-diag-2.6.0.orig/scripts/rtas_errd -+++ ppc64-diag-2.6.0/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 @@ -19,16 +19,18 @@ # Default-Start: 2 3 5 # Default-Stop: 0 1 4 6 # Short-Description: Daemon to retrieve platform errors -@@ -57,7 +59,7 @@ case "$1" in +@@ -63,8 +65,8 @@ case "$1" in + daemon $RE_BIN pid=`pidof rtas_errd` if [[ -n "$pid" ]]; then - echo $pid > /var/run/rtas_errd.pid +- echo $pid > /var/run/rtas_errd.pid - touch /var/lock/subsys/rtas_errd ++ echo $pid > /var/run/rcrtas_errd.pid + touch /var/run/rcrtas_errd fi echo fi -@@ -70,8 +72,8 @@ case "$1" in +@@ -77,8 +79,8 @@ case "$1" in rc_status -v else killproc rtas_errd -TERM ++++++ ppc64-diag.varunused.patch ++++++ --- /var/tmp/diff_new_pack.hicJth/_old 2014-04-04 16:41:29.000000000 +0200 +++ /var/tmp/diff_new_pack.hicJth/_new 2014-04-04 16:41:29.000000000 +0200 @@ -1,7 +1,7 @@ -Index: ppc64-diag-2.5.0/diags/7031_D24_T24.c +Index: ppc64-diag-2.6.4/diags/7031_D24_T24.c =================================================================== ---- ppc64-diag-2.5.0.orig/diags/7031_D24_T24.c -+++ ppc64-diag-2.5.0/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 @@ -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.5.0/rtas_errd/ela.c +Index: ppc64-diag-2.6.4/rtas_errd/ela.c =================================================================== ---- ppc64-diag-2.5.0.orig/rtas_errd/ela.c -+++ ppc64-diag-2.5.0/rtas_errd/ela.c +--- ppc64-diag-2.6.4.orig/rtas_errd/ela.c ++++ ppc64-diag-2.6.4/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.5.0/rtas_errd/epow.c +Index: ppc64-diag-2.6.4/rtas_errd/epow.c =================================================================== ---- ppc64-diag-2.5.0.orig/rtas_errd/epow.c -+++ ppc64-diag-2.5.0/rtas_errd/epow.c +--- ppc64-diag-2.6.4.orig/rtas_errd/epow.c ++++ ppc64-diag-2.6.4/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.5.0/rtas_errd/files.c +Index: ppc64-diag-2.6.4/rtas_errd/files.c =================================================================== ---- ppc64-diag-2.5.0.orig/rtas_errd/files.c -+++ ppc64-diag-2.5.0/rtas_errd/files.c +--- ppc64-diag-2.6.4.orig/rtas_errd/files.c ++++ ppc64-diag-2.6.4/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.5.0/rtas_errd/guard.c +Index: ppc64-diag-2.6.4/rtas_errd/guard.c =================================================================== ---- ppc64-diag-2.5.0.orig/rtas_errd/guard.c -+++ ppc64-diag-2.5.0/rtas_errd/guard.c +--- ppc64-diag-2.6.4.orig/rtas_errd/guard.c ++++ ppc64-diag-2.6.4/rtas_errd/guard.c @@ -40,7 +40,7 @@ run_drmgr(enum resource_dealloc_type res unsigned int value, int wait) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
