From 11918532809793dc61bdbd6df2b6fa215eb5e747237c282ea34a9fe3d1cffa2d Mon Sep 17 00:00:00 2001 From: Nikolay Gueorguiev Date: Tue, 8 Aug 2023 09:15:57 +0000 Subject: [PATCH] Accepting request 1102845 from home:ngueorguiev:branches:Base:System - Upgrade to version 2.29.0 (jsc#PED-3275) * s390-tools now supports tools written in Rust. * Add compdb Makefile target to create 'compile_commands.json' to support LSP backends in IDEs and editors - Add new tools / libraries: * rust/pv: Library for pv tools written in rust * rust/pvsecret: Tool to manage UV-secrets - Changes of existing tools: * dbginfo.sh: Global IFS variable * genprotimg: Add support for add-secret requests * genprotimg: Build debuginfo files for bootloader * hyptop: Add real SMT utilization field * hyptop: Allow users to set speedup factor * pvattest: Add yaml-output for verify command * zipl: Build debuginfo files for bootloader - Bug Fixes: * dump2tar: Fix truncated paths * zdev/dracut: fix kdump build to integrate with site support - Amended .spec for version 2.29.0, including Rust integration OBS-URL: https://build.opensuse.org/request/show/1102845 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=176 --- cargo_config | 5 +++++ s390-tools-2.27.0.tar.gz | 3 --- s390-tools-2.29.0.tar.gz | 3 +++ s390-tools.changes | 23 +++++++++++++++++++++++ s390-tools.spec | 31 ++++++++++++++++++++++++++++++- vendor.tar.gz | 3 +++ 6 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 cargo_config delete mode 100644 s390-tools-2.27.0.tar.gz create mode 100644 s390-tools-2.29.0.tar.gz create mode 100644 vendor.tar.gz diff --git a/cargo_config b/cargo_config new file mode 100644 index 0000000..f0c3455 --- /dev/null +++ b/cargo_config @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor/" diff --git a/s390-tools-2.27.0.tar.gz b/s390-tools-2.27.0.tar.gz deleted file mode 100644 index ce73dcb..0000000 --- a/s390-tools-2.27.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4315e64cf2fe0240ff9bd9929501db731d5bf3e7acf964ecf323d48d90e08f6e -size 1848002 diff --git a/s390-tools-2.29.0.tar.gz b/s390-tools-2.29.0.tar.gz new file mode 100644 index 0000000..95d81d9 --- /dev/null +++ b/s390-tools-2.29.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:849ff400dc6c1eb7eebe4aa3e7a4871721c25bcee6cfdd0535a056a038fd3ab0 +size 1950182 diff --git a/s390-tools.changes b/s390-tools.changes index 8c7869a..38b56c0 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Tue Aug 8 08:00:14 UTC 2023 - Nikolay Gueorguiev + +- Upgrade to version 2.29.0 (jsc#PED-3275) + * s390-tools now supports tools written in Rust. + * Add compdb Makefile target to create 'compile_commands.json' to support LSP + backends in IDEs and editors +- Add new tools / libraries: + * rust/pv: Library for pv tools written in rust + * rust/pvsecret: Tool to manage UV-secrets +- Changes of existing tools: + * dbginfo.sh: Global IFS variable + * genprotimg: Add support for add-secret requests + * genprotimg: Build debuginfo files for bootloader + * hyptop: Add real SMT utilization field + * hyptop: Allow users to set speedup factor + * pvattest: Add yaml-output for verify command + * zipl: Build debuginfo files for bootloader +- Bug Fixes: + * dump2tar: Fix truncated paths + * zdev/dracut: fix kdump build to integrate with site support +- Amended .spec for version 2.29.0, including Rust integration + ------------------------------------------------------------------- Wed Jun 14 11:24:27 UTC 2023 - Nikolay Gueorguiev diff --git a/s390-tools.spec b/s390-tools.spec index a6c3459..08dd2ee 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -33,7 +33,7 @@ %endif Name: s390-tools -Version: 2.27.0 +Version: 2.29.0 Release: 0 Summary: S/390 tools like zipl and dasdfmt License: MIT @@ -127,6 +127,9 @@ Source97: qeth_configure.8 Source98: zfcp_disk_configure.8 Source99: zfcp_host_configure.8 ### +Source200: cargo_config +Source201: vendor.tar.gz +### # IBM patches ### @@ -171,6 +174,12 @@ BuildRequires: qclib-devel-static BuildRequires: systemd-devel BuildRequires: tcpd-devel BuildRequires: zlib-devel-static +### Cargo +BuildRequires: rust +BuildRequires: cargo +BuildRequires: cargo-packaging +BuildRequires: openssl +### # Don't build with pie to avoid problems with zipl #!BuildIgnore: gcc-PIE Requires: coreutils @@ -308,10 +317,26 @@ operational path. %prep %autosetup -p1 +### +install -D -m 0644 %{SOURCE200} .cargo/config + +cat << EOF >> .cargo/config +# +[install] +root = "%{buildroot}%{_prefix}" +EOF +### +# cp -vi %{SOURCE22} CAUTION +# +# +tar -xzvf %{SOURCE201} +# %build +# +# # The "DISTRELEASE=%%{release}" needs to be on both the make and make install # commands, since make install runs sed commands against various scripts to # modify the "-v" output appropriately. @@ -322,10 +347,13 @@ export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}" ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \ DISTRELEASE=%{release} \ UDEVRUNDIR=/run/udev \ + HAVE_CARGO=1 \ HAVE_DRACUT=1 gcc -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc %install + +# mkdir -p %{buildroot}/boot/zipl mkdir -p %{buildroot}%{_sysconfdir}/zkey/repository %make_install \ @@ -333,6 +361,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/zkey/repository DISTRELEASE=%{release} \ SYSTEMDSYSTEMUNITDIR=%{_unitdir} \ UDEVRUNDIR=/run/udev \ + HAVE_CARGO=1 \ HAVE_DRACUT=1 # The make install command puts things in /etc/sysconfig and not the diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..bbee4a6 --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3785e684d4679bd14b823fe5fedd610f5414bdc5a9d57cb4ee6c96528359a5d8 +size 49566072