From 976cb2d81da176809f09db5f976c6373e00a4f11 Mon Sep 17 00:00:00 2001 From: Liping Ke Date: Thu, 3 Mar 2011 03:18:38 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../installer/adt-installer/scripts/adt_installer_internal | 2 +- meta/recipes-devtools/installer/adt-installer/scripts/data_define | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') 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" -- cgit v1.2.3-54-g00ecf