summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/installer
diff options
context:
space:
mode:
authorLiping Ke <liping.ke@intel.com>2011-03-03 03:18:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-03 23:13:33 +0000
commit794da1a4cffaedc8a9ceeb0b089d7236b22e7913 (patch)
tree02a4457bcd93bd50db5bdef61012df5b90c61fb7 /meta/recipes-devtools/installer
parenta003ba3d2b80dc08d128f9b58890fe89c612236d (diff)
downloadopenembedded-core-794da1a4cffaedc8a9ceeb0b089d7236b22e7913.tar.gz
openembedded-core-794da1a4cffaedc8a9ceeb0b089d7236b22e7913.tar.bz2
openembedded-core-794da1a4cffaedc8a9ceeb0b089d7236b22e7913.zip
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] Signed-off-by: Liping Ke <liping.ke@intel.com>
Diffstat (limited to 'meta/recipes-devtools/installer')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/data_define2
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
fi
#first update repository
-OPKG_CMD="sudo $LOCAL_OPKG_LOC/bin/opkg-cl"
+OPKG_CMD="sudo -E $LOCAL_OPKG_LOC/bin/opkg-cl"
echo_info "Updating opkg..."
$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 @@
# THE SOFTWARE.
config_file="adt_installer.conf"
-source $config_file
+source `eval echo $PWD`/$config_file
LOCAL_OPKG_LOC="./opkg/build/opkg"
LOCAL_OPKG_FOLDER="./opkg/build"