Commit 78da89c6 authored by Heiko Carstens's avatar Heiko Carstens Committed by Jonathan Corbet
Browse files

scripts: get_feat.pl: substitute s390x with s390 



Both get_feat.pl and list-arch.sh use uname -m to get the machine hardware
name to figure out the current architecture if no architecture is specified
with a command line option.

This doesn't work for s390, since for 64 bit kernels the hardware name is
s390x, while the architecture name within the kernel, as well as in all
feature files is s390.

Therefore substitute s390x with s390 similar to what is already done for
x86_64 and i386.

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/20250312155219.3597768-1-hca@linux.ibm.com
parent 19b100b0

Documentation/features/list-arch.sh

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ 
# (If no arguments are given then it will print the host architecture's status.)

#



ARCH=${1:-$(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/')}

ARCH=${1:-$(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/' | sed 's/s390x/s390/')}



$(dirname $0)/../../scripts/get_feat.pl list --arch $ARCH

scripts/get_feat.pl

+2 −2
Original line number Diff line number Diff line
@@ -512,13 +512,13 @@ print STDERR Data::Dumper->Dump([\%data], [qw(*data)]) if ($debug); 
# Handles the command

#

if ($cmd eq "current") {

	$arch = qx(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/');

	$arch = qx(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/' | sed 's/s390x/s390/');

	$arch =~s/\s+$//;

}



if ($cmd eq "ls" or $cmd eq "list") {

	if (!$arch) {

		$arch = qx(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/');

		$arch = qx(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/' | sed 's/s390x/s390/');

		$arch =~s/\s+$//;

	}