Hello community, here is the log from the commit of package ppc64-diag for openSUSE:Factory checked in at 2012-12-17 09:37:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ppc64-diag (Old) and /work/SRC/openSUSE:Factory/.ppc64-diag.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ppc64-diag", Maintainer is "jloe...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ppc64-diag/ppc64-diag.changes 2012-06-15 14:05:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ppc64-diag.new/ppc64-diag.changes 2012-12-17 09:37:08.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Dec 6 17:30:26 UTC 2012 - dval...@suse.com + +- update to 2.5.0 + No upstream changelog provided +- add systemd service for rtas_errd + +------------------------------------------------------------------- Old: ---- ppc64-diag-2.4.3.tar.gz New: ---- ppc64-diag-2.5.0.tar.gz rtas_errd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppc64-diag.spec ++++++ --- /var/tmp/diff_new_pack.RN5lfW/_old 2012-12-17 09:37:10.000000000 +0100 +++ /var/tmp/diff_new_pack.RN5lfW/_new 2012-12-17 09:37:10.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ppc64-diag (Version 2.3.1) +# spec file for package ppc64-diag # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,16 +18,26 @@ Url: http://sourceforge.net/projects/linux-diag/files/ppc64-diag Name: ppc64-diag -Version: 2.4.3 -Release: 1 +Version: 2.5.0 +Release: 0 Summary: Linux for Power Platform Diagnostics -Group: System/Monitoring License: EPL-1.0 +Group: System/Monitoring ExclusiveArch: ppc ppc64 -BuildRequires: librtas-devel libservicelog-devel -BuildRequires: sqlite3-devel gcc-c++ bison flex libvpd2-devel -Requires: servicelog +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%{?systemd_requires} +%define has_systemd 1 +%endif +BuildRequires: bison +BuildRequires: flex +BuildRequires: gcc-c++ +BuildRequires: librtas-devel +BuildRequires: libservicelog-devel +BuildRequires: libvpd2-devel +BuildRequires: sqlite3-devel Requires: lsvpd +Requires: servicelog # autoselect the package on systems which have the /vdevice/IBM,sp node # All pSeries POWER5 and later have this property Supplements: modalias(vio:TIBM*spS*) @@ -35,6 +45,7 @@ PreReq: aaa_base BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/%{version}/%{name}-%{version}.tar.gz +Source1: rtas_errd.service Patch0: %{name}.makefile.patch Patch1: %{name}.rtas_errd.patch Patch2: %{name}.varunused.patch @@ -71,6 +82,10 @@ pushd $RPM_BUILD_ROOT/etc/init.d ln -s rtas_errd $RPM_BUILD_ROOT/usr/sbin/rcrtas_errd popd +%if 0%{?has_systemd} +mkdir -p $RPM_BUILD_ROOT/%{_unitdir} +install -D -m0644 %{S:1} %{buildroot}%{_unitdir}/ +%endif %files %defattr (-,root,root,-) @@ -82,51 +97,85 @@ %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 +%{_mandir}/man8/encl_led.8.gz +%if 0%{?has_systemd} +%{_unitdir}/rtas_errd.service +%endif %if 1 %post -%{insserv_force_if_yast rtas_errd} # get it going if outside a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then - /etc/init.d/rtas_errd start || : + %if 0%{?has_systemd} + %service_add_post rtas_errd.service + %else + %{insserv_force_if_yast rtas_errd} + rcrtas_errd start || : + %endif fi fi %preun if test "$1" = "0" ; then - rmdir -v /var/cache/ppc64-diag.registered || : + test -f /var/cache/ppc64-diag.registered && rmdir -v /var/cache/ppc64-diag.registered || : fi -%stop_on_removal rtas_errd +%if 0%{?has_systemd} + %service_del_preun rtas_errd.service +%else + %stop_on_removal rtas_errd +%endif %postun -%restart_on_update rtas_errd -%{insserv_cleanup} +%if 0%{?has_systemd} + %service_del_postun rtas_errd.service +%else + %restart_on_update rtas_errd + %{insserv_cleanup} +%endif + %else %post # Post-install script -------------------------------------------------- /etc/ppc64-diag/ppc64_diag_setup --register >/dev/null if [ "$1" = "1" ]; then # first install - /sbin/chkconfig --add rtas_errd - /etc/init.d/rtas_errd start + %if 0%{?has_systemd} + %service_add_post rtas_errd.service + %else + chkconfig --add rtas_errd + rcrtas_errd start + %endif elif [ "$1" = "2" ]; then # upgrade - /etc/init.d/rtas_errd restart + %if 0%{?has_systemd} + systemctl restart rtas_errd.service + %else + rcrtas_errd restart + %endif fi %preun # Pre-uninstall script ------------------------------------------------- if [ "$1" = "0" ]; then # last uninstall - /etc/init.d/rtas_errd stop - /sbin/chkconfig --del rtas_errd + %if 0%{?has_systemd} + %service_del_preun rtas_errd.service + %else + rcrtas_errd stop + chkconfig --del rtas_errd + %endif /etc/ppc64-diag/ppc64_diag_setup --unregister >/dev/null fi %triggerin -- librtas # trigger on librtas upgrades ------------------------------------------ if [ "$2" = "2" ]; then - /etc/init.d/rtas_errd restart + %if 0%{?has_systemd} + systemctl restart rtas_errd.service + %else + rcrtas_errd restart + %endif fi %endif ++++++ ppc64-diag-2.4.3.tar.gz -> ppc64-diag-2.5.0.tar.gz ++++++ ++++ 4812 lines of diff (skipped) ++++++ ppc64-diag.rtas_errd.patch ++++++ --- /var/tmp/diff_new_pack.RN5lfW/_old 2012-12-17 09:37:10.000000000 +0100 +++ /var/tmp/diff_new_pack.RN5lfW/_new 2012-12-17 09:37:10.000000000 +0100 @@ -2,8 +2,10 @@ scripts/rtas_errd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---- a/scripts/rtas_errd -+++ b/scripts/rtas_errd +Index: ppc64-diag-2.5.0/scripts/rtas_errd +=================================================================== +--- ppc64-diag-2.5.0.orig/scripts/rtas_errd ++++ ppc64-diag-2.5.0/scripts/rtas_errd @@ -19,8 +19,10 @@ ### BEGIN INIT INFO ++++++ ppc64-diag.varunused.patch ++++++ --- /var/tmp/diff_new_pack.RN5lfW/_old 2012-12-17 09:37:10.000000000 +0100 +++ /var/tmp/diff_new_pack.RN5lfW/_new 2012-12-17 09:37:10.000000000 +0100 @@ -1,8 +1,8 @@ -Index: ppc64-diag-2.4.3/diags/7031_D24_T24.c +Index: ppc64-diag-2.5.0/diags/7031_D24_T24.c =================================================================== ---- ppc64-diag-2.4.3.orig/diags/7031_D24_T24.c -+++ ppc64-diag-2.4.3/diags/7031_D24_T24.c -@@ -64,7 +64,8 @@ get_enclosure_scsi_id(struct pearl_diag_ +--- ppc64-diag-2.5.0.orig/diags/7031_D24_T24.c ++++ ppc64-diag-2.5.0/diags/7031_D24_T24.c +@@ -69,7 +69,8 @@ get_enclosure_scsi_id(struct pearl_diag_ static int print_drive_status(uint32_t status) { @@ -12,7 +12,7 @@ if ((status & 0x0F000000) == 0x05000000) { printf("(empty) "); -@@ -162,7 +163,8 @@ print_ps_fan_status(uint32_t status) +@@ -167,7 +168,8 @@ print_ps_fan_status(uint32_t status) static int print_repeater_status(uint32_t status) { @@ -22,8 +22,8 @@ if ((status & 0x0F000000) == 0x01000000) printf("ok "); -@@ -348,7 +350,8 @@ int - diag_7031_D24_T24(int fd, struct dev_vpd *vpd, int se, int verbose) +@@ -351,7 +353,8 @@ int + diag_7031_D24_T24(int fd, struct dev_vpd *vpd) { struct pearl_diag_page2 dp; - int failure = 0, rc, encl_id; @@ -32,10 +32,10 @@ int buf_len = sizeof(dp); int ps1, ps2, fan1, fan2, fan3, rpt, vpd_card; -Index: ppc64-diag-2.4.3/rtas_errd/ela.c +Index: ppc64-diag-2.5.0/rtas_errd/ela.c =================================================================== ---- ppc64-diag-2.4.3.orig/rtas_errd/ela.c -+++ ppc64-diag-2.4.3/rtas_errd/ela.c +--- ppc64-diag-2.5.0.orig/rtas_errd/ela.c ++++ ppc64-diag-2.5.0/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.4.3/rtas_errd/epow.c +Index: ppc64-diag-2.5.0/rtas_errd/epow.c =================================================================== ---- ppc64-diag-2.4.3.orig/rtas_errd/epow.c -+++ ppc64-diag-2.4.3/rtas_errd/epow.c +--- ppc64-diag-2.5.0.orig/rtas_errd/epow.c ++++ ppc64-diag-2.5.0/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.4.3/rtas_errd/files.c +Index: ppc64-diag-2.5.0/rtas_errd/files.c =================================================================== ---- ppc64-diag-2.4.3.orig/rtas_errd/files.c -+++ ppc64-diag-2.4.3/rtas_errd/files.c +--- ppc64-diag-2.5.0.orig/rtas_errd/files.c ++++ ppc64-diag-2.5.0/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.4.3/rtas_errd/guard.c +Index: ppc64-diag-2.5.0/rtas_errd/guard.c =================================================================== ---- ppc64-diag-2.4.3.orig/rtas_errd/guard.c -+++ ppc64-diag-2.4.3/rtas_errd/guard.c +--- ppc64-diag-2.5.0.orig/rtas_errd/guard.c ++++ ppc64-diag-2.5.0/rtas_errd/guard.c @@ -40,7 +40,7 @@ run_drmgr(enum resource_dealloc_type res unsigned int value, int wait) { @@ -102,12 +102,3 @@ char capacity[6], quant_str[5]; char *drmgr_args[] = {DRMGR_PROGRAM_NOPATH, "-r", "-c", NULL, NULL, NULL, NULL, NULL, NULL}; -@@ -368,7 +368,7 @@ guard_cpu(struct event *event, int cpu_i - static void - guard_spcpu(struct event *event, int ent_loss) - { -- int n_cpus, rc, quant, ent_cap; -+ int n_cpus, __attribute__((unused)) rc = 0, quant, ent_cap; - int min_ent_cap = d_cfg.min_entitled_capacity; - - /* ++++++ rtas_errd.service ++++++ [Unit] Description=ppc64-diag rtas_errd (platform error handling) Service After=syslog.target [Service] Type=forking ExecStart=/usr/sbin/rtas_errd start ExecStop=/usr/sbin/rtas_errd stop StandardOutput=syslog StandardError=syslog [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
