From 87214df91a3e5209f3c10dc42f635f47f71aaf11 Mon Sep 17 00:00:00 2001 From: Tuan Hoang Date: Thu, 21 Mar 2019 11:08:53 +0100 Subject: main/s390-tools: upgrade to 2.8.0 1.38.0 starts introducing GNU argz functions in libutil, zconf, zkey. Since those argz functions are fairly simple, we now pack them with s390-tools package. The only sub program is missing is cpuplugd due to missing feenableexcept functions. Add new dev packages for building zkey. Remove zipl pie patch since building zipl with pie is built-in. Update license, maintainer, description, repository (version 2.0.0 is a relicensed of 1.39.0 without any changes). --- .../0300-disable-program-using-gnu-ext.patch | 32 ++-------------------- 1 file changed, 2 insertions(+), 30 deletions(-) (limited to 'main/s390-tools/0300-disable-program-using-gnu-ext.patch') diff --git a/main/s390-tools/0300-disable-program-using-gnu-ext.patch b/main/s390-tools/0300-disable-program-using-gnu-ext.patch index fcb92a088a..7688130757 100644 --- a/main/s390-tools/0300-disable-program-using-gnu-ext.patch +++ b/main/s390-tools/0300-disable-program-using-gnu-ext.patch @@ -1,4 +1,3 @@ -zconf/zcrypt : argz functions cpuplugd : feenableexcept function diff --git a/Makefile b/Makefile @@ -6,38 +5,11 @@ index a760c0f..7fe2694 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ include common.mak - LIB_DIRS = libvtoc libu2s libutil libzds libdasd libvmdump + LIB_DIRS = libvtoc libu2s libutil libzds libdasd libvmdump libccw libvmcp TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \ tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \ - vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \ + vmconvert vmcp man mon_tools dasdinfo vmur ipl_tools \ ziomon iucvterm hyptop cmsfs-fuse qethqoat zfcpdump zdsfs cpumf \ - systemd hmcdrvfs cpacfstats zdev dump2tar + systemd hmcdrvfs cpacfstats zdev dump2tar zkey netboot etc zpcictl SUB_DIRS = $(LIB_DIRS) $(TOOL_DIRS) -diff --git a/scripts/Makefile b/scripts/Makefile -index 94cd6e0..e2c8091 100644 ---- a/scripts/Makefile -+++ b/scripts/Makefile -@@ -1,7 +1,7 @@ - include ../common.mak - --SCRIPTS = dbginfo.sh zfcpdbf scsi_logging_level --MAN_PAGES = dbginfo.sh.1 zfcpdbf.1 -+SCRIPTS = zfcpdbf scsi_logging_level -+MAN_PAGES = zfcpdbf.1 - - all: - -diff --git a/zconf/Makefile b/zconf/Makefile -index 0877c8c..e376104 100644 ---- a/zconf/Makefile -+++ b/zconf/Makefile -@@ -9,7 +9,7 @@ USRSBIN_SCRIPTS = lsmem chmem lsluns - MANPAGES= lsdasd.8 lstape.8 lscss.8 chccwdev.8 lsqeth.8 lszfcp.8 lsluns.8 \ - cio_ignore.8 znetconf.8 chmem.8 lsmem.8 dasdstat.8 - --SUB_DIRS = zcrypt scm chp -+SUB_DIRS = - - all: $(SUB_DIRS) - -- cgit v1.2.3