diff --git a/meta-stx-flock/stx-utilities/files/0001-worker-utils-account-for-distro-PATH-differeces.patch b/meta-stx-flock/stx-utilities/files/0001-worker-utils-account-for-distro-PATH-differeces.patch new file mode 100644 index 0000000..97b5650 --- /dev/null +++ b/meta-stx-flock/stx-utilities/files/0001-worker-utils-account-for-distro-PATH-differeces.patch @@ -0,0 +1,86 @@ +From ecc947cb8bddde6bbedb426152cb898be71eea32 Mon Sep 17 00:00:00 2001 +From: Babak Sarashki +Date: Sat, 13 Jun 2020 08:06:44 -0700 +Subject: [PATCH] worker-utils: account for distro PATH differeces + +The PATH variable in the worker-utils' scripts expect +system utilities under /usr/sbin. This is not true for +all distros. Extending PATH to /sbin. + +Signed-off-by: Babak Sarashki +--- + utilities/worker-utils/worker-utils/affine-interrupts.sh | 2 +- + utilities/worker-utils/worker-utils/affine-platform.sh | 2 +- + utilities/worker-utils/worker-utils/affine-tasks.sh | 2 +- + utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh | 2 +- + utilities/worker-utils/worker-utils/task_affinity_functions.sh | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/utilities/worker-utils/worker-utils/affine-interrupts.sh b/utilities/worker-utils/worker-utils/affine-interrupts.sh +index 6a7c228..d3dc4f8 100644 +--- a/utilities/worker-utils/worker-utils/affine-interrupts.sh ++++ b/utilities/worker-utils/worker-utils/affine-interrupts.sh +@@ -12,7 +12,7 @@ + # Usage: /usr/bin/affine-interrupts.sh interface cpulist + # + # Define minimal path +-PATH=/bin:/usr/bin:/usr/local/bin ++PATH=/bin:/sbin:/usr/bin:/usr/local/bin + + # logger setup + WHOAMI=`basename $0` +diff --git a/utilities/worker-utils/worker-utils/affine-platform.sh b/utilities/worker-utils/worker-utils/affine-platform.sh +index 72a7d63..2bcc2e8 100755 +--- a/utilities/worker-utils/worker-utils/affine-platform.sh ++++ b/utilities/worker-utils/worker-utils/affine-platform.sh +@@ -16,7 +16,7 @@ + ### END INIT INFO + + # Define minimal path +-PATH=/bin:/usr/bin:/usr/local/bin ++PATH=/bin:/sbin:/usr/bin:/usr/local/bin + + LOG_FUNCTIONS=${LOG_FUNCTIONS:-"/etc/init.d/log_functions.sh"} + CPUMAP_FUNCTIONS=${CPUMAP_FUNCTIONS:-"/etc/init.d/cpumap_functions.sh"} +diff --git a/utilities/worker-utils/worker-utils/affine-tasks.sh b/utilities/worker-utils/worker-utils/affine-tasks.sh +index 3f6d294..9603804 100644 +--- a/utilities/worker-utils/worker-utils/affine-tasks.sh ++++ b/utilities/worker-utils/worker-utils/affine-tasks.sh +@@ -44,7 +44,7 @@ + # + ################################################################################ + # Define minimal path +-PATH=/bin:/usr/bin:/usr/sbin:/usr/local/bin ++PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin + + CPUMAP_FUNCTIONS=${CPUMAP_FUNCTIONS:-"/etc/init.d/cpumap_functions.sh"} + [[ -e ${CPUMAP_FUNCTIONS} ]] && source ${CPUMAP_FUNCTIONS} +diff --git a/utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh b/utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh +index 0efa13e..b6fbddf 100644 +--- a/utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh ++++ b/utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh +@@ -15,7 +15,7 @@ + # For example, 0,5,7,9-11. + + # Define minimal path +-PATH=/bin:/usr/bin:/usr/local/bin ++PATH=/bin:/sbin:/usr/bin:/usr/local/bin + + LOG_FUNCTIONS=${LOG_FUNCTIONS:-"/etc/init.d/log_functions.sh"} + CPUMAP_FUNCTIONS=${CPUMAP_FUNCTIONS:-"/etc/init.d/cpumap_functions.sh"} +diff --git a/utilities/worker-utils/worker-utils/task_affinity_functions.sh b/utilities/worker-utils/worker-utils/task_affinity_functions.sh +index 4b18431..0cd6764 100755 +--- a/utilities/worker-utils/worker-utils/task_affinity_functions.sh ++++ b/utilities/worker-utils/worker-utils/task_affinity_functions.sh +@@ -16,7 +16,7 @@ + ### END INIT INFO + + # Define minimal path +-PATH=/bin:/usr/bin:/usr/local/bin ++PATH=/bin:/sbin:/usr/bin:/usr/local/bin + + . /etc/platform/platform.conf + LOG_FUNCTIONS=${LOG_FUNCTIONS:-"/etc/init.d/log_functions.sh"} +-- +2.24.1 + diff --git a/meta-stx-flock/stx-utilities/worker-utils.bb b/meta-stx-flock/stx-utilities/worker-utils.bb index 357716d..c2dca5e 100644 --- a/meta-stx-flock/stx-utilities/worker-utils.bb +++ b/meta-stx-flock/stx-utilities/worker-utils.bb @@ -9,6 +9,8 @@ S = "${S_DIR}/utilities/worker-utils/worker-utils" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SRC_URI += "file://0001-worker-utils-account-for-distro-PATH-differeces.patch;striplevel=4" + RDEPENDS_${PN}_append = " perl systemd python bash" DEPENDS += " python"