summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorJessica Zhang <jessica.zhang@intel.com>2012-01-30 21:11:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-01 15:15:15 +0000
commit8ac227e4ac77abd2b130ec79239c2b236e06b57f (patch)
treeea865b2c7e0fdcdcfb3b776629cc51ff69a52170 /meta/recipes-devtools
parent58026ecc28c59793259dd939f90e764ee0d95485 (diff)
downloadpoky-8ac227e4ac77abd2b130ec79239c2b236e06b57f.tar.gz
Fix the issue that adt-installer tar ball is not regenerated if sstate is on, and other minor bug fixes
(From OE-Core rev: 61da952fdc2996c27c56234c36116a69a23a378d) Signed-off-by: Jessica Zhang <jessica.zhang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/installer/adt-installer/adt_installer.conf2
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb13
2 files changed, 7 insertions, 8 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index 2038b09e9c..275756e187 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="http://adtrepo.yoctoproject.org/YOCTOADT_VERSION"
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 39e53c1220..5e76067206 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -30,15 +30,13 @@ ALLOW_EMPTY = "1"
30 30
31PACKAGES = "" 31PACKAGES = ""
32 32
33PR = "r5" 33PR = "r6"
34 34
35ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" 35ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
36ADT_DIR = "${WORKDIR}/adt-installer/" 36ADT_DIR = "${WORKDIR}/adt-installer/"
37YOCTOADT_VERSION = "${SDK_VERSION}" 37YOCTOADT_VERSION = "${SDK_VERSION}"
38S = "${WORKDIR}/trunk" 38S = "${WORKDIR}/trunk"
39 39
40inherit deploy allarch
41
42SRCREV = "596" 40SRCREV = "596"
43PV = "0.1.8+svnr${SRCPV}" 41PV = "0.1.8+svnr${SRCPV}"
44SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ 42SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
@@ -55,9 +53,9 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
55 53
56ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}" 54ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}"
57 55
58do_deploy[umask] = 022 56do_populate_adt[umask] = 022
59 57
60fakeroot do_deploy () { 58fakeroot do_populate_adt () {
61 cd ${WORKDIR} 59 cd ${WORKDIR}
62 mkdir -p ${ADT_DEPLOY} 60 mkdir -p ${ADT_DEPLOY}
63 rm -f ${ADT_DEPLOY}/adt-installer.tar.bz2 61 rm -f ${ADT_DEPLOY}/adt-installer.tar.bz2
@@ -73,13 +71,14 @@ fakeroot do_deploy () {
73 echo 'YOCTOADT_VERSION=${SDK_VERSION}' > ${ADT_DIR}/temp.conf 71 echo 'YOCTOADT_VERSION=${SDK_VERSION}' > ${ADT_DIR}/temp.conf
74 cat ${ADT_DIR}/adt_installer.conf >> ${ADT_DIR}/temp.conf 72 cat ${ADT_DIR}/adt_installer.conf >> ${ADT_DIR}/temp.conf
75 mv ${ADT_DIR}/temp.conf ${ADT_DIR}/adt_installer.conf 73 mv ${ADT_DIR}/temp.conf ${ADT_DIR}/adt_installer.conf
74 sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
76 echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define 75 echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
77 echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define 76 echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define
78 tar cfj adt_installer.tar.bz2 adt-installer 77 tar cfj adt_installer.tar.bz2 adt-installer
79 cp ${WORKDIR}/adt_installer.tar.bz2 ${ADT_DEPLOY} 78 cp ${WORKDIR}/adt_installer.tar.bz2 ${ADT_DEPLOY}
80} 79}
81 80
82do_install[noexec] = "1" 81do_populate_adt[nostamp] = "1"
83do_configure[noexec] = "1" 82do_configure[noexec] = "1"
84do_compile[noexec] = "1" 83do_compile[noexec] = "1"
85do_package[noexec] = "1" 84do_package[noexec] = "1"
@@ -89,4 +88,4 @@ do_package_write_rpm[noexec] = "1"
89do_package_write_deb[noexec] = "1" 88do_package_write_deb[noexec] = "1"
90do_poplulate_sysroot[noexec] = "1" 89do_poplulate_sysroot[noexec] = "1"
91 90
92addtask deploy before do_populate_sysroot after do_patch 91addtask populate_adt before do_build after do_install