From 47ca4354b62b8a958f32086a066965aa23342357 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 27 Mar 2023 14:51:01 -0400 Subject: [PATCH] jjb: update SLES detection in build scripts Change-Id: I64b6f8a1950bcc31c4aa79c39fb9d40e080ca061 Signed-off-by: Michael Jeanson --- scripts/babeltrace/build.sh | 2 +- scripts/liburcu/build.sh | 2 +- scripts/lttng-tools/build.sh | 2 +- scripts/lttng-ust/build.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index 6f2f0f7..91681d0 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -110,7 +110,7 @@ LIBDIR_ARCH="$LIBDIR" # RHEL and SLES both use lib64 but don't bother shipping a default autoconf # site config that matches this. -if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release ) ]]; then +if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then # Detect the userspace bitness in a distro agnostic way if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then LIBDIR_ARCH="${LIBDIR}64" diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh index b4cc761..c8f0c73 100755 --- a/scripts/liburcu/build.sh +++ b/scripts/liburcu/build.sh @@ -102,7 +102,7 @@ LIBDIR_ARCH="$LIBDIR" # RHEL and SLES both use lib64 but don't bother shipping a default autoconf # site config that matches this. -if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release ) ]]; then +if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then # Detect the userspace bitness in a distro agnostic way if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then LIBDIR_ARCH="${LIBDIR}64" diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index fb9703f..3b0eb9d 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -119,7 +119,7 @@ LIBDIR_ARCH="$LIBDIR" # RHEL and SLES both use lib64 but don't bother shipping a default autoconf # site config that matches this. -if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release ) ]]; then +if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then # Detect the userspace bitness in a distro agnostic way if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then LIBDIR_ARCH="${LIBDIR}64" diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh index b31f8ff..a311594 100755 --- a/scripts/lttng-ust/build.sh +++ b/scripts/lttng-ust/build.sh @@ -102,7 +102,7 @@ LIBDIR_ARCH="$LIBDIR" # RHEL and SLES both use lib64 but don't bother shipping a default autoconf # site config that matches this. -if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release ) ]]; then +if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then # Detect the userspace bitness in a distro agnostic way if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then LIBDIR_ARCH="${LIBDIR}64" -- 2.34.1