Skip to contentSkip to conversation

linaro-pm-qa-utils: Remove hardcoded relative paths

PATCH In review Carlos Hernandez 2 participants 2 messages Nov 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 linaro-pm-qa-utils: Remove hardcoded relative paths

Some scripts contained hardcoded relative paths to not existing files. This patch removes the relative paths and instead let BASH resolve the path to the executable.

---
V2:
* PR bump

---
 .../linaro-pm-qa/linaro-pm-qa-utils_git.bb         |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta-arago-extras/recipes-devtools/linaro-pm-qa/linaro-pm-qa-utils_git.bb +6 -1
index dcf599f..a836a8d 100644
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 PV = "0.4.4"
-PR = "r1"
+PR = "r2"
 
 BRANCH ?= "master"
 SRCREV = "fbc2762359b863dfbf4fd0bab1e8abd2a6125ed4"
@@ -41,6 +41,9 @@ do_install () {
     # Install the helper scripts in the include directory
     for script in `find . -name "*.sh" | grep include`
     do
+        # Remove hardcoded relative paths
+        sed -i -e 's#..\/utils\/##' ${script}
+
         script_basename=`basename ${script}`
         install -m 0755 $script ${D}${bindir}/linaro-pm-qa-include/${script_basename}
     done
@@ -53,6 +56,8 @@ do_install () {
         # directory then change the include path to the absolute path
         # and to reflect the install location of the helper scripts.
         sed -i -e "s#source ../include#source ${bindir}/linaro-pm-qa-include#g" ${script}
+        # Remove hardcoded relative paths
+        sed -i -e 's#..\/utils\/##' ${script}
 
         script_basename=`basename ${script}`
         install -m 0755 $script ${D}${bindir}/${script_basename}
Signature · 1 line
1.7.9.5
Acked-by on v2 1/1
#1 lore raw
Quoted 68 lines

-----Original Message-----
From: [email protected] [mailto:meta-arago- [email protected]] On Behalf Of Hernandez, Carlos
Sent: Wednesday, November 27, 2013 8:55 AM
To: [email protected]
Subject: [meta-arago] [PATCH v2] linaro-pm-qa-utils: Remove hardcoded relative paths

Some scripts contained hardcoded relative paths to not existing files. This patch removes the relative paths and instead let BASH resolve the path to the executable.

---
V2:
* PR bump
---
.../linaro-pm-qa/linaro-pm-qa-utils_git.bb | 7 ++++++-

1 file changed, 6 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

qa/linaro-pm-qa-utils_git.bb b/meta-arago-extras/recipes- devtools/linaro-pm-qa/linaro-pm-qa-utils_git.bb
index dcf599f..a836a8d 100644
--- a/meta-arago-extras/recipes-devtools/linaro-pm-qa/linaro-pm- qa-utils_git.bb
+++ b/meta-arago-extras/recipes-devtools/linaro-pm-qa/linaro-pm- qa-utils_git.bb

(quoted diff) +0 -0
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"

LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

PV = "0.4.4"

meta-arago-extras/recipes-devtools/linaro-pm-qa/linaro-pm-qa-utils_git.bb +1 -1
-PR = "r1"
+PR = "r2"

BRANCH ?= "master"
SRCREV = "fbc2762359b863dfbf4fd0bab1e8abd2a6125ed4"

meta-arago-extras/recipes-devtools/linaro-pm-qa/linaro-pm-qa-utils_git.bb +3 -0
@@ -41,6 +41,9 @@ do_install () {
    # Install the helper scripts in the include directory
    for script in `find . -name "*.sh" | grep include`
    do
+        # Remove hardcoded relative paths
+        sed -i -e 's#..\/utils\/##' ${script}
+
        script_basename=`basename ${script}`
        install -m 0755 $script ${D}${bindir}/linaro-pm-qa-
 include/${script_basename}

done

(quoted diff) +0 -0
@@ -53,6 +56,8 @@ do_install () {
        # directory then change the include path to the absolute

path

        # and to reflect the install location of the helper
scripts.
        sed -i -e "s#source ../include#source ${bindir}/linaro-
pm-qa-include#g" ${script}
meta-arago-extras/recipes-devtools/linaro-pm-qa/linaro-pm-qa-utils_git.bb +2 -1
+        # Remove hardcoded relative paths
+        sed -i -e 's#..\/utils\/##' ${script}
 
        script_basename=`basename ${script}`
        install -m 0755 $script ${D}${bindir}/${script_basename}
--

1.7.9.5

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago