mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-08-15 16:55:29 +00:00
pm-qa: fix paths for shell scripts
Cherry-pick the following patch from upstream/master branch, as this fixes the following error(s) seen while running the 'pm-qa' scripts on the targets: cpufreq_01.sh: line 28: ../include/functions.sh: No such file or directory ----------------------------------------------- A commit in the repo of pm-qa: "adf9df9 Fix path to library files and change shebang line" Changed the text that sed was using to replace relative to absolute paths. As a result sed was not effectively finding the text "source ../include" to replace it, as the sed should be now searching for ". ../include". Similarly for "../Switches" Signed-off-by: Anastasios Kavoukis <anastasios.kavoukis@arm.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 06a93a04efe2c2cbae6de93d07962be4dfa35019) Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
parent
6be10fe608
commit
d10d52aef9
@ -42,6 +42,7 @@ do_install () {
|
|||||||
do
|
do
|
||||||
# Remove hardcoded relative paths
|
# Remove hardcoded relative paths
|
||||||
sed -i -e 's#..\/utils\/##' ${script}
|
sed -i -e 's#..\/utils\/##' ${script}
|
||||||
|
sed -i -e 's#. ..\/Switches#${bindir}#g' ${script}
|
||||||
|
|
||||||
script_basename=`basename ${script}`
|
script_basename=`basename ${script}`
|
||||||
install -m 0755 $script ${D}${libdir}/${BPN}/${script_basename}
|
install -m 0755 $script ${D}${libdir}/${BPN}/${script_basename}
|
||||||
@ -54,7 +55,7 @@ do_install () {
|
|||||||
# if the script includes any helper scripts from the $libdir
|
# if the script includes any helper scripts from the $libdir
|
||||||
# directory then change the source path to the absolute path
|
# directory then change the source path to the absolute path
|
||||||
# to reflect the install location of the helper scripts.
|
# to reflect the install location of the helper scripts.
|
||||||
sed -i -e "s#source ../include#source ${libdir}/${BPN}#g" ${script}
|
sed -i -e "s#. ../include#. ${libdir}/${BPN}#g" ${script}
|
||||||
# Remove hardcoded relative paths
|
# Remove hardcoded relative paths
|
||||||
sed -i -e 's#..\/utils\/##' ${script}
|
sed -i -e 's#..\/utils\/##' ${script}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user