diff options
| author | Liping Ke <liping.ke@intel.com> | 2011-03-03 03:18:38 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-03-03 16:33:58 -0800 |
| commit | 976cb2d81da176809f09db5f976c6373e00a4f11 (patch) | |
| tree | 04fdcb523ce56b602ecaf38120c14bf0938236ec /meta | |
| parent | 00d70680f92eba6e6bdfa514d4cf804c4d5d8ae6 (diff) | |
| download | poky-976cb2d81da176809f09db5f976c6373e00a4f11.tar.gz | |
ADT: Bug fix for Suse Linux
On Suse linux11.2, we found when using sudo, we must add -E opts
to preserver some network proxy environment settings. Otherwise,
opkg-cl can't access files behind firewall. [bug #785]
Also, we need to add absolute path when sourcing files.
Fix for [bug #786]
(From OE-Core rev: 794da1a4cffaedc8a9ceeb0b089d7236b22e7913)
Signed-off-by: Liping Ke <liping.ke@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 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/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index b5e304d442..df142ff31b 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | |||
| @@ -81,7 +81,7 @@ else | |||
| 81 | fi | 81 | fi |
| 82 | 82 | ||
| 83 | #first update repository | 83 | #first update repository |
| 84 | OPKG_CMD="sudo $LOCAL_OPKG_LOC/bin/opkg-cl" | 84 | OPKG_CMD="sudo -E $LOCAL_OPKG_LOC/bin/opkg-cl" |
| 85 | 85 | ||
| 86 | echo_info "Updating opkg..." | 86 | echo_info "Updating opkg..." |
| 87 | $OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR update &>> $YOCTOADT_INSTALL_LOG_FILE | 87 | $OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR update &>> $YOCTOADT_INSTALL_LOG_FILE |
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define index 77f8b383f2..e29cc30918 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 $config_file | 26 | source `eval echo $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" |