From 943f9cc9eebafaa33cd0aa5fbd46393872d1c6c4c7cd6a21294402f0879b910e Mon Sep 17 00:00:00 2001
From: Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
Date: Wed, 8 Mar 2023 12:55:05 +0000
Subject: [PATCH] Accepting request 1070178 from
 home:ngueorguiev:branches:Base:System

Updated s390-tools, cputype script (bsc#1208983)

OBS-URL: https://build.opensuse.org/request/show/1070178
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=159
---
 cputype            | 6 +++---
 s390-tools.changes | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cputype b/cputype
index 6268d16..7b1c1bf 100644
--- a/cputype
+++ b/cputype
@@ -2,7 +2,7 @@
 #
 # cputype
 #
-# Copyright (c) 2014-2017, 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2014-2017, 2019, 2023 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # Based on the IBM machine model, returns a (hopefully) human understandable
 # string that identifies the processor.
@@ -25,7 +25,7 @@ if [ "${architecture}" != "s390x" -a "${architecture}" != "s390" ]; then
   exit 1
 fi
 
-args=$(/usr/bin/grep machine /proc/cpuinfo | /usr/bin/cut -f2- -d: | /usr/bin/tr -d ' ' | /usr/bin/tr ',' ';' )
+args=$(/usr/bin/grep machine /proc/cpuinfo | awk '{print $11}' )
 
 if [ -z "${args}" ]; then
   echo "I couldn't find the machine type. Please report a bug with this output:" >&2
@@ -35,7 +35,7 @@ if [ -z "${args}" ]; then
   exit 2
 fi
 
-eval ${args}
+machine=${args:0:4}
 
 if [ -z "${machine}" ] ; then
   echo "The machine type came out null. Please report a bug with this output:" >&2
diff --git a/s390-tools.changes b/s390-tools.changes
index 77d1162..d4662a2 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  8 09:38:46 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Updated cputype (bsc#1208983)
+  * Changed the script to avoid "/usr/bin/cputype: line xx: nnnn: command not found",
+    when machine type was found more than once in the /proc/cpuinfo.
+
 -------------------------------------------------------------------
 Tue Feb 21 13:49:29 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>