diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-03 23:45:25 +0000 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-03-03 16:33:59 -0800 |
| commit | 91d72e822e0d03aa6e9b1de13c181ec062c98740 (patch) | |
| tree | acd6d0556708d7e78caf33a7773710b085682578 /meta/recipes-devtools | |
| parent | 8640414cca7bd4a7896bc6142abd1013b87d3477 (diff) | |
| download | poky-91d72e822e0d03aa6e9b1de13c181ec062c98740.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')
| -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 | |||
| 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 | ||
| 25 | config_file="adt_installer.conf" | 25 | config_file="adt_installer.conf" |
| 26 | source `eval echo $PWD`/$config_file | 26 | source `pwd`/$config_file |
| 27 | 27 | ||
| 28 | LOCAL_OPKG_LOC="./opkg/build/opkg" | 28 | LOCAL_OPKG_LOC="./opkg/build/opkg" |
| 29 | LOCAL_OPKG_FOLDER="./opkg/build" | 29 | LOCAL_OPKG_FOLDER="./opkg/build" |