Package: s390-tools Severity: normal Tags: patch Dear Maintainer,
I've modernised packaging a bit, and fix a bunch of lintian tags. I also made a patch to prevent FTBFS, when toolchain has PIE enabled by default. Please consider applying the below patch. Regards, Dimitri.
diff -Nru s390-tools-1.32.0/debian/changelog s390-tools-1.32.0/debian/changelog --- s390-tools-1.32.0/debian/changelog 2015-12-13 14:50:48.000000000 +0000 +++ s390-tools-1.32.0/debian/changelog 2016-02-02 13:36:47.000000000 +0000 @@ -1,3 +1,20 @@ +s390-tools (1.32.0-3) UNRELEASED; urgency=medium + + * Support DESTDIR in the makefiles. + * Modernise packaging. + * Apply patch to build zipl without PIE, even if enabled by + default in the toolchain. + * Enable verbose builds + * Enable support for CFLAGS, and thus build optimized binaries, + with debug symbols stored in debugsymbols package. + * Enable hardening build flags. + * Enable parallel build. + * Fix spelling in binaries. + * Fix one more LO macro in vmur man page. + * Simplify synopsis. + + -- Dimitri John Ledkov <x...@ubuntu.com> Tue, 02 Feb 2016 00:43:51 +0100 + s390-tools (1.32.0-2) unstable; urgency=medium [ Hendrik Brueckner ] diff -Nru s390-tools-1.32.0/debian/compat s390-tools-1.32.0/debian/compat --- s390-tools-1.32.0/debian/compat 2011-10-06 19:57:51.000000000 +0100 +++ s390-tools-1.32.0/debian/compat 2016-02-02 00:20:35.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru s390-tools-1.32.0/debian/control s390-tools-1.32.0/debian/control --- s390-tools-1.32.0/debian/control 2015-12-13 14:41:14.000000000 +0000 +++ s390-tools-1.32.0/debian/control 2016-02-02 04:45:09.000000000 +0000 @@ -3,15 +3,15 @@ Priority: important Maintainer: Debian S/390 Team <debian-s...@lists.debian.org> Uploaders: Bastian Blank <wa...@debian.org>, Philipp Kern <pk...@debian.org> -Build-Depends: debhelper (>> 7), libsysfs-dev, libz-dev, quilt, gcc-multilib, libfuse-dev, libncurses-dev, libpfm4-dev -Standards-Version: 3.8.3 +Build-Depends: debhelper (>> 9), libsysfs-dev, libz-dev, quilt, gcc-multilib, libfuse-dev, libncurses-dev, libpfm4-dev +Standards-Version: 3.9.6 Homepage: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html Package: s390-tools Architecture: s390 s390x Depends: ${shlibs:Depends}, ${misc:Depends}, gawk Recommends: sg3-utils -Description: A set of fundamental utilities for Linux on S/390 +Description: fundamental utilities for Linux on S/390 The package contains: * dasdfmt, which is used to low-level format ECKD-DASDs with either the classic disk layout or the new zSeries compatible disk layout. @@ -30,7 +30,7 @@ Priority: optional Architecture: s390 s390x Depends: ${shlibs:Depends}, ${misc:Depends} -Description: A set of utilities for Linux on S/390 +Description: utilities for Linux on S/390 This is a minimal package used by debian-installer. This package contains only the binaries dasdfmt and fdasd. diff -Nru s390-tools-1.32.0/debian/patches/error-manpages.patch s390-tools-1.32.0/debian/patches/error-manpages.patch --- s390-tools-1.32.0/debian/patches/error-manpages.patch 2015-08-16 19:59:54.000000000 +0100 +++ s390-tools-1.32.0/debian/patches/error-manpages.patch 2016-02-02 05:10:12.000000000 +0000 @@ -1,7 +1,7 @@ -Index: s390-tools-1.30.0/iucvterm/doc/hvc_iucv.9 +Index: s390-tools-1.32.0/iucvterm/doc/hvc_iucv.9 =================================================================== ---- s390-tools-1.30.0.orig/iucvterm/doc/hvc_iucv.9 -+++ s390-tools-1.30.0/iucvterm/doc/hvc_iucv.9 +--- s390-tools-1.32.0.orig/iucvterm/doc/hvc_iucv.9 ++++ s390-tools-1.32.0/iucvterm/doc/hvc_iucv.9 @@ -7,7 +7,6 @@ .\" Author(s): Hendrik Brueckner <brueck...@linux.vnet.ibm.com> .\" ------------------------------------------------------------------------- @@ -10,10 +10,10 @@ . . . -Index: s390-tools-1.30.0/iucvterm/doc/iucvconn.1 +Index: s390-tools-1.32.0/iucvterm/doc/iucvconn.1 =================================================================== ---- s390-tools-1.30.0.orig/iucvterm/doc/iucvconn.1 -+++ s390-tools-1.30.0/iucvterm/doc/iucvconn.1 +--- s390-tools-1.32.0.orig/iucvterm/doc/iucvconn.1 ++++ s390-tools-1.32.0/iucvterm/doc/iucvconn.1 @@ -5,7 +5,6 @@ .\" Author(s): Hendrik Brueckner <brueck...@linux.vnet.ibm.com> .\" ---------------------------------------------------------------------- @@ -22,20 +22,20 @@ . .ds i \fBiucvconn\fP . -Index: s390-tools-1.30.0/vmcp/vmcp.8 +Index: s390-tools-1.32.0/vmcp/vmcp.8 =================================================================== ---- s390-tools-1.30.0.orig/vmcp/vmcp.8 -+++ s390-tools-1.30.0/vmcp/vmcp.8 +--- s390-tools-1.32.0.orig/vmcp/vmcp.8 ++++ s390-tools-1.32.0/vmcp/vmcp.8 @@ -1,5 +1,4 @@ .TH vmcp "8" "Apr 2006" "s390-tools" -.LO 8 .SH NAME vmcp \- send commands to the z/VM control program .SH SYNOPSIS -Index: s390-tools-1.30.0/iucvterm/doc/iucvtty.1 +Index: s390-tools-1.32.0/iucvterm/doc/iucvtty.1 =================================================================== ---- s390-tools-1.30.0.orig/iucvterm/doc/iucvtty.1 -+++ s390-tools-1.30.0/iucvterm/doc/iucvtty.1 +--- s390-tools-1.32.0.orig/iucvterm/doc/iucvtty.1 ++++ s390-tools-1.32.0/iucvterm/doc/iucvtty.1 @@ -5,7 +5,6 @@ .\" Author(s): Hendrik Brueckner <brueck...@linux.vnet.ibm.com> .\" ---------------------------------------------------------------------- @@ -44,11 +44,15 @@ . .ds t \fBiucvtty\fP .ds i \fBiucvconn\fP -Index: s390-tools-1.30.0/vmur/vmur.8 +Index: s390-tools-1.32.0/vmur/vmur.8 =================================================================== ---- s390-tools-1.30.0.orig/vmur/vmur.8 -+++ s390-tools-1.30.0/vmur/vmur.8 -@@ -5,7 +5,7 @@ +--- s390-tools-1.32.0.orig/vmur/vmur.8 ++++ s390-tools-1.32.0/vmur/vmur.8 +@@ -1,11 +1,10 @@ + .TH VMUR 8 "January 2015" "s390-tools" +-.LO 8 + . + .ds v \fBvmur\fP . . .SH NAME @@ -57,3 +61,350 @@ . . .SH SYNOPSIS +@@ -86,23 +85,19 @@ The file to be read is identified by its + a 4-digit decimal number. + Use the 'vmur list' command to display information + about files in the z/VM reader queue. +-.SP ++.sp + .SH receive options +-.SP + The following command options are supported by \fBreceive\fR: +-.SP + .IP "" 0 + \fB-f or --force\fR + .IP "" 2 + Specifies that outfile is to be overwritten without displaying any + confirmation message. +-.SP + .IP "" 0 + \fB-H or --hold\fR + .IP "" 2 + Specifies that the reader file to be received shall remain in the reader queue + after processing. If omitted, the reader file is purged. +-.SP + .IP "" 0 + \fB-C or --class\fR + .IP "" 2 +@@ -111,13 +106,11 @@ value is a 1-character alphanumeric fiel + through 9, or asterisk (*). + + If you omit this option, the asterisk (*) is used to receive files of any class. +-.SP + .IP "" 0 + \fB-d or --device\fR + .IP "" 2 + Specifies the device node of the virtual reader device. + If omitted, /dev/vmrdr-0.0.000c is assumed. +-.SP + .IP "" 0 + \fB-t or --text\fR + .IP "" 2 +@@ -126,7 +119,6 @@ received. Character sets IBM037 and ISO- + An ASCII line feed character (0x0a) is inserted for each 80-byte input + record read from the z/VM reader. Trailing EBCDIC blanks (0x40) in the + input records are stripped. +-.SP + .IP "" 0 + \fB-b or --blocked\fR + .IP "" 2 +@@ -143,30 +135,24 @@ The receive function's output can be pip + using the appropriate character sets, for example: + .IP "" 2 + # vmur re 7 -b 0x25,0x40 -O | iconv -f EBCDIC-US -t ISO-8859-1 > file +-.SP + .IP "" 0 + \fB-c or --convert\fR + .IP "" 2 + Specifies to convert the VMDUMP spool file into a + format appropriate for further analysis with crash or lcrash. +-.SP + .IP "" 0 + \fB-O or --stdout\fR + .IP "" 2 + Specifies that the reader file's contents are written to + standard output. +-.SP + .SH receive arguments +-.SP + The following command arguments are supported by \fBreceive\fR: +-.SP + .IP "" 0 + \fBspoolid\fR + .IP "" 2 + Denotes the spoolid, which identifies a z/VM spool file. + .br + spoolid is mandatory and must be a decimal number in the range 0-9999. +-.SP + .IP "" 0 + \fBoutfile\fR + .IP "" 2 +@@ -179,9 +165,7 @@ to be received + are taken to build output file name name.type. + If the spool file to be received is an unnamed file, an error message + is issued. +-.SP + .SH receive example +-.SP + Receive the z/VM console of your Linux guest machine. In the 'vmur list' output + this is an unnamed file with identifier + CON in the right part of the CLASS column. +@@ -190,7 +174,6 @@ Assume its spoolid is 1234. + # vmur re -t 1234 linux_console + .PD + .IP "" 0 +-.SP + .SH punch or print + .SS Write file to punch or printer queue + .IP "" 0 +@@ -208,11 +191,8 @@ Use \fBpunch/print\fR when you want to w + printer queue. + Specify the --rdr option if you want the file to be transferred to the z/VM + reader queue. +-.SP + .SH punch/print options +-.SP + The following command options are supported by \fBpunch/print\fR: +-.SP + .IP "" 0 + \fB-f or --force\fR + .IP "" 2 +@@ -221,33 +201,28 @@ Specifies to automatically convert Linux + file name and type without any error message. + Invalid characters are replaced by _(underscore) and both <name> and <type> + are truncated to a length of maximal 8 characters. +-.SP + .IP "" 0 + \fB-r or --rdr\fR + .IP "" 2 + Specifies that the punch or printer file + is to be transferred to a reader. +-.SP + .IP "" 0 + \fB-d or --device\fR + .IP "" 2 + Specifies the device node of the virtual punch or printer device. + If omitted, /dev/vmpun-0.0.000d is assumed for punch, + and /dev/vmprt-0.0.000e for printer. +-.SP + .IP "" 0 + \fB-C or --class\fR + .IP "" 2 + Specifies the spool file class assigned to the spool files created on this punch + or print. The class value is a 1-character alphanumeric field whose values can be + A through Z and 0 through 9. +-.SP + .IP "" 0 + \fB--form\fR + .IP "" 2 + Specifies the form to be assigned to the spool files on this punch or print. + The value is a 1- to 8-character value. +-.SP + .IP "" 0 + \fB--dest\fR + .IP "" 2 +@@ -259,7 +234,6 @@ SPOOL command, the default is OFF. OFF + destination value for virtual devices. Specify ANY to indicate that the + resulting spool file can be processed on any CP output device that meets other + selection criteria, regardless of the device's DEST setting. +-.SP + .IP "" 0 + \fB--dist\fR + .IP "" 2 +@@ -269,7 +243,6 @@ appears on the separator page. + + If OFF or an asterisk (*) is specified, the distribution code of the spool file + is reset to the distribution code in the system directory. +-.SP + .IP "" 0 + \fB-t or --text\fR + .IP "" 2 +@@ -280,7 +253,6 @@ and pad each input line with trailing bl + device record. The unit device record length is 80 for a punch and 132 + for a printer. If an input line length exceeds 80 or 132 for punch + or print, respectively, an error message is issued. +-.SP + .IP "" 0 + \fB-b or --blocked\fR + .IP "" 2 +@@ -299,7 +271,6 @@ If a line exceeds the record length, an + output can be piped to punch or print, for example: + .IP "" 2 + # iconv xyz -f ISO-8859-1 -t EBCDIC-US | vmur pun -b 0x25,0x40 -N abc +-.SP + .IP "" 0 + \fB-u or --user\fR + .IP "" 2 +@@ -312,7 +283,6 @@ The user option + is only valid, if the -r option has been specified. + If user is omitted, the data is transferred + to your own machine's reader. +-.SP + .IP "" 0 + \fB-n or --node\fR + .IP "" 2 +@@ -324,7 +294,6 @@ The node option + is only valid, if the -u option has been specified. + If node is omitted, the data is transferred to the specified user + at your local z/VM system. +-.SP + .IP "" 0 + \fB-N or --name\fR + .IP "" 2 +@@ -349,25 +318,19 @@ name rules (e.g. longer than 8 chars). + .IP "" 4 + - If the Linux input file name is also omitted (that is data is read + from standard input), then an error message is issued. +-.SP + .SH punch/print arguments +-.SP + The following command arguments are supported by \fBpunch/print\fR: +-.SP + .IP "" 0 + \fBfile\fR + .IP "" 2 + Specifies the Linux file data to be punched or printed. + If file is omitted, the data is read from standard input. +-.SP + .SH punch/print example +-.SP + Punch parmfile and transfer it to the reader queue. + .IP "" 2 + $ vmur pun -r /boot/parmfile + .PD + .IP "" 0 +-.SP + .SH list + .SS List file(s) on spool file queue + .IP "" 0 +@@ -379,11 +342,8 @@ Minimum abbreviation: li + .PP + Use \fBlist\fR when you want to display information about files on a + z/VM spool file queue. +-.SP + .SH list options +-.SP + The following command option is supported by \fBlist\fR: +-.SP + .IP "" 0 + \fB-q or --queue\fR + .IP "" 2 +@@ -391,11 +351,8 @@ Specifies the z/VM spool file queue to b + (reader file queue), pun (punch file queue), and prt (printer file queue). + .br + If omitted, the reader file queue is assumed. +-.SP + .SH list arguments +-.SP + The following command argument is supported by \fBlist\fR: +-.SP + .IP "" 0 + \fBspoolid\fR + .IP "" 2 +@@ -403,7 +360,6 @@ Identifies the z/VM spool file to be lis + If omitted, all spool files on the specified queue are listed + .PD + .IP "" 0 +-.SP + .SH purge + .SS Purge file(s) on spool file queue + .IP "" 0 +@@ -418,17 +374,13 @@ spool files to remove with the class, fo + spoolid argument. If these are omitted, all spool files on the specified + queue are purged. + \fB +-.SP + .SH purge options +-.SP + The following command options are supported by \fBpurge\fR: +-.SP + .IP "" 0 + \fB-f or --force\fR + .IP "" 2 + Specifies to purge the specified spool file(s) without displaying any + confirmation message. +-.SP + .IP "" 0 + \fB-q or --queue\fR + .IP "" 2 +@@ -437,37 +389,30 @@ Possible values are rdr + (reader file queue), pun (punch file queue), and prt (printer file queue). + .br + If omitted, the reader file queue is assumed. +-.SP + .IP "" 0 + \fB-C or --class\fR + .IP "" 2 + Specifies a spool file class. All the files of the specified class are purged. + The class value is a 1-character alphanumeric field whose values ca be A through + Z, 0 through 9. +-.SP + .IP "" 0 + \fB--form\fR + .IP "" 2 + Specifies a form name. All the files with the specified form name are purged. + The form name is a 1- to 8-character value. +-.SP + .IP "" 0 + \fB--dest\fR + .IP "" 2 + Specifies a destination value. All the files with the specified destination + value are purged. The destination is a 1- to 8-character value. +-.SP + .SH purge arguments +-.SP + The following command argument is supported by \fBpurge\fR: +-.SP + .IP "" 0 + \fBspoolid\fR + .IP "" 2 + Identifies the z/VM spool file to be purged. + .PD + .IP "" 0 +-.SP + .SH order + .SS Order file on spool file queue + .IP "" 0 +@@ -479,11 +424,8 @@ Minimum abbreviation: or + .PP + Use \fBorder\fR when you want to place a spool file on top of a + z/VM spool file queue. +-.SP + .SH order options +-.SP + The following command option is supported by \fBorder\fR: +-.SP + .IP "" 0 + \fB-q or --queue\fR + .IP "" 2 +@@ -491,11 +433,8 @@ Specifies the z/VM spool file queue you + (reader file queue), pun (punch file queue), and prt (printer file queue). + .br + If omitted, the reader file queue is assumed. +-.SP + .SH order arguments +-.SP + The following command argument is supported by \fBorder\fR: +-.SP + .IP "" 0 + \fBspoolid\fR + .IP "" 2 +Index: s390-tools-1.32.0/zdump/zgetdump.8 +=================================================================== +--- s390-tools-1.32.0.orig/zdump/zgetdump.8 ++++ s390-tools-1.32.0/zdump/zgetdump.8 +@@ -402,5 +402,12 @@ Print information about a DASD dump tool + The ELF dump format is not supported by the zgetdump tool under 31 bit. + + .SH SEE ALSO +-.BR zipl (8), crash (8), makedumpfile (8), dumpconf (8), vmconvert (8), vmur (8) +-.BR fdisk (8), parted (8) ++.PP ++\fBzipl\fR(8), ++\fBcrash\fR(8), ++\fBmakedumpfile\fR(8), ++\fBdumpconf\fR(8), ++\fBvmconvert\fR(8), ++\fBvmur\fR(8), ++\fBfdisk\fR(8), ++\fBparted\fR(8) diff -Nru s390-tools-1.32.0/debian/patches/fno-pie.patch s390-tools-1.32.0/debian/patches/fno-pie.patch --- s390-tools-1.32.0/debian/patches/fno-pie.patch 1970-01-01 01:00:00.000000000 +0100 +++ s390-tools-1.32.0/debian/patches/fno-pie.patch 2016-02-02 04:26:10.000000000 +0000 @@ -0,0 +1,85 @@ +Index: s390-tools-1.32.0/zipl/boot/Makefile +=================================================================== +--- s390-tools-1.32.0.orig/zipl/boot/Makefile ++++ s390-tools-1.32.0/zipl/boot/Makefile +@@ -1,7 +1,7 @@ + # Common definitions + include ../../common.mak + +-CFLAGS = -Os -g -I../include -D__ASSEMBLY__ \ ++CFLAGS = -no-pie -Os -g -I../include -D__ASSEMBLY__ \ + -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ + -fno-builtin -ffreestanding -fno-asynchronous-unwind-tables \ + -fno-delete-null-pointer-checks \ +@@ -57,11 +57,11 @@ stage3.exec: head.o stage3.o kdump3.o li + }' \ + ); \ + case $$STAGE in \ +- 0) SFLAGS="-nostdlib -Wl,-Ttext,0";; \ +- 1) SFLAGS="-nostdlib -Wl,-Ttext,0x18";; \ +- 1b) SFLAGS="-nostdlib -Wl,-Ttext,0xE000";; \ +- 2) SFLAGS="-nostdlib -Wl,-T,stage2.lds";; \ +- 3) SFLAGS="-nostdlib -Wl,-T,stage3.lds";; \ ++ 0) SFLAGS="-no-pie -nostdlib -Wl,-Ttext,0";; \ ++ 1) SFLAGS="-no-pie -nostdlib -Wl,-Ttext,0x18";; \ ++ 1b) SFLAGS="-no-pie -nostdlib -Wl,-Ttext,0xE000";; \ ++ 2) SFLAGS="-no-pie -nostdlib -Wl,-T,stage2.lds";; \ ++ 3) SFLAGS="-no-pie -nostdlib -Wl,-T,stage3.lds";; \ + esac; \ + $(LINK) $$SFLAGS -m64 $^ -o $@ + +@@ -80,7 +80,7 @@ stage3.exec: head.o stage3.o kdump3.o li + $< $@ + + data.o: $(FILES) +- $(LD) -r -b binary -o data.o $(FILES) ++ $(LD) -no-pie -r -b binary -o data.o $(FILES) + + data.h: data.o + rm -f data.h +Index: s390-tools-1.32.0/zipl/src/Makefile +=================================================================== +--- s390-tools-1.32.0.orig/zipl/src/Makefile ++++ s390-tools-1.32.0/zipl/src/Makefile +@@ -1,6 +1,12 @@ + # Common definitions + include ../../common.mak + ++LDFLAGS= ++ ++CFLAGS += -no-pie ++LDFLAGS += -no-pie ++CPPFLAGS += -no-pie ++ + CPPFLAGS += -I../include -I../boot -I../../include \ + -DZFCPDUMP_DIR=$(ZFCPDUMP_DIR) \ + -DZFCPDUMP_FS_IMAGE=$(ZFCPDUMP_FS_IMAGE) \ +@@ -12,7 +18,7 @@ LDFLAGS += -Wl,-z,noexecstack + + objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \ + install.o zipl.o $(rootdir)/zipl/boot/data.o \ +- $(rootdir)/libutil/util_part.o $(rootdir)/libutil/util_proc.o ++ util_part.o util_proc.o + + includes = $(wildcard ../include/*.h) + zipl_helpers = $(wildcard zipl_helper.*) +@@ -34,7 +40,7 @@ install: all + $(CP) --no-dereference $(chreipl_helpers) $(TOOLS_LIBDIR) + + clean: +- rm -f *.o $(chreipl_helpers) zipl ++ rm -f *.o $(chreipl_helpers) zipl util_part.c util_proc.c + + .PHONY: all install clean + +@@ -47,5 +53,8 @@ boot.o: ../boot/data.h + ../boot/data.o: + make -C ../boot data.o + +-../../libutil/util_part.o: +- make -C ../../libutil util_part.o ++util_part.c: ++ cp ../../libutil/$@ . ++ ++util_proc.c: ++ cp ../../libutil/$@ . diff -Nru s390-tools-1.32.0/debian/patches/install.patch s390-tools-1.32.0/debian/patches/install.patch --- s390-tools-1.32.0/debian/patches/install.patch 2015-08-16 19:58:39.000000000 +0100 +++ s390-tools-1.32.0/debian/patches/install.patch 2016-02-02 00:19:58.000000000 +0000 @@ -1,7 +1,7 @@ -Index: s390-tools-1.30.0/dasdfmt/Makefile +Index: s390-tools/dasdfmt/Makefile =================================================================== ---- s390-tools-1.30.0.orig/dasdfmt/Makefile -+++ s390-tools-1.30.0/dasdfmt/Makefile +--- s390-tools.orig/dasdfmt/Makefile ++++ s390-tools/dasdfmt/Makefile @@ -9,9 +9,9 @@ dasdfmt.o: dasdfmt.h ../include/zt_commo dasdfmt: dasdfmt.o $(rootdir)/libvtoc/vtoc.o $(rootdir)/libutil/util_proc.o @@ -15,10 +15,10 @@ clean: rm -f *.o *~ dasdfmt core -Index: s390-tools-1.30.0/dasdinfo/Makefile +Index: s390-tools/dasdinfo/Makefile =================================================================== ---- s390-tools-1.30.0.orig/dasdinfo/Makefile -+++ s390-tools-1.30.0/dasdinfo/Makefile +--- s390-tools.orig/dasdinfo/Makefile ++++ s390-tools/dasdinfo/Makefile @@ -7,9 +7,9 @@ all: dasdinfo dasdinfo: dasdinfo.o ../libu2s/u2s.o @@ -32,10 +32,10 @@ clean: rm -f *.o *~ dasdinfo core -Index: s390-tools-1.30.0/dasdview/Makefile +Index: s390-tools/dasdview/Makefile =================================================================== ---- s390-tools-1.30.0.orig/dasdview/Makefile -+++ s390-tools-1.30.0/dasdview/Makefile +--- s390-tools.orig/dasdview/Makefile ++++ s390-tools/dasdview/Makefile @@ -11,9 +11,9 @@ dasdview.o: dasdview.h ../include/zt_com dasdview: dasdview.o ../libu2s/u2s.o @@ -49,10 +49,10 @@ clean: rm -f *.o *~ dasdview core -Index: s390-tools-1.30.0/fdasd/Makefile +Index: s390-tools/fdasd/Makefile =================================================================== ---- s390-tools-1.30.0.orig/fdasd/Makefile -+++ s390-tools-1.30.0/fdasd/Makefile +--- s390-tools.orig/fdasd/Makefile ++++ s390-tools/fdasd/Makefile @@ -9,9 +9,9 @@ fdasd.o: fdasd.h ../include/zt_common.h fdasd: fdasd.o $(rootdir)/libvtoc/vtoc.o @@ -66,10 +66,10 @@ clean: rm -f *.o *~ fdasd core -Index: s390-tools-1.30.0/ip_watcher/Makefile +Index: s390-tools/ip_watcher/Makefile =================================================================== ---- s390-tools-1.30.0.orig/ip_watcher/Makefile -+++ s390-tools-1.30.0/ip_watcher/Makefile +--- s390-tools.orig/ip_watcher/Makefile ++++ s390-tools/ip_watcher/Makefile @@ -11,9 +11,8 @@ clean: install: ip_watcher.pl xcec-bridge start_hsnc.sh $(SED) -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \ @@ -83,10 +83,10 @@ + $(INSTALL) xcec-bridge $(USRSBINDIR) .PHONY: all install clean -Index: s390-tools-1.30.0/mon_tools/Makefile +Index: s390-tools/mon_tools/Makefile =================================================================== ---- s390-tools-1.30.0.orig/mon_tools/Makefile -+++ s390-tools-1.30.0/mon_tools/Makefile +--- s390-tools.orig/mon_tools/Makefile ++++ s390-tools/mon_tools/Makefile @@ -11,10 +11,10 @@ mon_procd.o: mon_procd.h mon_procd: mon_procd.o @@ -102,10 +102,10 @@ clean: rm -f *.o *~ mon_fsstatd mon_procd core -Index: s390-tools-1.30.0/qetharp/Makefile +Index: s390-tools/qetharp/Makefile =================================================================== ---- s390-tools-1.30.0.orig/qetharp/Makefile -+++ s390-tools-1.30.0/qetharp/Makefile +--- s390-tools.orig/qetharp/Makefile ++++ s390-tools/qetharp/Makefile @@ -9,9 +9,9 @@ qetharp.o: qeth26.h qetharp.h qetharp: qetharp.o @@ -119,10 +119,10 @@ clean: rm -f qetharp *.o *~ core -Index: s390-tools-1.30.0/tape390/Makefile +Index: s390-tools/tape390/Makefile =================================================================== ---- s390-tools-1.30.0.orig/tape390/Makefile -+++ s390-tools-1.30.0/tape390/Makefile +--- s390-tools.orig/tape390/Makefile ++++ s390-tools/tape390/Makefile @@ -13,13 +13,11 @@ tape390_crypt.o: tape390_common.h tape390_crypt: tape390_crypt.o tape390_common.o @@ -142,10 +142,10 @@ clean: rm -f *.o *~ tape390_display tape390_crypt core -Index: s390-tools-1.30.0/vmconvert/Makefile +Index: s390-tools/vmconvert/Makefile =================================================================== ---- s390-tools-1.30.0.orig/vmconvert/Makefile -+++ s390-tools-1.30.0/vmconvert/Makefile +--- s390-tools.orig/vmconvert/Makefile ++++ s390-tools/vmconvert/Makefile @@ -15,9 +15,9 @@ vmconvert: main.o lkcd_dump.o vm_dump.o $(LINKXX) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ @@ -159,10 +159,10 @@ clean: rm -f *.o *~ vmconvert core -Index: s390-tools-1.30.0/vmcp/Makefile +Index: s390-tools/vmcp/Makefile =================================================================== ---- s390-tools-1.30.0.orig/vmcp/Makefile -+++ s390-tools-1.30.0/vmcp/Makefile +--- s390-tools.orig/vmcp/Makefile ++++ s390-tools/vmcp/Makefile @@ -9,9 +9,9 @@ vmcp.o: vmcp.c vmcp.h ../include/zt_comm vmcp: vmcp.o @@ -176,10 +176,10 @@ clean: rm -f *.o *~ vmcp core -Index: s390-tools-1.30.0/vmur/Makefile +Index: s390-tools/vmur/Makefile =================================================================== ---- s390-tools-1.30.0.orig/vmur/Makefile -+++ s390-tools-1.30.0/vmur/Makefile +--- s390-tools.orig/vmur/Makefile ++++ s390-tools/vmur/Makefile @@ -22,10 +22,9 @@ vmur: $(OBJS) $(LINKXX) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ @@ -194,10 +194,10 @@ clean: rm -f *.o *~ vmur -Index: s390-tools-1.30.0/zipl/src/Makefile +Index: s390-tools/zipl/src/Makefile =================================================================== ---- s390-tools-1.30.0.orig/zipl/src/Makefile -+++ s390-tools-1.30.0/zipl/src/Makefile +--- s390-tools.orig/zipl/src/Makefile ++++ s390-tools/zipl/src/Makefile @@ -28,9 +28,9 @@ chreipl_helper.%: zipl_helper.% ln -s $< $@ @@ -210,10 +210,10 @@ $(CP) --no-dereference $(chreipl_helpers) $(TOOLS_LIBDIR) clean: -Index: s390-tools-1.30.0/common.mak +Index: s390-tools/common.mak =================================================================== ---- s390-tools-1.30.0.orig/common.mak -+++ s390-tools-1.30.0/common.mak +--- s390-tools.orig/common.mak ++++ s390-tools/common.mak @@ -38,6 +38,7 @@ SED = $(call echocmd," SED SKIP = echo " SKIP $(call reldir) due to" @@ -222,6 +222,15 @@ CP = cp ifneq ("${V}","1") MAKEFLAGS += --quiet +@@ -74,7 +75,7 @@ then \ + fi + + # Support alternate install root +-INSTROOT = ++INSTROOT ?= $(DESTDIR) + USRSBINDIR = $(INSTROOT)/usr/sbin + USRBINDIR = $(INSTROOT)/usr/bin + BINDIR = $(INSTROOT)/sbin @@ -152,12 +153,9 @@ $(rootdir)/zipl/boot/data.o: make -C $(rootdir)/zipl/boot/ data.o @@ -237,10 +246,10 @@ done install_echo: -Index: s390-tools-1.30.0/man/Makefile +Index: s390-tools/man/Makefile =================================================================== ---- s390-tools-1.30.0.orig/man/Makefile -+++ s390-tools-1.30.0/man/Makefile +--- s390-tools.orig/man/Makefile ++++ s390-tools/man/Makefile @@ -9,7 +9,7 @@ clean: install: $(MANS) for man in $(MANS); do \ @@ -250,10 +259,10 @@ done pdf: $(MANS) -Index: s390-tools-1.30.0/osasnmpd/Makefile +Index: s390-tools/osasnmpd/Makefile =================================================================== ---- s390-tools-1.30.0.orig/osasnmpd/Makefile -+++ s390-tools-1.30.0/osasnmpd/Makefile +--- s390-tools.orig/osasnmpd/Makefile ++++ s390-tools/osasnmpd/Makefile @@ -6,9 +6,9 @@ all: osasnmpd osasnmpd: $(OBJS) @@ -267,10 +276,10 @@ clean: rm -f $(OBJS) osasnmpd core -Index: s390-tools-1.30.0/qethconf/Makefile +Index: s390-tools/qethconf/Makefile =================================================================== ---- s390-tools-1.30.0.orig/qethconf/Makefile -+++ s390-tools-1.30.0/qethconf/Makefile +--- s390-tools.orig/qethconf/Makefile ++++ s390-tools/qethconf/Makefile @@ -4,11 +4,10 @@ all: install: qethconf @@ -287,10 +296,10 @@ clean: -Index: s390-tools-1.30.0/scripts/Makefile +Index: s390-tools/scripts/Makefile =================================================================== ---- s390-tools-1.30.0.orig/scripts/Makefile -+++ s390-tools-1.30.0/scripts/Makefile +--- s390-tools.orig/scripts/Makefile ++++ s390-tools/scripts/Makefile @@ -6,19 +6,18 @@ MAN_PAGES = dbginfo.sh.1 zfcpdbf.1 all: @@ -313,10 +322,10 @@ $(MANDIR)/man1; \ done -Index: s390-tools-1.30.0/zconf/Makefile +Index: s390-tools/zconf/Makefile =================================================================== ---- s390-tools-1.30.0.orig/zconf/Makefile -+++ s390-tools-1.30.0/zconf/Makefile +--- s390-tools.orig/zconf/Makefile ++++ s390-tools/zconf/Makefile @@ -15,16 +15,14 @@ all: clean: @@ -354,10 +363,10 @@ done .PHONY: all install clean install-scripts install-manpages install-usrsbin-scripts -Index: s390-tools-1.30.0/tunedasd/src/Makefile +Index: s390-tools/tunedasd/src/Makefile =================================================================== ---- s390-tools-1.30.0.orig/tunedasd/src/Makefile -+++ s390-tools-1.30.0/tunedasd/src/Makefile +--- s390-tools.orig/tunedasd/src/Makefile ++++ s390-tools/tunedasd/src/Makefile @@ -11,8 +11,8 @@ $(objects): $(includes) tunedasd: $(objects) @@ -369,10 +378,10 @@ clean: rm -f *.o tunedasd -Index: s390-tools-1.30.0/tunedasd/man/Makefile +Index: s390-tools/tunedasd/man/Makefile =================================================================== ---- s390-tools-1.30.0.orig/tunedasd/man/Makefile -+++ s390-tools-1.30.0/tunedasd/man/Makefile +--- s390-tools.orig/tunedasd/man/Makefile ++++ s390-tools/tunedasd/man/Makefile @@ -4,8 +4,8 @@ include ../../common.mak all: @@ -384,10 +393,10 @@ clean: -Index: s390-tools-1.30.0/cpuplugd/Makefile +Index: s390-tools/cpuplugd/Makefile =================================================================== ---- s390-tools-1.30.0.orig/cpuplugd/Makefile -+++ s390-tools-1.30.0/cpuplugd/Makefile +--- s390-tools.orig/cpuplugd/Makefile ++++ s390-tools/cpuplugd/Makefile @@ -16,9 +16,9 @@ clean: rm -f cpuplugd $(OBJECTS) @@ -402,10 +411,10 @@ + $(INSTALL_DATA) man/cpuplugd.conf.5 $(MANDIR)/man5 .PHONY: all install clean -Index: s390-tools-1.30.0/zipl/man/Makefile +Index: s390-tools/zipl/man/Makefile =================================================================== ---- s390-tools-1.30.0.orig/zipl/man/Makefile -+++ s390-tools-1.30.0/zipl/man/Makefile +--- s390-tools.orig/zipl/man/Makefile ++++ s390-tools/zipl/man/Makefile @@ -4,9 +4,9 @@ include ../../common.mak all: @@ -420,10 +429,10 @@ + $(INSTALL_DATA) -c zipl.conf.5 $(MANDIR)/man5 clean: -Index: s390-tools-1.30.0/ipl_tools/Makefile +Index: s390-tools/ipl_tools/Makefile =================================================================== ---- s390-tools-1.30.0.orig/ipl_tools/Makefile -+++ s390-tools-1.30.0/ipl_tools/Makefile +--- s390-tools.orig/ipl_tools/Makefile ++++ s390-tools/ipl_tools/Makefile @@ -24,14 +24,14 @@ clean: rm -f *.o lsreipl chreipl chshut lsshut @@ -444,10 +453,10 @@ .PHONY: all install clean -Index: s390-tools-1.30.0/ziomon/Makefile +Index: s390-tools/ziomon/Makefile =================================================================== ---- s390-tools-1.30.0.orig/ziomon/Makefile -+++ s390-tools-1.30.0/ziomon/Makefile +--- s390-tools.orig/ziomon/Makefile ++++ s390-tools/ziomon/Makefile @@ -43,34 +43,31 @@ ziorep_utilization: ziorep_utilization.o install: all $(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \ @@ -496,10 +505,10 @@ $(MANDIR)/man8 uninstall: -Index: s390-tools-1.30.0/iucvterm/bin/Makefile +Index: s390-tools/iucvterm/bin/Makefile =================================================================== ---- s390-tools-1.30.0.orig/iucvterm/bin/Makefile -+++ s390-tools-1.30.0/iucvterm/bin/Makefile +--- s390-tools.orig/iucvterm/bin/Makefile ++++ s390-tools/iucvterm/bin/Makefile @@ -12,13 +12,9 @@ SCRIPTS = $(BIN_SCRIPTS) $(SBIN_SCRIPTS) all: check: @@ -517,10 +526,10 @@ ln -f -s chiucvallow $(USRSBINDIR)/lsiucvallow clean: -Index: s390-tools-1.30.0/iucvterm/doc/Makefile +Index: s390-tools/iucvterm/doc/Makefile =================================================================== ---- s390-tools-1.30.0.orig/iucvterm/doc/Makefile -+++ s390-tools-1.30.0/iucvterm/doc/Makefile +--- s390-tools.orig/iucvterm/doc/Makefile ++++ s390-tools/iucvterm/doc/Makefile @@ -13,7 +13,7 @@ install: install-man install-man: $(MANS) for man in $(MANS); do \ @@ -530,10 +539,10 @@ done clean: -Index: s390-tools-1.30.0/iucvterm/etc/Makefile +Index: s390-tools/iucvterm/etc/Makefile =================================================================== ---- s390-tools-1.30.0.orig/iucvterm/etc/Makefile -+++ s390-tools-1.30.0/iucvterm/etc/Makefile +--- s390-tools.orig/iucvterm/etc/Makefile ++++ s390-tools/iucvterm/etc/Makefile @@ -11,10 +11,8 @@ CONFIG_FILES = ts-shell.conf unrestricte all: check: @@ -547,10 +556,10 @@ clean: -rm -f *.o ts-shell.conf -Index: s390-tools-1.30.0/iucvterm/src/Makefile +Index: s390-tools/iucvterm/src/Makefile =================================================================== ---- s390-tools-1.30.0.orig/iucvterm/src/Makefile -+++ s390-tools-1.30.0/iucvterm/src/Makefile +--- s390-tools.orig/iucvterm/src/Makefile ++++ s390-tools/iucvterm/src/Makefile @@ -16,12 +16,8 @@ SYSTOOLS = ttyrun all: $(PROGRAMS) $(SYSTOOLS) check: @@ -566,10 +575,10 @@ clean: -rm -f *.o $(PROGRAMS) $(SYSTOOLS) -Index: s390-tools-1.30.0/zdump/Makefile +Index: s390-tools/zdump/Makefile =================================================================== ---- s390-tools-1.30.0.orig/zdump/Makefile -+++ s390-tools-1.30.0/zdump/Makefile +--- s390-tools.orig/zdump/Makefile ++++ s390-tools/zdump/Makefile @@ -64,9 +64,9 @@ $(OBJECTS): *.h Makefile zgetdump: $(OBJECTS) $(rootdir)/libutil/util_list.o $(rootdir)/libutil/util_part.o @@ -583,10 +592,10 @@ clean: rm -f *.o *~ zgetdump core.* -Index: s390-tools-1.30.0/zfcpdump/Makefile +Index: s390-tools/zfcpdump/Makefile =================================================================== ---- s390-tools-1.30.0.orig/zfcpdump/Makefile -+++ s390-tools-1.30.0/zfcpdump/Makefile +--- s390-tools.orig/zfcpdump/Makefile ++++ s390-tools/zfcpdump/Makefile @@ -18,7 +18,7 @@ $(ZFCPDUMP_PART_RD): cpioinit zfcpdump_p $(CPIOINIT) zfcpdump_part | gzip > $(ZFCPDUMP_PART_RD) @@ -596,10 +605,10 @@ clean: rm -f *.o *~ zfcpdump_part cpioinit $(ZFCPDUMP_PART_RD) -Index: s390-tools-1.30.0/hyptop/Makefile +Index: s390-tools/hyptop/Makefile =================================================================== ---- s390-tools-1.30.0.orig/hyptop/Makefile -+++ s390-tools-1.30.0/hyptop/Makefile +--- s390-tools.orig/hyptop/Makefile ++++ s390-tools/hyptop/Makefile @@ -35,8 +35,8 @@ $(OBJECTS): *.h Makefile hyptop: $(OBJECTS) $(rootdir)/libutil/util_list.o @@ -611,10 +620,10 @@ endif -Index: s390-tools-1.30.0/cmsfs-fuse/Makefile +Index: s390-tools/cmsfs-fuse/Makefile =================================================================== ---- s390-tools-1.30.0.orig/cmsfs-fuse/Makefile -+++ s390-tools-1.30.0/cmsfs-fuse/Makefile +--- s390-tools.orig/cmsfs-fuse/Makefile ++++ s390-tools/cmsfs-fuse/Makefile @@ -35,11 +35,11 @@ CONFIG_FILES = filetypes.conf cmsfs-fuse: $(OBJECTS) $(rootdir)/libutil/util_list.o diff -Nru s390-tools-1.32.0/debian/patches/series s390-tools-1.32.0/debian/patches/series --- s390-tools-1.32.0/debian/patches/series 2015-12-13 14:41:14.000000000 +0000 +++ s390-tools-1.32.0/debian/patches/series 2016-02-02 04:49:18.000000000 +0000 @@ -6,3 +6,6 @@ zipl-optional.patch disable.patch sg3-utils.patch +support-cflags.patch +fno-pie.patch +spelling.patch diff -Nru s390-tools-1.32.0/debian/patches/spelling.patch s390-tools-1.32.0/debian/patches/spelling.patch --- s390-tools-1.32.0/debian/patches/spelling.patch 1970-01-01 01:00:00.000000000 +0100 +++ s390-tools-1.32.0/debian/patches/spelling.patch 2016-02-02 04:52:26.000000000 +0000 @@ -0,0 +1,141 @@ +Description: Fix spelling mistakes. +Author: Dimitri John Ledkov <x...@ubuntu.com> + +Index: s390-tools-1.32.0/dasdinfo/dasdinfo.c +=================================================================== +--- s390-tools-1.32.0.orig/dasdinfo/dasdinfo.c ++++ s390-tools-1.32.0/dasdinfo/dasdinfo.c +@@ -275,7 +275,7 @@ static int dinfo_read_dasd_vlabel (char + data.dasd_info_version = 2; + else { + if (ioctl(f, BIODASDINFO, &data.dasd_info) != 0) { +- printf("Unable to figure out DASD informations.\n"); ++ printf("Unable to figure out DASD information.\n"); + goto error; + } + } +Index: s390-tools-1.32.0/ipl_tools/cmd_chreipl.c +=================================================================== +--- s390-tools-1.32.0.orig/ipl_tools/cmd_chreipl.c ++++ s390-tools-1.32.0/ipl_tools/cmd_chreipl.c +@@ -534,7 +534,7 @@ static void verify_write_access(const ch + + snprintf(fpath, sizeof(fpath), "/sys/firmware/%s", path); + if (access(fpath, W_OK) != 0) +- ERR_EXIT("System does not allow to set %s", attr); ++ ERR_EXIT("System does not allow one to set %s", attr); + } + + static void chreipl_ccw(void) +Index: s390-tools-1.32.0/vmur/vmur.cpp +=================================================================== +--- s390-tools-1.32.0.orig/vmur/vmur.cpp ++++ s390-tools-1.32.0/vmur/vmur.cpp +@@ -852,7 +852,7 @@ static void parse_opts_receive(struct vm + CHECK_SPEC_MAX(info->spool_class_specified, 1, "class"); + + if (info->stdout_specified && info->file_name_specified) +- ERR_EXIT("File name not allowed, when --stdout specifed!\n"); ++ ERR_EXIT("File name not allowed, when --stdout specified!\n"); + if (info->blocked_specified + info->text_specified + + info->convert_specified > 1) + ERR_EXIT("Conflicting options: -b, -t and -c are mutually " +Index: s390-tools-1.32.0/zdump/opts.c +=================================================================== +--- s390-tools-1.32.0.orig/zdump/opts.c ++++ s390-tools-1.32.0/zdump/opts.c +@@ -163,7 +163,7 @@ static void argv_fuse_set(char **argv, i + static void action_set(enum zg_action action) + { + if (g.opts.action_specified) +- ERR_EXIT("Please specifiy only one of the \"-i\", \"-d\", " ++ ERR_EXIT("Please specify only one of the \"-i\", \"-d\", " + "\"-m\" or \"-u\" option"); + g.opts.action = action; + g.opts.action_specified = 1; +@@ -179,7 +179,7 @@ static void verify_opts(void) + g.opts.action != ZG_ACTION_STDOUT && + g.opts.action != ZG_ACTION_DUMP_INFO) + ERR_EXIT("The \"--select\" option can only be " +- "specifed for info, mount, or copy"); ++ "specified for info, mount, or copy"); + } + if (!g.opts.fmt_specified) + return; +Index: s390-tools-1.32.0/cmsfs-fuse/cmsfs-fuse.1 +=================================================================== +--- s390-tools-1.32.0.orig/cmsfs-fuse/cmsfs-fuse.1 ++++ s390-tools-1.32.0/cmsfs-fuse/cmsfs-fuse.1 +@@ -163,7 +163,7 @@ cmsfs-fuse uses a configuration file for + Upon startup, cmsfs-fuse evaluates the file .cmsfs-fuse/filetypes.conf in the user's home directory. If the file does not + exist cmsfs-fuse evaluates the file /etc/cmsfs-fuse/filetypes.conf. + +-The filetypes.conf file contains the CMS file types that are automaticaly translated to ASCII if cmsfs-fuse is started ++The filetypes.conf file contains the CMS file types that are automatically translated to ASCII if cmsfs-fuse is started + with the -t option. The syntax of the configuration file is one file type per line. Lines that start with a # followed by a space are treated as + comments and are ignored. The file type is 8 characters long and must consist of valid CMS file name characters only. + +Index: s390-tools-1.32.0/dasdinfo/dasdinfo.8 +=================================================================== +--- s390-tools-1.32.0.orig/dasdinfo/dasdinfo.8 ++++ s390-tools-1.32.0/dasdinfo/dasdinfo.8 +@@ -30,7 +30,7 @@ Print DASD uid + This option prints the full uid of the DASD. When z/VM provides two + virtual devices that are actually located on the same real device, the + first four tokens of the uid will be identical for both devices. z/VM +-may provide an additional token that allows to distinguish between ++may provide an additional token that allows one to distinguish between + different minidisks. You need both support in the Linux kernel and + z/VM to receive such an additional token. + +@@ -41,7 +41,7 @@ available by applying the PTFs for VM AP + .BI "-u|--uid" + Print DASD uid without z/VM minidisk token + +-z/VM may provide an additional token that allows to distinguish ++z/VM may provide an additional token that allows one to distinguish + between different minidisks (see --extended-uid option). To remain + compatibile with systems that were installed on older Linux or z/VM + levels, the -u option will print the uid excluding any z/VM-provided +Index: s390-tools-1.32.0/qethconf/qethconf.8 +=================================================================== +--- s390-tools-1.32.0.orig/qethconf/qethconf.8 ++++ s390-tools-1.32.0/qethconf/qethconf.8 +@@ -54,7 +54,7 @@ e.g. \-xc0a80a26 + .TP + \fIMASKBITS\fR + Number of bits set in the network mask. +-This allows to specify an address range, e.g. 192.168.10.0/24. ++This allows one to specify an address range, e.g. 192.168.10.0/24. + This subparameter is only valid for function IPA. + .TP + \fIINTERFACE\fR +Index: s390-tools-1.32.0/vmur/vmur.8 +=================================================================== +--- s390-tools-1.32.0.orig/vmur/vmur.8 ++++ s390-tools-1.32.0/vmur/vmur.8 +@@ -17,7 +17,7 @@ vmur \- Work with z/VM spool file queues + . + . + .SH DESCRIPTION +-The \*v program allows to read, create, list, purge, or order files ++The \*v program allows one to read, create, list, purge, or order files + on the z/VM spool files queues (RDR, PUN, and PRT). + + \*v supports the following commands: +Index: s390-tools-1.32.0/zipl/man/zipl.8 +=================================================================== +--- s390-tools-1.32.0.orig/zipl/man/zipl.8 ++++ s390-tools-1.32.0/zipl/man/zipl.8 +@@ -50,9 +50,9 @@ tool implements a boot menu which includ + .IP " -" + display a list of available configurations + .IP " -" +-allow to choose a configuration ++allows one to choose a configuration + .IP " -" +-allow to specify additional kernel command line parameters ++allows one to specify additional kernel command line parameters + .PP + + See the diff -Nru s390-tools-1.32.0/debian/patches/support-cflags.patch s390-tools-1.32.0/debian/patches/support-cflags.patch --- s390-tools-1.32.0/debian/patches/support-cflags.patch 1970-01-01 01:00:00.000000000 +0100 +++ s390-tools-1.32.0/debian/patches/support-cflags.patch 2016-02-02 02:11:52.000000000 +0000 @@ -0,0 +1,20 @@ +Index: s390-tools-1.32.0/common.mak +=================================================================== +--- s390-tools-1.32.0.orig/common.mak ++++ s390-tools-1.32.0/common.mak +@@ -100,11 +100,13 @@ ZFCPDUMP_PART_IMAGE = zfcpdump_part.imag + ZFCPDUMP_PART_RD = zfcpdump_part.rd + export ZFCPDUMP_DIR ZFCPDUMP_PART_IMAGE ZFCPDUMP_PART_RD + +-CFLAGS = $(WARNFLAGS) -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ ++CFLAGS ?= ++CFLAGS += $(WARNFLAGS) -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ + -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \ + -DS390_TOOLS_DATADIR=$(TOOLS_DATADIR) \ + -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) +-CXXFLAGS = $(WARNFLAGS) -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ ++CXXFLAGS ?= ++CXXFLAGS += $(WARNFLAGS) -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ + -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \ + -DS390_TOOLS_DATADIR=$(TOOLS_DATADIR) \ + -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) diff -Nru s390-tools-1.32.0/debian/rules s390-tools-1.32.0/debian/rules --- s390-tools-1.32.0/debian/rules 2013-05-04 21:23:28.000000000 +0100 +++ s390-tools-1.32.0/debian/rules 2016-02-02 04:31:17.000000000 +0000 @@ -1,86 +1,21 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS=hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk -SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p') -VERSION := $(shell dpkg-parsechangelog | perl -ne '/^Version:\s+(\S+)-[^-]+$$/ && print $$1;') +%: + dh $@ --parallel -BUILD_DIR = debian/build -STAMPS_DIR = debian/stamps +override_dh_install: + dh_install --list-missing -setup: $(STAMPS_DIR)/setup - -$(STAMPS_DIR)/setup: SOURCE_FILES = $(filter-out debian .svn .svk, $(wildcard * .[^.]*)) -$(STAMPS_DIR)/setup: DIR = $(BUILD_DIR)/build -$(STAMPS_DIR)/setup: - @[ -d $(STAMPS_DIR) ] || mkdir -p $(STAMPS_DIR) - dh_testdir - @rm -rf $(DIR) - QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2 - mkdir -p $(DIR) - cp -a $(SOURCE_FILES) $(DIR) - touch $@ - -build: $(STAMPS_DIR)/build - -$(STAMPS_DIR)/build: DIR = $(BUILD_DIR)/build -$(STAMPS_DIR)/build: $(STAMPS_DIR)/setup - dh_testdir - $(MAKE) -C $(DIR) - touch $@ - -clean: - dh_testdir - rm -rf $(BUILD_DIR) $(STAMPS_DIR) - dh_clean - -maintainerclean: - rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*)) - -install: DIR = $(BUILD_DIR)/build -install: INSTALL_DIR = $(BUILD_DIR)/install -install: $(STAMPS_DIR)/build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - $(MAKE) -C $(DIR) install INSTROOT=$(CURDIR)/$(INSTALL_DIR) - - dh_install --sourcedir=$(INSTALL_DIR) - -binary-indep: - -binary-arch: install - dh_testdir -a - dh_testroot -a - dh_installchangelogs -a - dh_installdocs -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_makeshlibs -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch - -DIR_ORIG = ../orig/$(SOURCE)-$(VERSION) -TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.bz2 -TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME))) - -orig: $(DIR_ORIG) - rsync --delete --exclude debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ . - -$(DIR_ORIG): -ifeq ($(TAR_ORIG),) - $(error Cannot find orig tarball $(TAR_ORIG_NAME)) -else - mkdir -p ../orig - tar -C ../orig -xjf $(TAR_ORIG) -endif +override_dh_auto_clean: + dh_auto_clean -- V=1 + +override_dh_auto_build: + dh_auto_build -- V=1 + +override_dh_auto_install: + dh_auto_install -- V=1 diff -Nru s390-tools-1.32.0/debian/s390-tools.install s390-tools-1.32.0/debian/s390-tools.install --- s390-tools-1.32.0/debian/s390-tools.install 2015-12-13 14:47:24.000000000 +0000 +++ s390-tools-1.32.0/debian/s390-tools.install 2016-02-02 00:29:12.000000000 +0000 @@ -107,11 +107,11 @@ /etc/cmsfs-fuse/filetypes.conf # kernel stuff -../../kernel/zz-zipl /etc/initramfs/post-update.d -../../kernel/zz-zipl /etc/kernel/postinst.d -../../kernel/zz-zipl /etc/kernel/postrm.d +debian/kernel/zz-zipl /etc/initramfs/post-update.d +debian/kernel/zz-zipl /etc/kernel/postinst.d +debian/kernel/zz-zipl /etc/kernel/postrm.d # udev rules -../../../etc/udev/rules.d/60-readahead.rules /lib/udev/rules.d -../../../etc/udev/rules.d/59-dasd.rules /lib/udev/rules.d -../../../etc/udev/rules.d/40-z90crypt.rules /lib/udev/rules.d +etc/udev/rules.d/60-readahead.rules /lib/udev/rules.d +etc/udev/rules.d/59-dasd.rules /lib/udev/rules.d +etc/udev/rules.d/40-z90crypt.rules /lib/udev/rules.d
