rpm/s390-tools
SHA256
1
0
Fork 0
forked from pool/s390-tools
Code Pull Requests Activity

Accepting request 1070178 from home:ngueorguiev:branches:Base:System

Browse Source 
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
This commit is contained in:
Nikolay Gueorguiev 2023-03-08 12:55:05 +00:00 committed by Git OBS Bridge
parent 121bd3e056
commit 943f9cc9ee
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cputype
View File

@ -2,7 +2,7 @@
# #
# cputype # 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 # Based on the IBM machine model, returns a (hopefully) human understandable
# string that identifies the processor. # string that identifies the processor.
@ -25,7 +25,7 @@ if [ "${architecture}" != "s390x" -a "${architecture}" != "s390" ]; then
exit 1 exit 1
fi 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 if [ -z "${args}" ]; then
echo "I couldn't find the machine type. Please report a bug with this output:" >&2 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 exit 2
fi fi
eval ${args} machine=${args:0:4}
if [ -z "${machine}" ] ; then if [ -z "${machine}" ] ; then
echo "The machine type came out null. Please report a bug with this output:" >&2 echo "The machine type came out null. Please report a bug with this output:" >&2

7
s390-tools.changes
View File

@ -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> Tue Feb 21 13:49:29 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>