From 8adef2c8ed14d062e90511484342d2c71e0b798e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 1 Mar 2024 23:03:54 +0100 Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 s390-tools revision 202f1cad8bcdc4af12af3d49db07a747 --- read_values.c | 4 +- s390-tools-2.30.0.tar.gz | 3 -- s390-tools-2.31.0.tar.gz | 3 ++ ...p6-kdump-initrd-59-zfcp-compat-rules.patch | 24 ++++++++++ s390-tools.changes | 44 +++++++++++++++++++ s390-tools.spec | 14 ++++-- vendor.tar.gz | 4 +- 7 files changed, 85 insertions(+), 11 deletions(-) delete mode 100644 s390-tools-2.30.0.tar.gz create mode 100644 s390-tools-2.31.0.tar.gz create mode 100644 s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch diff --git a/read_values.c b/read_values.c index 6f5f663..6032de5 100644 --- a/read_values.c +++ b/read_values.c @@ -424,10 +424,8 @@ int print_uuid() return 1; } printf("-%s", result_string); - - result_string = NULL; } - printf("%s\n", result_string); + putchar('\n'); return 0; } /* print_uuid */ diff --git a/s390-tools-2.30.0.tar.gz b/s390-tools-2.30.0.tar.gz deleted file mode 100644 index 6d38667..0000000 --- a/s390-tools-2.30.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e565701cc6df4808243027706ee0a76c5fc0c7f9aae0afce1479fd4ff68bcdf -size 2007594 diff --git a/s390-tools-2.31.0.tar.gz b/s390-tools-2.31.0.tar.gz new file mode 100644 index 0000000..78873cf --- /dev/null +++ b/s390-tools-2.31.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83550c05f4fdb631376ad980df058de84292a9e5fbbce631ba3de5749c4f1c5e +size 2059068 diff --git a/s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch b/s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch new file mode 100644 index 0000000..95dd2ed --- /dev/null +++ b/s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch @@ -0,0 +1,24 @@ +From: Jiri Bohac +References: bsc#1219471 +Subject: include 59-zfcp-compat.rules in kdump initrd + +kdump uses a random one of the by-path symlinks to refer to the target +partition. + +With 59-zfcp-compat.rules added to the SUSE package, symlinks in the form +/dev/disk/by-path/ccw-*.*.*-zfcp-*:*-part* are created. If kdump uses this symlink when generating +the kdump initrd it will fail on boot beacause the udev rule is missing in the kdump initrd +and the symlink not created in the kdump environment. + +Fix this by including 59-zfcp-compat.rules in the kdump initrd. + +--- a/zdev/dracut/95zdev-kdump/module-setup.sh 2024-02-21 15:57:33.027658387 +0100 ++++ b/zdev/dracut/95zdev-kdump/module-setup.sh 2024-02-21 15:57:38.215675799 +0100 +@@ -78,6 +78,7 @@ + inst_multiple /lib/s390-tools/zdev-from-dasd_mod.dasd + + inst_rules "59-dasd.rules" ++ inst_rules "59-zfcp-compat.rules" + + # Obtain kdump target device configuration + diff --git a/s390-tools.changes b/s390-tools.changes index e93d5cc..d87967a 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Wed Feb 21 17:02:55 UTC 2024 - Nikolay Gueorguiev + +- Applied a patch for kdump initrd (bsc#1219471) + * s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch + +------------------------------------------------------------------- +Wed Feb 21 11:12:33 CET 2024 - ro@suse.de + +- Provide groups as required by RPM 4.19 + +------------------------------------------------------------------- +Wed Feb 7 07:55:51 UTC 2024 - Nikolay Gueorguiev + +- Upgrade s390-tools to version 2.31 (jsc#PED-3275, jsc#PED-3223) +- General: + * common.mak: Set default C/C++ standard to gnu11/gnu++11 +- Add new tools / libraries: + * pvapconfig: Tool to automatically configure APQNs in SE KVM guests + * s390-tools: Provide pre-commit configuration +- Changes of existing tools: + * cpuplugd: Adjust to CPU 0 being no longer hotpluggable + * dbginfo.sh: Check for Dynamic Partition Mode + * dbginfo.sh: Update man page and copyright + * rust/pv: Add user-data signing and verifying + * rust/pvsecret: Add user defined signatures and verifications + * zdev/dracut: Consolidate device configuration +- Bug Fixes: + * dbginfo.sh: Fix relative path on script copy + * libkmipclient: Fix build with libxml2-2.12.0 + * pvsecret: Fix panic if empty file is used as host key document + * rust/pv: Fix 'elided_lifetimes_in_associated_constant' warning + +------------------------------------------------------------------- +Thu Feb 1 08:31:08 UTC 2024 - Nikolay Gueorguiev + +- Updated read_values.c (bsc#1219227) + +------------------------------------------------------------------- +Wed Jan 24 14:27:00 UTC 2024 - Nikolay Gueorguiev + +- Updated the .spec file + * Explicitly specified 'ExclusiveArch: s390x x86_64' + ------------------------------------------------------------------- Sun Dec 17 05:48:56 UTC 2023 - Nikolay Gueorguiev diff --git a/s390-tools.spec b/s390-tools.spec index 6e65077..da3df60 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -1,7 +1,7 @@ # # spec file for package s390-tools # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 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.30.0 +Version: 2.31.0 Release: 0 Summary: S/390 tools like zipl and dasdfmt License: MIT @@ -152,6 +152,7 @@ Patch909: s390-tools-sles12-fdasd-skip-partition-check-and-BLKRRPART-ioctl Patch910: s390-tools-sles15sp1-11-zdev-Do-not-call-zipl-on-initrd-update.patch Patch911: s390-tools-sles15sp5-remove-no-pie-link-arguments.patch Patch912: s390-tools-ALP-zdev-live.patch +Patch913: s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch ### BuildRequires: curl-devel @@ -198,7 +199,10 @@ Requires(post): permissions Requires(pre): shadow Recommends: blktrace Provides: s390utils:/sbin/dasdfmt -### ExclusiveArch: s390x x86_64 +Provides: group(cpacfstats) +Provides: group(ts-shell) +Provides: group(zkeyadm) +ExclusiveArch: s390x x86_64 %description This package contains the tools needed to use Linux on IBM z Systems @@ -700,6 +704,10 @@ done %exclude %{_mandir}/man1/zdsfs.1.gz %exclude %{_mandir}/man1/hmcdrvfs.1.gz %exclude %{_mandir}/man8/lshmc.8.gz +### +%dir /etc/mdevctl.d/scripts.d/ +%dir /etc/mdevctl.d/scripts.d/callouts/ +### %files -n osasnmpd -f %{_builddir}/%{name}.osasnmp %{_libexecdir}/net-snmp/agents/osasnmpd diff --git a/vendor.tar.gz b/vendor.tar.gz index 12324ac..2e69bec 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2a48140a8f2bf37d79e054c24763831b488bebc6a7ff91abb50d1b87354cc02 -size 39766421 +oid sha256:9ec5f811538c55052a6167b51fa11da135ae2f84db0b927b2a1c2e447ded3fe1 +size 39176578