[OE-core] [PATCH 1/1] adt-installer: Corrected wrong environment file names.
Saul Wold
sgw at linux.intel.com
Mon Mar 12 17:40:11 UTC 2012
On 03/06/2012 06:06 PM, Lianhao Lu wrote:
> [YOCTO #2055]
> 1. Corrected the wrong environment file name for powerpc.
>
> 2. Removed unnecessary variables in adt_installer.conf.
>
> Signed-off-by: Lianhao Lu<lianhao.lu at intel.com>
> ---
> .../adt-installer/scripts/adt_installer_internal | 2 ++
> .../installer/adt-installer_1.0.bb | 5 +----
> 2 files changed, 3 insertions(+), 4 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 6201095..684dc88 100755
> --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
> +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
> @@ -175,6 +175,8 @@ check_result
> echo_info "Updating environment script with target sysroot location."
> if [ "$1" == "x86" ]; then
> env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*`
> +elif [ "$1" == "ppc" ]; then
> + env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*`
> else
> env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*`
> fi
> diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
> index 340349d..27937d9 100644
> --- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
> +++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
> @@ -30,7 +30,7 @@ ALLOW_EMPTY = "1"
>
> PACKAGES = ""
>
> -PR = "r6"
> +PR = "r7"
>
> ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
> ADT_DIR = "${WORKDIR}/adt-installer/"
> @@ -68,9 +68,6 @@ fakeroot do_populate_adt () {
> cp -r scripts ${ADT_DIR}/
> cp adt_installer ${ADT_DIR}
> cp adt_installer.conf ${ADT_DIR}
> - echo 'YOCTOADT_VERSION=${SDK_VERSION}'> ${ADT_DIR}/temp.conf
> - cat ${ADT_DIR}/adt_installer.conf>> ${ADT_DIR}/temp.conf
> - mv ${ADT_DIR}/temp.conf ${ADT_DIR}/adt_installer.conf
> sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
> echo 'SDK_VENDOR=${SDK_VENDOR}'>> ${ADT_DIR}/scripts/data_define
> echo 'INSTALL_FOLDER=${SDKPATH}'>> ${ADT_DIR}/scripts/data_define
Merged into OE-Core
Thanks
Sau!
More information about the Openembedded-core
mailing list