diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-03 23:45:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-03 23:49:21 +0000 |
commit | dabd5deb4e50189fba9ccc60a219a5c6a05c8db1 (patch) | |
tree | 2cad66c55b524e6e6f1ed3a3e0ef8bb428d3a986 /meta/recipes-devtools/installer | |
parent | bd9b65d06d34d9fc8090fe2aeeca6e3724e00f91 (diff) | |
download | ast2050-yocto-poky-dabd5deb4e50189fba9ccc60a219a5c6a05c8db1.zip ast2050-yocto-poky-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-x | meta/recipes-devtools/installer/adt-installer/adt_installer | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/installer/adt-installer/scripts/data_define | 2 |
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 cca576f..2448d2b 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 rm -rf $LOCAL_OPKG_LOC fi - parent_folder=`eval echo $PWD` + parent_folder=`pwd` cd $LOCAL_OPKG_FOLDER check_result diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define index e29cc30..c7bce6d 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 @@ # THE SOFTWARE. config_file="adt_installer.conf" -source `eval echo $PWD`/$config_file +source `pwd`/$config_file LOCAL_OPKG_LOC="./opkg/build/opkg" LOCAL_OPKG_FOLDER="./opkg/build" |