From 6e6243123dd4ec573393744a4d4dca9f36d05ee316111b2835f28cf3508a1d84 Mon Sep 17 00:00:00 2001 From: Nikolay Gueorguiev Date: Fri, 12 Apr 2024 16:00:17 +0000 Subject: [PATCH] Accepting request 1167136 from home:ngueorguiev:branches:Base:System - Updated the .spec file to enable Secure Execution in the Cloud (bsc#1222675) * Creates a s390-tools-genprotimg-data-*.noarch.rpm package which includes s390x bootload binaries for x86_64: - /lib/s390-tools/stage3.bin - /usr/share/s390-tools/genprotimg/stage3a.bin - /usr/share/s390-tools/genprotimg/stage3b_reloc.bin * Excludes the above binaries from the (main) s390-tools-*.s390x.rpm * Requires: s390-tools-genprotimg-data - SE-tooling: New IBM host-key subject locality (s390-tools) (bsc#1222282) * s390-tools-sles15sp5-01-rust-pv-support-Armonk-in-IBM-signing-key-subject.patch * s390-tools-sles15sp6-02-genprotimg-support-Armonk-in-IBM-signing-key-subject.patch * s390-tools-sles15sp6-03-libpv-support-Armonk-in-IBM-signing-key-subject.patch * s390-tools-sles15sp6-04-pvattest-Fix-root-ca-parsing.patch - Apllied a patch(bsc#1220949,bsc#1221873) * s390-tools-sles15sp6-01-parse-ipl-device-for-activation.patch - Applied a patch (bsc#1221072) * s390-tools-sles15sp6-genprotimg-makefile.patch OBS-URL: https://build.opensuse.org/request/show/1167136 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=206 --- s390-tools.changes | 10 ++++++---- s390-tools.spec | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/s390-tools.changes b/s390-tools.changes index e679b77..9f44bf8 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,12 +1,14 @@ ------------------------------------------------------------------- -Fri Apr 12 08:59:53 UTC 2024 - Nikolay Gueorguiev +Fri Apr 12 15:28:09 UTC 2024 - Nikolay Gueorguiev - Updated the .spec file to enable Secure Execution in the Cloud (bsc#1222675) * Creates a s390-tools-genprotimg-data-*.noarch.rpm package which includes s390x bootload binaries for x86_64: - - stage3a.bin and - - stage3b_reloc.bin - - plus check_hostkeydoc script + - /lib/s390-tools/stage3.bin + - /usr/share/s390-tools/genprotimg/stage3a.bin + - /usr/share/s390-tools/genprotimg/stage3b_reloc.bin + * Excludes the above binaries from the (main) s390-tools-*.s390x.rpm + * Requires: s390-tools-genprotimg-data ------------------------------------------------------------------- Thu Apr 4 03:51:55 UTC 2024 - Nikolay Gueorguiev diff --git a/s390-tools.spec b/s390-tools.spec index 86d628d..b50bd5b 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -196,6 +196,7 @@ BuildRequires: openssl #!BuildIgnore: gcc-PIE Requires: coreutils Requires: procps +Requires: s390-tools-genprotimg-data Requires: util-linux %ifarch s390x Requires: gawk @@ -342,8 +343,6 @@ Summary: Build of genprotimg for and on x86_64 machines License: MIT Group: System/Boot BuildArch: noarch -Conflicts: s390-tools -# ExpandFlags: ignoreconflicts %description genprotimg-data These tools (genprotimg) would allow to prepare and analyze boot images @@ -737,6 +736,10 @@ done %dir /etc/mdevctl.d/scripts.d/ %dir /etc/mdevctl.d/scripts.d/callouts/ ### +%exclude /lib/s390-tools/stage3.bin +%exclude %{_datadir}/s390-tools/genprotimg/stage3a.bin +%exclude %{_datadir}/s390-tools/genprotimg/stage3b_reloc.bin +### %files -n osasnmpd -f %{_builddir}/%{name}.osasnmp %{_libexecdir}/net-snmp/agents/osasnmpd @@ -785,7 +788,7 @@ done ### genprotimg %files genprotimg-data -%{_datadir}/s390-tools/genprotimg/check_hostkeydoc +/lib/s390-tools/stage3.bin %{_datadir}/s390-tools/genprotimg/stage3a.bin %{_datadir}/s390-tools/genprotimg/stage3b_reloc.bin