summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer/adt-installer_1.0.bb
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-03-07 10:06:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-08 12:18:52 -0800
commit6bd23e0faf329f086bb4885991ce5f5d095dac56 (patch)
tree4d7b769886355e05507076a2c2a0df86121c601e /meta/recipes-devtools/installer/adt-installer_1.0.bb
parent3f6ed2c850cac41f40aa3f3fe8ae7832668c1e45 (diff)
downloadast2050-yocto-poky-6bd23e0faf329f086bb4885991ce5f5d095dac56.zip
ast2050-yocto-poky-6bd23e0faf329f086bb4885991ce5f5d095dac56.tar.gz
adt-installer: Corrected wrong environment file names.
[YOCTO #2055] 1. Corrected the wrong environment file name for powerpc. 2. Removed unnecessary variables in adt_installer.conf. (From OE-Core rev: 9c52fe75b7f77feda075e9c5296448dea6ff7922) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer_1.0.bb')
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb5
1 files changed, 1 insertions, 4 deletions
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
OpenPOWER on IntegriCloud