From 2f3aa4d8740237c4159e38bea037b92130838599821148afcc2fdaed3bb4e0bf Mon Sep 17 00:00:00 2001
From: Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
Date: Fri, 12 Apr 2024 09:50:38 +0000
Subject: [PATCH] Accepting request 1167028 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:
    - stage3a.bin and
    - stage3b_reloc.bin
    - plus check_hostkeydoc script

OBS-URL: https://build.opensuse.org/request/show/1167028
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=205
---
 s390-tools.changes | 10 ++++++++++
 s390-tools.spec    | 28 ++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/s390-tools.changes b/s390-tools.changes
index daea387..e679b77 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 12 08:59:53 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- 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
+
 -------------------------------------------------------------------
 Thu Apr  4 03:51:55 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
 
diff --git a/s390-tools.spec b/s390-tools.spec
index 644d7ae..86d628d 100644
--- a/s390-tools.spec
+++ b/s390-tools.spec
@@ -195,12 +195,14 @@ BuildRequires:  openssl
 # Don't build with pie to avoid problems with zipl
 #!BuildIgnore:  gcc-PIE
 Requires:       coreutils
+Requires:       procps
+Requires:       util-linux
+%ifarch s390x
 Requires:       gawk
 Requires:       perl-base
-Requires:       procps
 Requires:       rsync
 Requires:       tar
-Requires:       util-linux
+%endif
 Requires(post): %fillup_prereq
 Requires(post): permissions
 Requires(pre):  shadow
@@ -209,6 +211,8 @@ Provides:       s390utils:/sbin/dasdfmt
 Provides:       group(cpacfstats)
 Provides:       group(ts-shell)
 Provides:       group(zkeyadm)
+%ifarch x86_64 ###
+%endif        ###
 ExclusiveArch:  s390x x86_64
 
 %description
@@ -333,6 +337,20 @@ unavailable, the toolset checks for operational paths to the same
 volume. If available, it reconfigures the FCP re-IPL settings to use an
 operational path.
 
+%package genprotimg-data
+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
+in the realm of IBM Secure Execution on a trusted environment,
+such as the laptop of an admin. The idea is to limit the build targets
+depending on the defined or detected host architecture.
+
 ### *** s390x ************************************************************************* ###
 %ifarch s390x
 
@@ -765,6 +783,12 @@ done
 %{_udevrulesdir}/70-chreipl-fcp-mpath.rules
 %{_mandir}/man7/chreipl-fcp-mpath.7%{?ext_man}
 
+### genprotimg
+%files genprotimg-data
+%{_datadir}/s390-tools/genprotimg/check_hostkeydoc
+%{_datadir}/s390-tools/genprotimg/stage3a.bin
+%{_datadir}/s390-tools/genprotimg/stage3b_reloc.bin
+
 ### _endif
 ### *** !s390x ************************************************************************* ###
 ### _ifarch x86_64