summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-03 23:45:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-03 23:49:21 +0000
commitdabd5deb4e50189fba9ccc60a219a5c6a05c8db1 (patch)
tree2cad66c55b524e6e6f1ed3a3e0ef8bb428d3a986 /meta/recipes-devtools/installer
parentbd9b65d06d34d9fc8090fe2aeeca6e3724e00f91 (diff)
downloadpoky-dabd5deb4e50189fba9ccc60a219a5c6a05c8db1.tar.gz
Fixup merge error and apply cleanups
(From OE-Core rev: a72822d315d7bc35a424b0807693ad7a3317c519) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer2
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/data_define2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index cca576f7ef..2448d2b9f7 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -152,7 +152,7 @@ if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg-cl" ]; then
152 rm -rf $LOCAL_OPKG_LOC 152 rm -rf $LOCAL_OPKG_LOC
153 fi 153 fi
154 154
155 parent_folder=`eval echo $PWD` 155 parent_folder=`pwd`
156 cd $LOCAL_OPKG_FOLDER 156 cd $LOCAL_OPKG_FOLDER
157 check_result 157 check_result
158 158
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index e29cc30918..c7bce6d9ef 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -23,7 +23,7 @@
23# THE SOFTWARE. 23# THE SOFTWARE.
24 24
25config_file="adt_installer.conf" 25config_file="adt_installer.conf"
26source `eval echo $PWD`/$config_file 26source `pwd`/$config_file
27 27
28LOCAL_OPKG_LOC="./opkg/build/opkg" 28LOCAL_OPKG_LOC="./opkg/build/opkg"
29LOCAL_OPKG_FOLDER="./opkg/build" 29LOCAL_OPKG_FOLDER="./opkg/build"