Accepting request 1042407 from home:ngueorguiev:branches:Base:System
- Updated to version 2.25.0 (jsc#PED-627) * __v2.25.0 (2022-12-12)__ For Linux kernel version: 6.1 Changes of existing tools: - ap_tools: Use new mdevctl installation location - lsdasd/tunedasd/zdev: Add support to handle copy pair relations presented by the DASD driver - zdev: Add --shell command line switch to generate output suitable for shell environments - zipl: Add List-Directed IPL from ECKD DASD to support secure boot Bug Fixes: - ipl_tools: Fix chreipl node for NVMes with CONFIG_NVME_MULTIPATH - libdasd: Fix bug that prevented positive ioctl return codes - Updated s390-tools-sles15sp5-fix-chown-commands-syntax.patch to fit the current version - Removed obsolete Patch002, and Patch003 # Patch002: s390-tools-sles15sp5-util_lockfile-fix-includes.patch # Patch003: s390-tools-sles15sp5-ap_tools-ap-check-use-new-mdevctl-install-location.patch OBS-URL: https://build.opensuse.org/request/show/1042407 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=141
This commit is contained in:
Mark Post
Git OBS Bridge
parent
cab6866186
commit
f1cde68d53
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:af5268147f725a9a9ec54df8fe1b2e3e4e8d256199d542456f0b2275e560d005
|
||||
size 1840869
|
||||
BIN
s390-tools-2.25.0.tar.gz
(Stored with Git LFS)
Normal file
BIN
s390-tools-2.25.0.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -19,7 +19,7 @@ diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
|
||||
index 4503d3e..f04dc3d 100644
|
||||
--- a/fdasd/fdasd.c
|
||||
+++ b/fdasd/fdasd.c
|
||||
@@ -1229,10 +1229,12 @@
|
||||
@@ -1231,10 +1231,12 @@
|
||||
*/
|
||||
static void fdasd_reread_partition_table(fdasd_anchor_t *anc)
|
||||
{
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
From 4b5937f142c7381e8cdad3ea3f55a4931a862488 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Rosato <mjrosato@linux.ibm.com>
|
||||
Date: Tue, 15 Nov 2022 12:40:35 -0500
|
||||
Subject: [PATCH] ap_tools/ap-check: use new mdevctl install location
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
mdevctl has been updated to use /usr/lib/mdevctl/scripts.d/callouts/
|
||||
instead of /etc/mdevctl.d/scripts.d/callouts/. The /etc location
|
||||
is considered deprecated, meaning mdevctl will also look at that
|
||||
location for now but might eventually stop looking in /etc for
|
||||
callout scripts.
|
||||
Based on that, update the installation location for the ap-check
|
||||
callout. However, because older versions of mdevctl will still
|
||||
only look in /etc, let's also put a wrapper script in /etc for now
|
||||
to provide backward compatibility, and plan to remove it at a
|
||||
later time.
|
||||
|
||||
Link: https://github.com/mdevctl/mdevctl/commit/df6bb57429ba7425e8b7901b0580ed7e616b6c4f
|
||||
Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/139
|
||||
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
|
||||
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
|
||||
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
||||
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
|
||||
---
|
||||
ap_tools/Makefile | 20 +++++++++++++++++---
|
||||
ap_tools/ap-check.sh | 15 +++++++++++++++
|
||||
2 files changed, 32 insertions(+), 3 deletions(-)
|
||||
create mode 100644 ap_tools/ap-check.sh
|
||||
|
||||
diff --git a/ap_tools/Makefile b/ap_tools/Makefile
|
||||
index 77fe4c3..a79624a 100644
|
||||
--- a/ap_tools/Makefile
|
||||
+++ b/ap_tools/Makefile
|
||||
@@ -1,8 +1,11 @@
|
||||
include ../common.mak
|
||||
|
||||
-MDEVCTL_DIR = /etc/mdevctl.d/
|
||||
-MDEVCTL_SCRIPTS = /etc/mdevctl.d/scripts.d/
|
||||
-MDEVCTL_CALLOUTS = /etc/mdevctl.d/scripts.d/callouts/
|
||||
+MDEVCTL_DIR = /usr/lib/mdevctl/
|
||||
+MDEVCTL_SCRIPTS = /usr/lib/mdevctl/scripts.d/
|
||||
+MDEVCTL_CALLOUTS = /usr/lib/mdevctl/scripts.d/callouts/
|
||||
+MDEVCTL_DEP_DIR = /etc/mdevctl.d/
|
||||
+MDEVCTL_DEP_SCRIPTS = /etc/mdevctl.d/scripts.d/
|
||||
+MDEVCTL_DEP_CALLOUTS = /etc/mdevctl.d/scripts.d/callouts/
|
||||
|
||||
libs = $(rootdir)/libap/libap.a \
|
||||
$(rootdir)/libutil/libutil.a
|
||||
@@ -32,6 +35,17 @@ install: all
|
||||
fi; \
|
||||
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ap-check \
|
||||
$(DESTDIR)$(MDEVCTL_CALLOUTS)
|
||||
+ @if [ ! -d $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS) ]; then \
|
||||
+ mkdir -p $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS); \
|
||||
+ chown $(OWNER).$(GROUP) $(DESTDIR)$(MDEVCTL_DEP_DIR); \
|
||||
+ chown $(OWNER).$(GROUP) $(DESTDIR)$(MDEVCTL_DEP_SCRIPTS); \
|
||||
+ chown $(OWNER).$(GROUP) $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS); \
|
||||
+ chmod 755 $(DESTDIR)$(MDEVCTL_DEP_DIR); \
|
||||
+ chmod 755 $(DESTDIR)$(MDEVCTL_DEP_SCRIPTS); \
|
||||
+ chmod 755 $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS); \
|
||||
+ fi; \
|
||||
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ap-check.sh \
|
||||
+ $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS)
|
||||
endif
|
||||
|
||||
clean:
|
||||
diff --git a/ap_tools/ap-check.sh b/ap_tools/ap-check.sh
|
||||
new file mode 100644
|
||||
index 0000000..d8a4e77
|
||||
--- /dev/null
|
||||
+++ b/ap_tools/ap-check.sh
|
||||
@@ -0,0 +1,15 @@
|
||||
+#!/bin/sh
|
||||
+#
|
||||
+# ap-check.sh - Wrapper script for 'ap-check' binary
|
||||
+#
|
||||
+# mdevctl has deprecated the /etc/mdevctl.d/scripts.d/callouts/ location in
|
||||
+# newer releases. This wrapper ensures that mdevctl 1.2.0 and older can
|
||||
+# still access 'ap-check' for now, and will be removed at a later time.
|
||||
+#
|
||||
+# Copyright 2022 IBM Corp.
|
||||
+#
|
||||
+# s390-tools is free software; you can redistribute it and/or modify
|
||||
+# it under the terms of the MIT license. See LICENSE for details.
|
||||
+#
|
||||
+
|
||||
+[ -e /usr/lib/mdevctl/scripts.d/callouts/ap-check ] && /usr/lib/mdevctl/scripts.d/callouts/ap-check "$@"
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- s390-tools-2.24.0/ap_tools/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.24.0/ap_tools/Makefile 2022-12-01 15:33:30.953373912 -0500
|
||||
--- s390-tools-2.25.0/ap_tools/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.25.0/ap_tools/Makefile 2022-12-01 15:33:30.953373912 -0500
|
||||
@@ -26,9 +26,9 @@
|
||||
install: all
|
||||
@if [ ! -d $(DESTDIR)$(MDEVCTL_CALLOUTS) ]; then \
|
||||
@ -26,8 +26,8 @@
|
||||
chmod 755 $(DESTDIR)$(MDEVCTL_DEP_DIR); \
|
||||
chmod 755 $(DESTDIR)$(MDEVCTL_DEP_SCRIPTS); \
|
||||
chmod 755 $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS); \
|
||||
--- s390-tools-2.24.0/hmcdrvfs/Makefile2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.24.0/hmcdrvfs/Makefile 2022-12-01 15:33:42.825238489 -0500
|
||||
--- s390-tools-2.25.0/hmcdrvfs/Makefile2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.25.0/hmcdrvfs/Makefile 2022-12-01 15:33:42.825238489 -0500
|
||||
@@ -52,7 +52,7 @@
|
||||
cat $$i | \
|
||||
sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
|
||||
@ -37,8 +37,8 @@
|
||||
chmod 755 $(DESTDIR)$(USRSBINDIR)/$$i; \
|
||||
done
|
||||
|
||||
--- s390-tools-2.24.0/hsci/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.24.0/hsci/Makefile 2022-12-01 15:33:53.029122092 -0500
|
||||
--- s390-tools-2.25.0/hsci/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.25.0/hsci/Makefile 2022-12-01 15:33:53.029122092 -0500
|
||||
@@ -5,7 +5,7 @@
|
||||
install: hsci
|
||||
$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
|
||||
@ -48,8 +48,8 @@
|
||||
chmod 755 $(DESTDIR)$(BINDIR)/hsci; \
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8
|
||||
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 hsci.8 \
|
||||
--- s390-tools-2.24.0/ip_watcher/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.24.0/ip_watcher/Makefile 2022-12-01 15:34:09.116938576 -0500
|
||||
--- s390-tools-2.25.0/ip_watcher/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.25.0/ip_watcher/Makefile 2022-12-01 15:34:09.116938576 -0500
|
||||
@@ -12,7 +12,7 @@
|
||||
install: ip_watcher.pl xcec-bridge start_hsnc.sh
|
||||
$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
|
||||
@ -59,8 +59,8 @@
|
||||
chmod 755 $(DESTDIR)$(USRSBINDIR)/start_hsnc.sh; \
|
||||
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ip_watcher.pl \
|
||||
$(DESTDIR)$(USRSBINDIR)
|
||||
--- s390-tools-2.24.0/netboot/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.24.0/netboot/Makefile 2022-12-01 15:34:28.212720750 -0500
|
||||
--- s390-tools-2.25.0/netboot/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.25.0/netboot/Makefile 2022-12-01 15:34:28.212720750 -0500
|
||||
@@ -15,13 +15,13 @@
|
||||
install-scripts: $(SCRIPTS)
|
||||
@if [ ! -d $(DESTDIR)$(NETBOOT_SAMPLEDIR) ]; then \
|
||||
@ -77,8 +77,8 @@
|
||||
chmod 755 $(DESTDIR)$(NETBOOT_SAMPLEDIR)/$$i; \
|
||||
done
|
||||
|
||||
--- s390-tools-2.24.0/qethconf/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.24.0/qethconf/Makefile 2022-12-01 15:34:39.356593630 -0500
|
||||
--- s390-tools-2.25.0/qethconf/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.25.0/qethconf/Makefile 2022-12-01 15:34:39.356593630 -0500
|
||||
@@ -5,7 +5,7 @@
|
||||
install: qethconf
|
||||
$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
|
||||
@ -88,8 +88,8 @@
|
||||
chmod 755 $(DESTDIR)$(BINDIR)/qethconf; \
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8
|
||||
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 qethconf.8 \
|
||||
--- s390-tools-2.24.0/zconf/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.24.0/zconf/Makefile 2022-12-01 15:36:10.583552975 -0500
|
||||
--- s390-tools-2.25.0/zconf/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.25.0/zconf/Makefile 2022-12-01 15:36:10.583552975 -0500
|
||||
@@ -25,7 +25,7 @@
|
||||
cat $$i | \
|
||||
sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
|
||||
@ -118,26 +118,3 @@
|
||||
chmod 755 $(DESTDIR)$(MANDIR); \
|
||||
chmod 755 $(DESTDIR)$(MANDIR)/man8; \
|
||||
fi; \
|
||||
--- s390-tools-2.24.0/ziomon/Makefile 2022-11-09 11:11:48.000000000 -0500
|
||||
+++ s390-tools-2.24.0/ziomon/Makefile 2022-12-01 15:36:38.159238416 -0500
|
||||
@@ -43,17 +43,17 @@
|
||||
install: all
|
||||
$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
|
||||
< ziomon > $(DESTDIR)$(USRSBINDIR)/ziomon;
|
||||
- chown $(OWNER).$(GROUP) $(DESTDIR)$(USRSBINDIR)/ziomon;
|
||||
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(USRSBINDIR)/ziomon;
|
||||
chmod 755 $(DESTDIR)$(USRSBINDIR)/ziomon;
|
||||
$(SED) -e \
|
||||
's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
|
||||
< ziomon_fcpconf > $(DESTDIR)$(USRSBINDIR)/ziomon_fcpconf;
|
||||
- chown $(OWNER).$(GROUP) $(DESTDIR)$(USRSBINDIR)/ziomon_fcpconf;
|
||||
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(USRSBINDIR)/ziomon_fcpconf;
|
||||
chmod 755 $(DESTDIR)$(USRSBINDIR)/ziomon_fcpconf;
|
||||
$(SED) -e \
|
||||
's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
|
||||
< ziorep_config > $(DESTDIR)$(USRSBINDIR)/ziorep_config;
|
||||
- chown $(OWNER).$(GROUP) $(DESTDIR)$(USRSBINDIR)/ziorep_config;
|
||||
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(USRSBINDIR)/ziorep_config;
|
||||
chmod 755 $(DESTDIR)$(USRSBINDIR)/ziorep_config;
|
||||
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon.8 \
|
||||
$(DESTDIR)$(MANDIR)/man8
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 5e0056db8d7e8aaa252388fea0752071bd3667ec Mon Sep 17 00:00:00 2001
|
||||
From: Steffen Eiden <seiden@linux.ibm.com>
|
||||
Date: Wed, 30 Nov 2022 15:22:15 +0100
|
||||
Subject: [PATCH] util_lockfile: fix includes
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The 'unistd.h' header was missing. Under some circumstances the
|
||||
-D_GNU_SOURCE gcc flag does not trigger including that file.
|
||||
Therefore, explicitly include this file here.
|
||||
|
||||
Fixes: e1aec24e8436 ("libutil: introduce util_lockfile")
|
||||
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
|
||||
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
|
||||
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
|
||||
---
|
||||
libutil/util_lockfile.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libutil/util_lockfile.c b/libutil/util_lockfile.c
|
||||
index d657664..5440442 100644
|
||||
--- a/libutil/util_lockfile.c
|
||||
+++ b/libutil/util_lockfile.c
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <time.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
#include "lib/util_libc.h"
|
||||
#include "lib/util_lockfile.h"
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 12 15:05:48 UTC 2022 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
|
||||
|
||||
- Updated to version 2.25.0 (jsc#PED-627)
|
||||
* __v2.25.0 (2022-12-12)__
|
||||
|
||||
For Linux kernel version: 6.1
|
||||
|
||||
Changes of existing tools:
|
||||
- ap_tools: Use new mdevctl installation location
|
||||
- lsdasd/tunedasd/zdev: Add support to handle copy pair relations presented by the DASD driver
|
||||
- zdev: Add --shell command line switch to generate output suitable for shell environments
|
||||
- zipl: Add List-Directed IPL from ECKD DASD to support secure boot
|
||||
|
||||
Bug Fixes:
|
||||
- ipl_tools: Fix chreipl node for NVMes with CONFIG_NVME_MULTIPATH
|
||||
- libdasd: Fix bug that prevented positive ioctl return codes
|
||||
|
||||
- Updated s390-tools-sles15sp5-fix-chown-commands-syntax.patch to fit the current version
|
||||
|
||||
- Removed obsolete Patch002, and Patch003
|
||||
# Patch002: s390-tools-sles15sp5-util_lockfile-fix-includes.patch
|
||||
# Patch003: s390-tools-sles15sp5-ap_tools-ap-check-use-new-mdevctl-install-location.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 6 19:39:22 UTC 2022 - Mark Post <mpost@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package s390-tools
|
||||
#
|
||||
# Copyright (c) 2001-2022 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -33,7 +33,7 @@
|
||||
%endif
|
||||
|
||||
Name: s390-tools
|
||||
Version: 2.24.0
|
||||
Version: 2.25.0
|
||||
Release: 0
|
||||
Summary: S/390 tools like zipl and dasdfmt
|
||||
License: MIT
|
||||
@ -130,8 +130,6 @@ Source99: zfcp_host_configure.8
|
||||
|
||||
# IBM patches
|
||||
Patch001: s390-tools-sles15sp5-zipl-boot-disable-Warray-bounds-for-now.patch
|
||||
Patch002: s390-tools-sles15sp5-util_lockfile-fix-includes.patch
|
||||
Patch003: s390-tools-sles15sp5-ap_tools-ap-check-use-new-mdevctl-install-location.patch
|
||||
# SUSE patches
|
||||
Patch900: s390-tools-sles12-zipl_boot_msg.patch
|
||||
Patch901: s390-tools-sles15-sysconfig-compatible-dumpconf.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user