From patchwork Thu Mar 3 20:02:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [06/10] ADT: Bug fix for Suse Linux Date: Thu, 03 Mar 2011 20:02:46 -0000 From: Saul Wold X-Patchwork-Id: 1091 Message-Id: <06ae5cd63b3b42d8dafe953ffbce93c321f11ac3.1299182375.git.sgw@linux.intel.com> To: poky@yoctoproject.org,openembedded-core@lists.openembedded.org From: Liping Ke 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 --- .../adt-installer/scripts/adt_installer_internal | 2 +- .../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 b5e304d..df142ff 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 77f8b38..e29cc30 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"