diff options
author | Jessica Zhang <jessica.zhang@intel.com> | 2012-01-30 21:11:44 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-10 17:10:08 +0000 |
commit | c6ec5a0d9e31a1694aba25e2ff76f1c933e556d5 (patch) | |
tree | 4895ebbdbda06957c28b53ab26352bec46d90c40 /meta | |
parent | de68393270d5455b4861d38cef3f081b9667d25f (diff) | |
download | poky-c6ec5a0d9e31a1694aba25e2ff76f1c933e556d5.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>
Conflicts:
meta/recipes-devtools/installer/adt-installer_1.0.bb
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/installer/adt-installer/adt_installer.conf | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/installer/adt-installer_1.0.bb | 14 |
2 files changed, 7 insertions, 9 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 | ||
26 | YOCTOADT_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION" | 26 | YOCTOADT_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 e960165c6d..5e76067206 100644 --- a/meta/recipes-devtools/installer/adt-installer_1.0.bb +++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb | |||
@@ -29,17 +29,14 @@ LICENSE = "MIT" | |||
29 | ALLOW_EMPTY = "1" | 29 | ALLOW_EMPTY = "1" |
30 | 30 | ||
31 | PACKAGES = "" | 31 | PACKAGES = "" |
32 | PACKAGE_ARCH = "all" | ||
33 | 32 | ||
34 | PR = "r5" | 33 | PR = "r6" |
35 | 34 | ||
36 | ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" | 35 | ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" |
37 | ADT_DIR = "${WORKDIR}/adt-installer/" | 36 | ADT_DIR = "${WORKDIR}/adt-installer/" |
38 | YOCTOADT_VERSION = "${SDK_VERSION}" | 37 | YOCTOADT_VERSION = "${SDK_VERSION}" |
39 | S = "${WORKDIR}/trunk" | 38 | S = "${WORKDIR}/trunk" |
40 | 39 | ||
41 | inherit deploy | ||
42 | |||
43 | SRCREV = "596" | 40 | SRCREV = "596" |
44 | PV = "0.1.8+svnr${SRCPV}" | 41 | PV = "0.1.8+svnr${SRCPV}" |
45 | SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ | 42 | SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ |
@@ -56,9 +53,9 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ | |||
56 | 53 | ||
57 | ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}" | 54 | ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}" |
58 | 55 | ||
59 | do_deploy[umask] = 022 | 56 | do_populate_adt[umask] = 022 |
60 | 57 | ||
61 | fakeroot do_deploy () { | 58 | fakeroot do_populate_adt () { |
62 | cd ${WORKDIR} | 59 | cd ${WORKDIR} |
63 | mkdir -p ${ADT_DEPLOY} | 60 | mkdir -p ${ADT_DEPLOY} |
64 | rm -f ${ADT_DEPLOY}/adt-installer.tar.bz2 | 61 | rm -f ${ADT_DEPLOY}/adt-installer.tar.bz2 |
@@ -74,13 +71,14 @@ fakeroot do_deploy () { | |||
74 | echo 'YOCTOADT_VERSION=${SDK_VERSION}' > ${ADT_DIR}/temp.conf | 71 | echo 'YOCTOADT_VERSION=${SDK_VERSION}' > ${ADT_DIR}/temp.conf |
75 | cat ${ADT_DIR}/adt_installer.conf >> ${ADT_DIR}/temp.conf | 72 | cat ${ADT_DIR}/adt_installer.conf >> ${ADT_DIR}/temp.conf |
76 | 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 | ||
77 | echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define | 75 | echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define |
78 | echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define | 76 | echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define |
79 | tar cfj adt_installer.tar.bz2 adt-installer | 77 | tar cfj adt_installer.tar.bz2 adt-installer |
80 | cp ${WORKDIR}/adt_installer.tar.bz2 ${ADT_DEPLOY} | 78 | cp ${WORKDIR}/adt_installer.tar.bz2 ${ADT_DEPLOY} |
81 | } | 79 | } |
82 | 80 | ||
83 | do_install[noexec] = "1" | 81 | do_populate_adt[nostamp] = "1" |
84 | do_configure[noexec] = "1" | 82 | do_configure[noexec] = "1" |
85 | do_compile[noexec] = "1" | 83 | do_compile[noexec] = "1" |
86 | do_package[noexec] = "1" | 84 | do_package[noexec] = "1" |
@@ -90,4 +88,4 @@ do_package_write_rpm[noexec] = "1" | |||
90 | do_package_write_deb[noexec] = "1" | 88 | do_package_write_deb[noexec] = "1" |
91 | do_poplulate_sysroot[noexec] = "1" | 89 | do_poplulate_sysroot[noexec] = "1" |
92 | 90 | ||
93 | addtask deploy before do_populate_sysroot after do_patch | 91 | addtask populate_adt before do_build after do_install |