From dabd5deb4e50189fba9ccc60a219a5c6a05c8db1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 3 Mar 2011 23:45:25 +0000 Subject: Fixup merge error and apply cleanups (From OE-Core rev: a72822d315d7bc35a424b0807693ad7a3317c519) Signed-off-by: Richard Purdie --- meta/recipes-devtools/installer/adt-installer/adt_installer | 2 +- meta/recipes-devtools/installer/adt-installer/scripts/data_define | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/installer') 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" -- cgit v1.2.3-54-g00ecf