main/s390-tools: update to current development

zipl: update new syntax for kernel parm
zconf: only disable zcrypt
trigger: let user decide to update zipl conf

4 files changed, 43 insertions, 37 deletions

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 56766f6cb2..fcb92a088a 100644
--- a/main/s390-tools/0300-disable-program-using-gnu-ext.patch
+++ b/main/s390-tools/0300-disable-program-using-gnu-ext.patch
@@ -1,18 +1,43 @@
-zconf : argz.h functions
-cpuplugd : feenableexcept function 
+zconf/zcrypt : argz functions
+cpuplugd : feenableexcept function
 
 diff --git a/Makefile b/Makefile
-index a760c0f..203e7ed 100644
+index a760c0f..7fe2694 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -5,8 +5,8 @@ include common.mak
- 
+@@ -6,7 +6,7 @@ include common.mak
  LIB_DIRS = libvtoc libu2s libutil libzds libdasd libvmdump
  TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \
--	   tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \
+ 	   tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \
 -	   vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
-+	   tape390 osasnmpd qetharp ip_watcher qethconf scripts \
 +	   vmconvert vmcp man mon_tools dasdinfo vmur ipl_tools \
  	   ziomon iucvterm hyptop cmsfs-fuse qethqoat zfcpdump zdsfs cpumf \
  	   systemd hmcdrvfs cpacfstats zdev dump2tar
  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)
+ 
diff --git a/main/s390-tools/APKBUILD b/main/s390-tools/APKBUILD
index 612d3b8936..15ba7d8e86 100644
--- a/main/s390-tools/APKBUILD
+++ b/main/s390-tools/APKBUILD
@@ -2,12 +2,11 @@
 # Maintainer: Tuan M. Hoang <tmhoang@flatglobe.org>
 pkgname=s390-tools
 pkgver=1.37.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Utilities for Linux on IBM z Systems"
 url="http://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
 arch="s390x"
 license="GPL-2.0-or-later"
-depends="linux-vanilla mkinitfs"
 depends_dev=""
 makedepends="$depends_dev linux-headers libexecinfo-dev zlib-dev fuse-dev ncurses-dev"
 triggers="$pkgname.trigger=/boot"
@@ -63,5 +62,5 @@ d4d707aadf095f48dd3ae79f60d17194e479d8a6ca08c6b6d64582e6d09b33d7d065a7349cc7fe61
 d879173250fc0cabef198785923248e6832158e38d6ea9ef615f14e2d6698810b54c38c8327f20b2c43d8d509a274b27a7c0ad999a0c0bed2743715f21ab859a  0100-zipl-no-pie.patch
 1cbbe3fe265c7d4164143d24c532c18b354be4bc295ad24064d379660e43a475b7d678b458cdf74ffdb44d6cd38a497dbe00758d688c547c6ece63b6dee091b7  0101-zipl-dont-optimize-size.patch
 4ce15b615ff08e5c0a23d3c3b19d1e9d6362239fb731e67fa68e6cd108cfdeaaf16186c5416cc211082aa60c4d1946b930b9ea4c300458da98e9a701feed99c3  0200-dasdinfo-gnu-ext-hack.patch
-9ce268721f4648305b0fc81225c0f8b1dc4b0b79a11631d661b236bcee799accadd7581e60258d4c026e7d2e25fadcae0da69560e48e6c92e074308b9b49b5c2  0300-disable-program-using-gnu-ext.patch
-a805dff7898f05cb2fb6059624bbe55ed5399fc82068bfa2c592245c0d09991eccc8664cc0325302f29e954edd2ff913e8131bb3c7114050667ad6466503e86d  s390-tools-script"
+6736ca9deb25838511e715e96d1f5bfc283460689e767181463d1827c80be200b1375708ff48772599083b14f74594f7053cf30fcc6c93ba7fa5dfae832434de  0300-disable-program-using-gnu-ext.patch
+f141dfaf74f072f2f314aa7983f3e9ab878527cb77d1356d4f71371020c7c123491b60f585c5a9d83cd6a6d6c864abd828e47afb48f164d018818f0bc3b94b9a  s390-tools-script"
diff --git a/main/s390-tools/s390-tools-script b/main/s390-tools/s390-tools-script
index d76a094162..1e5eb16d69 100755
--- a/main/s390-tools/s390-tools-script
+++ b/main/s390-tools/s390-tools-script
@@ -2,26 +2,6 @@
 
 [ "$#" -lt 1 ] && exit 0
 
-# copied from alpine-conf/setup-disk.in
-_blkid() {
-	blkid | grep "^$1:"
-}
-uuid_or_device() {
-	local i=
-	case "$1" in
-		/dev/md*) echo "$1" && return 0;;
-	esac
-	for i in $(_blkid "$1"); do
-		case "$i" in
-			UUID=*) eval $i;;
-		esac
-	done
-	if [ -n "$UUID" ]; then
-		echo "UUID=$UUID"
-	else
-		echo "$1"
-	fi
-}
 find_mount_dev() {
 	local mnt="$1"
 	awk "\$2 == \"$mnt\" { print \$1 }" /proc/mounts | tail -n 1
@@ -32,8 +12,11 @@ zipl_gen_conf() {
 	RAMDISK_FLAVOR="-vanilla"
 	
 	rootdev=$(find_mount_dev "/")
-	root_uuid=$(uuid_or_device $rootdev)
-	[ -n "$root_uuid" ] && root_parm="root=$root_uuid"
+	root_parm="root=$rootdev"
+	_tmpfile="$(mktemp)"
+	cat /proc/cmdline | tr A-Z a-z | xargs -n 1 | grep '=' > "$_tmpfile"
+	. "$_tmpfile" > /dev/null 2>&1
+	rm "$_tmpfile"
 
 	cat > /etc/zipl.conf <<- EOF
 	[defaultboot]
@@ -43,9 +26,9 @@ zipl_gen_conf() {
 	default=linux
 	target=/boot
 	[linux]
-		image=/boot/vmlinuz$KERNEL_FLAVOR
-		ramdisk=/boot/initramfs$RAMDISK_FLAVOR
-		parameters="$root_parm rd.md=0 rd.dm=0 rd.luks=0 KEYTABLE=us LANG=en_US.UTF-8"
+	image=/boot/vmlinuz$KERNEL_FLAVOR
+	ramdisk=/boot/initramfs$RAMDISK_FLAVOR
+	parameters="$root_parm dasd=$dasd net_type=$net_type"
 	EOF
 }
 
diff --git a/main/s390-tools/s390-tools.post-install b/main/s390-tools/s390-tools.post-install
index 5c42deb530..829303ea5b 100644
--- a/main/s390-tools/s390-tools.post-install
+++ b/main/s390-tools/s390-tools.post-install
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-/sbin/s390-tools-script zipl_gen_conf