summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElizabeth Flanagan <elizabeth.flanagan@intel.com>2012-09-05 21:35:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-05 22:28:10 (GMT)
commit0f55a5868457300a3defc7fa7451ef191d19e018 (patch)
treeda1bbae34ebde078ca84574412629b3d554884a0
parentc4c1ef01bac68a0dc92fa2da038220ce729e806d (diff)
downloadpoky-0f55a5868457300a3defc7fa7451ef191d19e018.tar.gz
adt-installer: Allow changing YOCTOADT_REPO
YOCTOADT_REPO within adt-installer.conf was hardcoded to http://adtrepo.yoctoproject.org/${SDK_VERSION} This allows it to be overriden in local.conf by setting ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}" I'm also fixing a bad rm in do_populate_adt. The file name that is being rm'd is wrong. (From OE-Core rev: 610f8c0c0cab8e258919689fd641faec28b58caf) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/installer/adt-installer/adt_installer.conf2
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb9
2 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index afc69a4..171d2ac 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -23,7 +23,7 @@
23 23
24# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on 24# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on
25 25
26YOCTOADT_REPO="http://adtrepo.yoctoproject.org/YOCTOADT_VERSION" 26YOCTOADT_REPO="ADTREPO"
27 27
28# The following are for system wide setup 28# The following are for system wide setup
29# Target architectures that you want to setup host cross dev environment for 29# Target architectures that you want to setup host cross dev environment for
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index becdef6..3624dbc 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -1,6 +1,6 @@
1# Yocto ADT Installer bb file 1# Yocto ADT Installer bb file
2# 2#
3# Copyright 2010-2011 by Intel Corp. 3# Copyright 2010-2012 by Intel Corp.
4# 4#
5# Permission is hereby granted, free of charge, to any person obtaining a copy 5# Permission is hereby granted, free of charge, to any person obtaining a copy
6# of this software and associated documentation files (the "Software"), to deal 6# of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@ ALLOW_EMPTY = "1"
30 30
31PACKAGES = "" 31PACKAGES = ""
32 32
33PR = "r10" 33PR = "r11"
34 34
35ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" 35ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
36ADT_DIR = "${WORKDIR}/adt-installer/" 36ADT_DIR = "${WORKDIR}/adt-installer/"
@@ -51,14 +51,14 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
51 file://opkg/conf/opkg-sdk-i686.conf \ 51 file://opkg/conf/opkg-sdk-i686.conf \
52 " 52 "
53 53
54ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}" 54ADTREPO ?= "http://adtrepo.yoctoproject.org/${SDK_VERSION}"
55 55
56do_populate_adt[umask] = "022" 56do_populate_adt[umask] = "022"
57 57
58fakeroot do_populate_adt () { 58fakeroot do_populate_adt () {
59 cd ${WORKDIR} 59 cd ${WORKDIR}
60 mkdir -p ${ADT_DEPLOY} 60 mkdir -p ${ADT_DEPLOY}
61 rm -f ${ADT_DEPLOY}/adt-installer.tar.bz2 61 rm -f ${ADT_DEPLOY}/adt_installer.tar.bz2
62 rm -rf ${ADT_DIR} 62 rm -rf ${ADT_DIR}
63 mkdir -p ${ADT_DIR}/opkg/build 63 mkdir -p ${ADT_DIR}/opkg/build
64 cp -r opkg ${ADT_DIR}/ 64 cp -r opkg ${ADT_DIR}/
@@ -69,6 +69,7 @@ fakeroot do_populate_adt () {
69 cp adt_installer ${ADT_DIR} 69 cp adt_installer ${ADT_DIR}
70 cp adt_installer.conf ${ADT_DIR} 70 cp adt_installer.conf ${ADT_DIR}
71 sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf 71 sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
72 sed -i -e 's#ADTREPO#${ADTREPO}#' ${ADT_DIR}/adt_installer.conf
72 echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define 73 echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
73 echo 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define 74 echo 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define
74 cp ${COREBASE}/scripts/relocate_sdk.py ${ADT_DIR}/scripts/ 75 cp ${COREBASE}/scripts/relocate_sdk.py ${ADT_DIR}/scripts/