summaryrefslogtreecommitdiffstats
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:49:15 +0000
commit9e6b1ac4b85df82e0351d4375345c450bdb11008 (patch)
treee928a1bc581cb105c2113099dcedc2962c56cd61 /meta/recipes-devtools/installer
parente4ca5a02fdd08d073e41d870a3b3a940166ba4d0 (diff)
downloadpoky-9e6b1ac4b85df82e0351d4375345c450bdb11008.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/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
81fi 81fi
82 82
83#first update repository 83#first update repository
84OPKG_CMD="sudo $LOCAL_OPKG_LOC/bin/opkg-cl" 84OPKG_CMD="sudo -E $LOCAL_OPKG_LOC/bin/opkg-cl"
85 85
86echo_info "Updating opkg..." 86echo_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
25config_file="adt_installer.conf" 25config_file="adt_installer.conf"
26source $config_file 26source `eval echo $PWD`/$config_file
27 27
28LOCAL_OPKG_LOC="./opkg/build/opkg" 28LOCAL_OPKG_LOC="./opkg/build/opkg"
29LOCAL_OPKG_FOLDER="./opkg/build" 29LOCAL_OPKG_FOLDER="./opkg/build"