[OE-core] [PATCH 1/1] [REVISION 2] adt-installer: Add adt-installer-dev.bb
Flanagan, Elizabeth
elizabeth.flanagan at intel.com
Wed Sep 5 19:27:11 UTC 2012
This adds an adt-installer-dev for QA and autobuilder use.
It repoints the ADTREPO url to adtrepo-dev.yp.org.
I've split out the main adt-installer recipe into an inc
and ensure that we're able to build both tarballs.
adt-installer -->> adt-installer.tar.bz2
adt-installer-dev -->> adt-installer-dev.tar.bz2
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan at intel.com>
---
.../installer/adt-installer-dev_1.0.bb | 26 ++++++
meta/recipes-devtools/installer/adt-installer.inc | 87 ++++++++++++++++++++
.../installer/adt-installer/adt_installer.conf | 2 +-
.../installer/adt-installer_1.0.bb | 69 +---------------
4 files changed, 117 insertions(+), 67 deletions(-)
create mode 100644 meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
create mode 100644 meta/recipes-devtools/installer/adt-installer.inc
diff --git a/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
b/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
new file mode 100644
index 0000000..16cc481
--- /dev/null
+++ b/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
@@ -0,0 +1,26 @@
+# Yocto ADT Installer bb file
+#
+# Copyright 2010-2012 by Intel Corp.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the
"Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require adt-installer.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/adt-installer:"
+ADTREPO = "http://adtrepo-dev.yoctoproject.org/${SDK_VERSION}"
diff --git a/meta/recipes-devtools/installer/adt-installer.inc
b/meta/recipes-devtools/installer/adt-installer.inc
new file mode 100644
index 0000000..6dedcf2
--- /dev/null
+++ b/meta/recipes-devtools/installer/adt-installer.inc
@@ -0,0 +1,87 @@
+# Yocto ADT Installer include file
+#
+# Copyright 2010-2012 by Intel Corp.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the
"Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+DESCRIPTION = "Meta package for creating sdk installer tarball"
+LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LICENSE = "MIT"
+
+ALLOW_EMPTY = "1"
+
+PACKAGES = ""
+
+PR = "r11"
+
+ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
+ADT_DIR = "${WORKDIR}/adt-installer/"
+YOCTOADT_VERSION = "${SDK_VERSION}"
+S = "${WORKDIR}/trunk"
+
+SRCREV = "596"
+PV = "0.1.8+svnr${SRCPV}"
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
+ file://wget_cache.patch \
+ file://adt_installer \
+ file://scripts/adt_installer_internal \
+ file://scripts/util \
+ file://scripts/data_define \
+ file://scripts/extract_rootfs \
+ file://adt_installer.conf \
+ file://opkg/conf/opkg-sdk-x86_64.conf \
+ file://opkg/conf/opkg-sdk-i686.conf \
+ "
+
+do_populate_adt[umask] = "022"
+
+fakeroot do_populate_adt () {
+ cd ${WORKDIR}
+ mkdir -p ${ADT_DEPLOY}
+ rm -f ${ADT_DEPLOY}/${PN}.tar.bz2
+ rm -rf ${ADT_DIR}
+ mkdir -p ${ADT_DIR}/opkg/build
+ cp -r opkg ${ADT_DIR}/
+ sed -i -e 's#ADTREPO_URL#${ADTREPO}#' ${ADT_DIR}/opkg/conf/*.conf
+ cp -r trunk ${ADT_DIR}/opkg/build/
+ mv ${ADT_DIR}/opkg/build/trunk ${ADT_DIR}/opkg/build/opkg-svn
+ cp -r scripts ${ADT_DIR}/
+ cp adt_installer ${ADT_DIR}
+ cp adt_installer.conf ${ADT_DIR}
+ sed -i -e 's#ADTREPO#${ADTREPO}#' ${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 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define
+ cp ${COREBASE}/scripts/relocate_sdk.py ${ADT_DIR}/scripts/
+ tar cfj ${PN}.tar.bz2 adt-installer
+ cp ${WORKDIR}/${PN}.tar.bz2 ${ADT_DEPLOY}
+}
+
+do_populate_adt[nostamp] = "1"
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_package[noexec] = "1"
+do_package_write[noexec] = "1"
+do_package_write_ipk[noexec] = "1"
+do_package_write_rpm[noexec] = "1"
+do_package_write_deb[noexec] = "1"
+do_poplulate_sysroot[noexec] = "1"
+
+addtask populate_adt before do_build after do_install
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 @@
# Your yocto distro repository, this should include IPKG based
packages and root filesystem files where the installation is based on
-YOCTOADT_REPO="http://adtrepo.yoctoproject.org/YOCTOADT_VERSION"
+YOCTOADT_REPO="ADTREPO"
# The following are for system wide setup
# 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..19c0fe5 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 @@
# Yocto ADT Installer bb file
#
-# Copyright 2010-2011 by Intel Corp.
+# Copyright 2010-2012 by Intel Corp.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the
"Software"), to deal
@@ -20,70 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
+require adt-installer.inc
-DESCRIPTION = "Meta package for creating sdk installer tarball"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-LICENSE = "MIT"
-
-ALLOW_EMPTY = "1"
-
-PACKAGES = ""
-
-PR = "r10"
-
-ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
-ADT_DIR = "${WORKDIR}/adt-installer/"
-YOCTOADT_VERSION = "${SDK_VERSION}"
-S = "${WORKDIR}/trunk"
-
-SRCREV = "596"
-PV = "0.1.8+svnr${SRCPV}"
-SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
- file://wget_cache.patch \
- file://adt_installer \
- file://scripts/adt_installer_internal \
- file://scripts/util \
- file://scripts/data_define \
- file://scripts/extract_rootfs \
- file://adt_installer.conf \
- file://opkg/conf/opkg-sdk-x86_64.conf \
- file://opkg/conf/opkg-sdk-i686.conf \
- "
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/adt-installer:"
ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}"
-
-do_populate_adt[umask] = "022"
-
-fakeroot do_populate_adt () {
- cd ${WORKDIR}
- mkdir -p ${ADT_DEPLOY}
- rm -f ${ADT_DEPLOY}/adt-installer.tar.bz2
- rm -rf ${ADT_DIR}
- mkdir -p ${ADT_DIR}/opkg/build
- cp -r opkg ${ADT_DIR}/
- sed -i -e 's#ADTREPO_URL#${ADTREPO}#' ${ADT_DIR}/opkg/conf/*.conf
- cp -r trunk ${ADT_DIR}/opkg/build/
- mv ${ADT_DIR}/opkg/build/trunk ${ADT_DIR}/opkg/build/opkg-svn
- cp -r scripts ${ADT_DIR}/
- 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 '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}
-}
-
-do_populate_adt[nostamp] = "1"
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-do_package[noexec] = "1"
-do_package_write[noexec] = "1"
-do_package_write_ipk[noexec] = "1"
-do_package_write_rpm[noexec] = "1"
-do_package_write_deb[noexec] = "1"
-do_poplulate_sysroot[noexec] = "1"
-
-addtask populate_adt before do_build after do_install
--
1.7.9.5
More information about the Openembedded-core
mailing list