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:45:25 +0000 |
| commit | a72822d315d7bc35a424b0807693ad7a3317c519 (patch) | |
| tree | 9f44d4a04595e6523be087f9948876748e84181f /meta/recipes-devtools | |
| parent | bcdd048e4857b5f8a343c434ade5a02ab1db33bc (diff) | |
| download | openembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.tar.gz openembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.tar.bz2 openembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.zip | |
Fixup merge error and apply cleanups
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -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 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 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 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 @@ # 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" |