From 3ba29d41e6e00cc6bedfcb2d5157db54b6bcfda0 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Fri, 17 Aug 2012 13:38:11 +0300 Subject: adt-installer: add support for relocatable SDK Since we made the SDK relocatable, we have to add this functionality to adt-installer too. (From OE-Core rev: 0fa784c261050c632b7237ba3d43a148ab71b0ca) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/recipes-devtools/installer/adt-installer_1.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/installer/adt-installer_1.0.bb') diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb index e1edf2f97f..becdef6274 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 = "r9" +PR = "r10" ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" ADT_DIR = "${WORKDIR}/adt-installer/" @@ -69,8 +69,9 @@ fakeroot do_populate_adt () { cp adt_installer ${ADT_DIR} cp adt_installer.conf ${ADT_DIR} 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 + echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define + echo 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define + cp ${COREBASE}/scripts/relocate_sdk.py ${ADT_DIR}/scripts/ tar cfj adt_installer.tar.bz2 adt-installer cp ${WORKDIR}/adt_installer.tar.bz2 ${ADT_DEPLOY} } -- cgit v1.2.3-54-g00ecf