Hello community, here is the log from the commit of package ppc64-diag for openSUSE:Factory checked in at 2017-10-23 16:53:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ppc64-diag (Old) and /work/SRC/openSUSE:Factory/.ppc64-diag.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ppc64-diag" Mon Oct 23 16:53:35 2017 rev:39 rq:535938 version:2.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ppc64-diag/ppc64-diag.changes 2017-03-02 19:43:20.460648859 +0100 +++ /work/SRC/openSUSE:Factory/.ppc64-diag.new/ppc64-diag.changes 2017-10-23 16:53:52.927027170 +0200 @@ -1,0 +2,18 @@ +Fri Oct 20 09:43:36 UTC 2017 - jloe...@suse.com + +- version update to 2.7.4 (fate#322225) + +- modified patches: + * ppc64-diag.varunused.patch + +- removed patches: + * ppc64-diag.opal_errd.patch + * ppc64-diag.rtas_errd.patch + +------------------------------------------------------------------- +Wed Sep 6 11:34:03 UTC 2017 - jloe...@suse.com + +- add missing references for SLE merge: + * bsc#931001 + +------------------------------------------------------------------- @@ -25 +43 @@ -- Update to 2.7.1 +- Update to 2.7.1 (bsc#979032) Old: ---- ppc64-diag-2.7.3.tar.gz ppc64-diag.opal_errd.patch ppc64-diag.rtas_errd.patch New: ---- ppc64-diag-2.7.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppc64-diag.spec ++++++ --- /var/tmp/diff_new_pack.U0wxG4/_old 2017-10-23 16:53:53.566997211 +0200 +++ /var/tmp/diff_new_pack.U0wxG4/_new 2017-10-23 16:53:53.570997024 +0200 @@ -18,42 +18,41 @@ Url: http://sourceforge.net/projects/linux-diag/files/ppc64-diag Name: ppc64-diag -Version: 2.7.3 +Version: 2.7.4 Release: 0 Summary: Linux for Power Platform Diagnostics License: GPL-2.0+ Group: System/Monitoring ExclusiveArch: ppc ppc64 ppc64le -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd-rpm-macros -%{?systemd_requires} -%define has_systemd 1 -%endif +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bison BuildRequires: flex BuildRequires: gcc-c++ -BuildRequires: librtas-devel +BuildRequires: librtas-devel >= 1.4.0 BuildRequires: libservicelog-devel +BuildRequires: libtool BuildRequires: libudev-devel BuildRequires: libvpd2-devel BuildRequires: ncurses-devel +BuildRequires: perl BuildRequires: sqlite3-devel -Requires: lsvpd -Requires: powerpc-utils >= 1.2.15 +BuildRequires: systemd-rpm-macros +Requires: cron Requires: servicelog +Requires: systemd +# License change +Requires: powerpc-utils >= 1.3.2 +# Light Path Diagnostics depends on below lsvpd version. +Requires: lsvpd >= 1.7.1 # 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*) -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 -#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 +Patch1: %{name}.varunused.patch %description This package contains various diagnostic tools for PowerLinux. @@ -72,17 +71,12 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 -%patch3 -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 +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 +./autogen.sh +%configure make %install @@ -90,22 +84,20 @@ chmod 644 $RPM_BUILD_ROOT/etc/ppc64-diag/servevent_parse.pl mkdir $RPM_BUILD_ROOT/etc/ppc64-diag/ses_pages ln -sf /usr/sbin/usysattn $RPM_BUILD_ROOT/usr/sbin/usysfault -%if 0%{?has_systemd} - mkdir -p $RPM_BUILD_ROOT/%{_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 - 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 +mkdir -p $RPM_BUILD_ROOT/%{_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 +rm %{buildroot}/usr/libexec/%{name}/opal_errd +rm %{buildroot}/usr/libexec/%{name}/rtas_errd +rm %{buildroot}/usr/share/doc/%{name}/COPYING +rm %{buildroot}/usr/share/doc/%{name}/README %files %defattr (-,root,root,-) -%doc %attr(644,root,root) COPYING +%doc COPYING +%doc README /usr/sbin/* %dir /etc/ppc64-diag %config /etc/ppc64-diag/* @@ -121,98 +113,21 @@ %{_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) %{_initddir}/rtas_errd - %config %attr(755,root,root) %{_initddir}/opal_errd -%endif - -%if 1 +%attr(755,root,root) /etc/cron.daily/run_diag_encl +%{_unitdir}/rtas_errd.service +%{_unitdir}/opal_errd.service %post -%if 0%{?has_systemd} - %service_add_post rtas_errd.service opal_errd.service -%else - %{insserv_force_if_yast rtas_errd} - %{insserv_force_if_yast opal_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 - rcrtas_errd start || : - rcopal_errd start || : - fi - fi -%endif - -%preun -if test "$1" = "0" ; then - test -f /var/cache/ppc64-diag.registered && rmdir -v /var/cache/ppc64-diag.registered || : -fi -%if 0%{?has_systemd} - %service_del_preun rtas_errd.service 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 opal_errd.service -%else - %restart_on_update rtas_errd - %insserv_cleanup rtas_errd - %restart_on_update opal_errd - %insserv_cleanup opal_errd -%endif - -%pre -%if 0%{?has_systemd} - %service_add_pre rtas_errd.service opal_errd.service -%endif - -%else - -%post -# Post-install script -------------------------------------------------- -/etc/ppc64-diag/ppc64_diag_setup --register >/dev/null -/etc/ppc64-diag/lp_diag_setup --register >/dev/null -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 +/etc/ppc64-diag/ppc64_diag_setup --register >/dev/null 2>&1 +/etc/ppc64-diag/lp_diag_setup --register >/dev/null 2>&1 +%service_add_post rtas_errd.service +%service_add_post opal_errd.service %preun # Pre-uninstall script ------------------------------------------------- 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 fi @@ -220,26 +135,15 @@ %triggerin -- librtas # trigger on librtas upgrades ------------------------------------------ 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 + systemctl restart rtas_errd.service >/dev/null fi -%postun -%if 0%{?has_systemd} - %service_del_postun rtas_errd.service - %service_del_postun opal_errd.service -%endif - %pre -%if 0%{?has_systemd} - %service_add_pre rtas_errd.service - %service_add_pre opal_errd.service -%endif -%endif +%service_add_pre rtas_errd.service +%service_add_pre opal_errd.service + +%postun +%service_del_postun rtas_errd.service +%service_del_postun opal_errd.service %changelog ++++++ ppc64-diag-2.7.3.tar.gz -> ppc64-diag-2.7.4.tar.gz ++++++ ++++ 61253 lines of diff (skipped) ++++++ ppc64-diag.varunused.patch ++++++ --- /var/tmp/diff_new_pack.U0wxG4/_old 2017-10-23 16:53:53.818985415 +0200 +++ /var/tmp/diff_new_pack.U0wxG4/_new 2017-10-23 16:53:53.818985415 +0200 @@ -1,7 +1,7 @@ -Index: ppc64-diag-2.7.3/rtas_errd/files.c +Index: ppc64-diag-2.7.4/rtas_errd/files.c =================================================================== ---- ppc64-diag-2.7.3.orig/rtas_errd/files.c -+++ ppc64-diag-2.7.3/rtas_errd/files.c +--- ppc64-diag-2.7.4.orig/rtas_errd/files.c ++++ ppc64-diag-2.7.4/rtas_errd/files.c @@ -176,7 +176,7 @@ setup_rtas_event_scenario(void) { struct stat sbuf; @@ -11,10 +11,10 @@ int i; if (scenario_file == NULL) -Index: ppc64-diag-2.7.3/rtas_errd/epow.c +Index: ppc64-diag-2.7.4/rtas_errd/epow.c =================================================================== ---- ppc64-diag-2.7.3.orig/rtas_errd/epow.c -+++ ppc64-diag-2.7.3/rtas_errd/epow.c +--- ppc64-diag-2.7.4.orig/rtas_errd/epow.c ++++ ppc64-diag-2.7.4/rtas_errd/epow.c @@ -62,7 +62,7 @@ static int time_remaining = 0; void epow_timer_handler(int sig, siginfo_t siginfo, void *context) @@ -24,7 +24,7 @@ struct itimerval tv; if (time_remaining <= 0) { -@@ -163,7 +163,7 @@ parse_epow(struct event *event) +@@ -162,7 +162,7 @@ parse_epow(struct event *event) struct rtas_epow_scn *epow; struct itimerval tv; char *event_type; @@ -33,19 +33,19 @@ /* * Check the sensor state; this will be used to ensure -@@ -394,7 +394,7 @@ check_epow(struct event *event) +@@ -397,7 +397,7 @@ check_epow(struct event *event) { pid_t child; char *childargs[2]; -- int rc, current_status; -+ int __attribute__((unused)) rc, current_status; +- int current_status; ++ int __attribute__((unused)) current_status; /* * Dissect the EPOW extended error information; -Index: ppc64-diag-2.7.3/diags/7031_D24_T24.c +Index: ppc64-diag-2.7.4/diags/7031_D24_T24.c =================================================================== ---- ppc64-diag-2.7.3.orig/diags/7031_D24_T24.c -+++ ppc64-diag-2.7.3/diags/7031_D24_T24.c +--- ppc64-diag-2.7.4.orig/diags/7031_D24_T24.c ++++ ppc64-diag-2.7.4/diags/7031_D24_T24.c @@ -370,7 +370,8 @@ int diag_7031_D24_T24(int fd, struct dev_vpd *vpd) {
