From a27744e7178e3243d8f468a02f1cd9d295f528e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 22 Apr 2016 08:01:18 -0400 Subject: [PATCH] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- .gitignore | 1 + s390-tools-1.29.0-format.patch | 33 ------------------------- s390-tools-1.34.0-zipl-flags.patch | 25 +++++++++++++++++++ s390utils.spec | 39 +++++++++++++----------------- sources | 2 +- 5 files changed, 44 insertions(+), 56 deletions(-) delete mode 100644 s390-tools-1.29.0-format.patch create mode 100644 s390-tools-1.34.0-zipl-flags.patch diff --git a/.gitignore b/.gitignore index 90e1493..d3b899d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ src_vipa-2.0.4.tar.gz /src_vipa-2.1.0.tar.gz /s390-tools-1.29.0.tar.bz2 /s390-tools-1.30.0.tar.bz2 +/s390-tools-1.34.0.tar.bz2 diff --git a/s390-tools-1.29.0-format.patch b/s390-tools-1.29.0-format.patch deleted file mode 100644 index 6a710a0..0000000 --- a/s390-tools-1.29.0-format.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up s390-tools-1.29.0/cpacfstats/cpacfstatsd.c.format s390-tools-1.29.0/cpacfstats/cpacfstatsd.c ---- s390-tools-1.29.0/cpacfstats/cpacfstatsd.c.format 2015-06-23 04:52:38.141420401 -0400 -+++ s390-tools-1.29.0/cpacfstats/cpacfstatsd.c 2015-06-23 04:53:01.271420401 -0400 -@@ -348,7 +348,7 @@ int eprint(const char *format, ...) - - if (n > 0) { - if (daemonized) -- syslog(LOG_WARNING, buf); -+ syslog(LOG_WARNING, "%s", buf); - else - fputs(buf, stderr); - } -diff -up s390-tools-1.29.0/tape390/tape390_display.c.format s390-tools-1.29.0/tape390/tape390_display.c ---- s390-tools-1.29.0/tape390/tape390_display.c.format 2015-05-13 05:17:55.000000000 -0400 -+++ s390-tools-1.29.0/tape390/tape390_display.c 2015-06-23 04:50:24.061420401 -0400 -@@ -175,7 +175,7 @@ int main(int argc, char *argv[]) { - ) { - switch(c) { - case 'h': -- fprintf(stderr, help_text); -+ fprintf(stderr, "%s", help_text); - exit(0); - case 'b': - ds.cntrl.blink = 1; -@@ -266,7 +266,7 @@ int main(int argc, char *argv[]) { - strchkcpy(ds.message1, argv[optind]); - pathname = argv[optind+1]; - } else { -- fprintf(stderr, help_text); -+ fprintf(stderr, "%s", help_text); - exit(1); - } - diff --git a/s390-tools-1.34.0-zipl-flags.patch b/s390-tools-1.34.0-zipl-flags.patch new file mode 100644 index 0000000..4c2f48a --- /dev/null +++ b/s390-tools-1.34.0-zipl-flags.patch @@ -0,0 +1,25 @@ +From 9093cab19f973c3d42b9c24565b94bc6e06159fa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Fri, 22 Apr 2016 13:21:50 +0200 +Subject: [PATCH] zipl: disable strict aliasing for bootloader + +--- + zipl/boot/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile +index ebb734d..d84e10d 100644 +--- a/zipl/boot/Makefile ++++ b/zipl/boot/Makefile +@@ -4,7 +4,7 @@ include ../../common.mak + CFLAGS = -Os -g -I../include -D__ASSEMBLY__ \ + -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ + -fno-builtin -ffreestanding -fno-asynchronous-unwind-tables \ +- -fno-delete-null-pointer-checks \ ++ -fno-delete-null-pointer-checks -fno-strict-aliasing \ + -fexec-charset=IBM1047 -m64 -mpacked-stack \ + -mstack-size=8192 -mstack-guard=128 -msoft-float $(WARNFLAGS) + +-- +2.4.11 + diff --git a/s390utils.spec b/s390utils.spec index 6941254..e8b043b 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -4,8 +4,8 @@ Name: s390utils Summary: Utilities and daemons for IBM System/z Group: System Environment/Base -Version: 1.30.0 -Release: 3%{?dist} +Version: 1.34.0 +Release: 1%{?dist} Epoch: 2 License: GPLv2 and GPLv2+ and CPL ExclusiveArch: s390 s390x @@ -33,7 +33,7 @@ Source18: cpuplugd.initd Source19: mon_statd.initd Source21: normalize_dasd_arg -Patch1: s390-tools-1.29.0-format.patch +Patch1: s390-tools-1.34.0-zipl-flags.patch Patch1000: cmsfs-1.1.8-warnings.patch Patch1001: cmsfs-1.1.8-kernel26.patch @@ -60,7 +60,7 @@ be used together with the zSeries (s390) Linux kernel and device drivers. %setup -q -n s390-tools-%{version} -a 4 -a 6 # Fedora/RHEL changes -%patch1 -p1 -b .format +%patch1 -p1 -b .zipl-flags # # cmsfs @@ -105,19 +105,16 @@ popd %install -mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,/lib/udev/rules.d,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,sysconfig},%{_initddir}} - # workaround an issue in the zipl-device-mapper patch rm -f zipl/src/zipl_helper.device-mapper.* make install \ - INSTROOT=$RPM_BUILD_ROOT \ - MANDIR=$RPM_BUILD_ROOT%{_mandir} \ - LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \ + DESTDIR=$RPM_BUILD_ROOT \ + SYSTEMDSYSTEMUNITDIR=%{_unitdir} \ DISTRELEASE=%{release} \ - SYSTEMDSYSTEMUNITDIR=$RPM_BUILD_ROOT%{_unitdir} \ V=1 +mkdir -p $RPM_BUILD_ROOT{/boot,/lib/udev/rules.d,%{_initddir},%{_sysconfdir}/{profile.d,sysconfig}} install -p -m 644 zipl/boot/tape0.bin $RPM_BUILD_ROOT/boot/tape0 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d @@ -141,16 +138,10 @@ install -p -m 755 %{SOURCE18} ${RPM_BUILD_ROOT}%{_initddir}/cpuplugd install -Dp -m 644 etc/udev/rules.d/*.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d # cmsfs tools must be available in /sbin -install -p -m 755 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT/sbin -install -p -m 755 cmsfs-%{cmsfsver}/cmsfslst $RPM_BUILD_ROOT/sbin -install -p -m 755 cmsfs-%{cmsfsver}/cmsfsvol $RPM_BUILD_ROOT/sbin -install -p -m 755 cmsfs-%{cmsfsver}/cmsfscp $RPM_BUILD_ROOT/sbin -install -p -m 755 cmsfs-%{cmsfsver}/cmsfsck $RPM_BUILD_ROOT/sbin -install -p -m 644 cmsfs-%{cmsfsver}/cmsfscat.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install -p -m 644 cmsfs-%{cmsfsver}/cmsfslst.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install -p -m 644 cmsfs-%{cmsfsver}/cmsfsvol.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install -p -m 644 cmsfs-%{cmsfsver}/cmsfscp.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install -p -m 644 cmsfs-%{cmsfsver}/cmsfsck.8 $RPM_BUILD_ROOT%{_mandir}/man8 +for f in cat lst vol cp ck; do + install -p -m 755 cmsfs-%{cmsfsver}/cmsfs${f} $RPM_BUILD_ROOT/sbin + install -p -m 644 cmsfs-%{cmsfsver}/cmsfs${f}.8 $RPM_BUILD_ROOT%{_mandir}/man8 +done # src_vipa pushd src_vipa-%{vipaver} @@ -355,7 +346,7 @@ fi : %files base -%doc README +%doc README zdev/src/*.txt %doc LICENSE /sbin/zipl /sbin/dasdfmt @@ -366,6 +357,7 @@ fi /sbin/chccwdev /sbin/chchp /sbin/chzcrypt +/sbin/chzdev /sbin/cio_ignore /sbin/lschp /sbin/lscss @@ -374,6 +366,7 @@ fi /sbin/lsscm /sbin/lstape /sbin/lszcrypt +/sbin/lszdev /sbin/lszfcp /sbin/scsi_logging_level /sbin/zfcpdbf @@ -410,6 +403,7 @@ fi %{_mandir}/man1/dbginfo.sh.1* %{_mandir}/man1/zfcpdbf.1* %{_mandir}/man1/lscpumf.1* +%{_mandir}/man1/vmconvert.1* %{_mandir}/man4/prandom.4* %{_mandir}/man5/zipl.conf.5* %{_mandir}/man8/chccwdev.8* @@ -419,6 +413,7 @@ fi %{_mandir}/man8/chreipl.8* %{_mandir}/man8/chshut.8* %{_mandir}/man8/chzcrypt.8* +%{_mandir}/man8/chzdev.8* %{_mandir}/man8/cio_ignore.8* %{_mandir}/man8/dasdfmt.8* %{_mandir}/man8/dasdinfo.8* @@ -438,6 +433,7 @@ fi %{_mandir}/man8/lsshut.8* %{_mandir}/man8/lstape.8* %{_mandir}/man8/lszcrypt.8* +%{_mandir}/man8/lszdev.8* %{_mandir}/man8/lszfcp.8* %{_mandir}/man8/qetharp.8* %{_mandir}/man8/qethconf.8* @@ -446,7 +442,6 @@ fi %{_mandir}/man8/tape390_display.8* %{_mandir}/man8/ttyrun.8* %{_mandir}/man8/tunedasd.8* -%{_mandir}/man8/vmconvert.8* %{_mandir}/man8/vmcp.8* %{_mandir}/man8/vmur.8* %{_mandir}/man8/zgetdump.8* diff --git a/sources b/sources index 8235962..9f11421 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 71a8ee5918f2c44c385fcfe8350cdc98 cmsfs-1.1.8c.tar.gz 6011b33227d843a6e2f8144331f4b3d4 src_vipa-2.1.0.tar.gz -2023f02a3964ac56d255076cc5410449 s390-tools-1.30.0.tar.bz2 +0621adf62cca1beff110170b2681a9c8 s390-tools-1.34.0.tar.bz2