diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2022-12-02 17:44:52 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-12-05 09:16:24 -0800 |
| commit | 6de9b46cc78543f838526c3bcb193d02d487cfb6 (patch) | |
| tree | 675f07b86fe42dee0a8e7bd3cdc484dbadb55793 /meta-oe/recipes-security | |
| parent | 6a9ed97fe1b5c9f6dfc006d61431b9993f1cb411 (diff) | |
| download | meta-openembedded-6de9b46cc78543f838526c3bcb193d02d487cfb6.tar.gz | |
keyutils: fix ptest failed since "+++ Can't Determine Endianness"
All the ptest cases are failed since error "+++ Can't Determine Endianness",
update the regex for matching the endianness to fix this issue.
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-security')
| -rw-r--r-- | meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch b/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch new file mode 100644 index 0000000000..728f464331 --- /dev/null +++ b/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch @@ -0,0 +1,35 @@ +From 935a31dd6f14bd1aff735495f0fdbae4ca05c695 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 2 Dec 2022 15:35:40 +0800 +Subject: [PATCH] tests/toolbox.inc.sh: update regex for getting endian + +Update regex for getting endian in following condition: +/proc/777/exe: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2 + +Upstream-Status: Submited [Submitted to keyrings@vger.kernel.org ] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + tests/toolbox.inc.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh +index 1964450..e827e20 100644 +--- a/tests/toolbox.inc.sh ++++ b/tests/toolbox.inc.sh +@@ -13,10 +13,10 @@ + echo === $OUTPUTFILE === + + endian=`file -L /proc/$$/exe` +-if expr "$endian" : '.* MSB \+\(executable\|shared object\).*' >&/dev/null ++if expr "$endian" : '.* MSB .*\(executable\|shared object\).*' >&/dev/null + then + endian=BE +-elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null ++elif expr "$endian" : '.* LSB .*\(executable\|shared object\).*' >&/dev/null + then + endian=LE + else +-- +2.25.1 + diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb index 8a95a15f6f..019118f38b 100644 --- a/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb @@ -19,6 +19,7 @@ SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \ file://keyutils-fix-error-report-by-adding-default-message.patch \ file://run-ptest \ file://fix_library_install_path.patch \ + file://0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch \ " SRC_URI[md5sum] = "919af7f33576816b423d537f8a8692e8" |