Accepting request 541728 from home:markkp:branches:Base:System

- Added s390-tools-sles15-zdev-Use-correct-path-to-vmcp-binary.patch
  zdev: Use correct path to vmcp binary (bsc#1055909)
- Modified the spec file to also install /etc/cpuplugd.conf
  (bsc#1066328)
- Dropped installation of obsolete /etc/sysconfig/mon_statd.
- Removed "-i" option from "fillup_only" macro for osasnmpd to get
  rid of a warning message from RPM.

OBS-URL: https://build.opensuse.org/request/show/541728
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=32
This commit is contained in:
Mark Post 2017-11-14 03:34:41 +00:00 committed by Git OBS Bridge
parent 224f6e131f
commit 2730a444e5
2 changed files with 9 additions and 3 deletions

View File

@ -1,8 +1,13 @@
-------------------------------------------------------------------
Mon Nov 13 23:32:17 UTC 2017 - mpost@suse.com
Tue Nov 14 03:19:55 UTC 2017 - mpost@suse.com
- Added s390-tools-sles15-zdev-Use-correct-path-to-vmcp-binary.patch
zdev: Use correct path to vmcp binary (bsc#1055909)
- Modified the spec file to also install /etc/cpuplugd.conf
(bsc#1066328)
- Dropped installation of obsolete /etc/sysconfig/mon_statd.
- Removed "-i" option from "fillup_only" macro for osasnmpd to get
rid of a warning message from RPM.
-------------------------------------------------------------------
Thu Nov 9 20:39:38 UTC 2017 - mpost@suse.com

View File

@ -217,6 +217,7 @@ install -m644 -t %{buildroot}/%{_mandir}/man8 %{S:87}
export ROOT_BUILD_DIR="%{_builddir}/%{name}-%{version}/zfcpdump/kernel"
install -D -m600 /boot/image-*-zfcpdump %{buildroot}/usr/lib/s390-tools/zfcpdump/zfcpdump_part.image
install -D -m644 etc/cpuplugd.conf %{buildroot}/etc/cpuplugd.conf
install -D -m644 etc/udev/rules.d/40-z90crypt.rules %{buildroot}/usr/lib/udev/rules.d/40-z90crypt.rules
install -D -m644 etc/udev/rules.d/57-osasnmpd.rules %{buildroot}/usr/lib/udev/rules.d/57-osasnmpd.rules
install -D -m644 etc/udev/rules.d/59-dasd.rules %{buildroot}/usr/lib/udev/rules.d/59-dasd.rules
@ -225,7 +226,6 @@ install -D -m644 etc/sysconfig/cpi %{buildroot}/var/adm/fillup-templates/sysconf
install -D -m644 etc/sysconfig/dumpconf %{buildroot}/var/adm/fillup-templates/sysconfig.dumpconf
install -D -m644 etc/sysconfig/mon_fsstatd %{buildroot}/var/adm/fillup-templates/sysconfig.mon_fsstatd
install -D -m644 etc/sysconfig/mon_procd %{buildroot}/var/adm/fillup-templates/sysconfig.mon_procd
install -D -m644 etc/sysconfig/mon_statd %{buildroot}/var/adm/fillup-templates/sysconfig.mon_statd
mv iucvterm/doc/ts-shell/iucvconn_on_login %{buildroot}/usr/bin/iucvconn_on_login
install -D -m644 %{S:26} %{buildroot}/%{_unitdir}/cio_ignore.service
install -D -m755 %{S:27} %{buildroot}/usr/lib/systemd/scripts/setup_cio_ignore.sh
@ -370,7 +370,7 @@ grep -q '^/usr/bin/ts-shell$' /etc/shells \
|| echo "/usr/bin/ts-shell" >> /etc/shells
%post -n osasnmpd
%{fillup_only -i -n osasnmpd}
%{fillup_only -n osasnmpd}
%preun
%{stop_on_removal appldata}
@ -435,6 +435,7 @@ fi
%config %attr(0640,root,ts-shell) /etc/iucvterm/ts-shell.conf
%config %attr(0640,root,ts-shell) /etc/iucvterm/unrestricted.conf
%config /etc/modprobe.d/90-s390-tools.conf
%config /etc/cpuplugd.conf
%config /boot/zipl/active_devices.txt
%dir %attr(2770,root,ts-shell) /var/log/ts-shell
%dir /etc/cmsfs-fuse