diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-09-03 14:45:42 +0100 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2012-09-03 22:52:55 -0700 |
commit | ac510cb82c007f987b481df74c7a5fede81fa85a (patch) | |
tree | 740b8af961ee6872257947dc58313a2c501e8e33 /meta | |
parent | c48f87a3fa9c61aaeedbcf5712a699c27d940a3b (diff) | |
download | openembedded-core-ac510cb82c007f987b481df74c7a5fede81fa85a.tar.gz openembedded-core-ac510cb82c007f987b481df74c7a5fede81fa85a.tar.bz2 openembedded-core-ac510cb82c007f987b481df74c7a5fede81fa85a.zip |
qemu-config: turn into distcc-config and a package group
* Create a new packagegroup-core-device-devel which pulls in everything
that qemu-config used to, with the exception of anjuta-remote-run -
this is unlikely to be widely used
* Move the remainder of qemu-config to distcc-config and allow
DISTCC_HOSTS to be configured via a variable of the same name
* Use SUMMARY instead of DESCRIPTION for single-line description since
DESCRIPTION is defaulted from SUMMARY if not set
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-bsp/qemu-config/qemu-config.bb | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/devel-config/distcc-config.bb | 25 | ||||
-rw-r--r-- | meta/recipes-devtools/devel-config/distcc-config/distcc.sh (renamed from meta/recipes-bsp/qemu-config/qemu-config/distcc.sh) | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb | 15 |
4 files changed, 41 insertions, 24 deletions
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb deleted file mode 100644 index 3ed07df91a..0000000000 --- a/meta/recipes-bsp/qemu-config/qemu-config.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - - -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)" - -PR = "r25" - -SRC_URI = "file://distcc.sh" - -S = "${WORKDIR}" - -do_install() { - install -d ${D}${sysconfdir}/profile.d - install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/ -} - -RDEPENDS_${PN} = "distcc oprofileui-server bash" - -inherit allarch diff --git a/meta/recipes-devtools/devel-config/distcc-config.bb b/meta/recipes-devtools/devel-config/distcc-config.bb new file mode 100644 index 0000000000..8deaa66589 --- /dev/null +++ b/meta/recipes-devtools/devel-config/distcc-config.bb @@ -0,0 +1,25 @@ +SUMMARY = "Sets up distcc for compilation on the target device" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://distcc.sh" + +S = "${WORKDIR}" + +# Default to the host machine for a running qemu session +DISTCC_HOSTS ?= "192.168.7.1" + +do_configure() { + sed -i "s%@DISTCC_HOSTS@%${DISTCC_HOSTS}%" distcc.sh +} + +do_install() { + install -d ${D}${sysconfdir}/profile.d + install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/ +} + +RDEPENDS_${PN} = "distcc" + +inherit allarch diff --git a/meta/recipes-bsp/qemu-config/qemu-config/distcc.sh b/meta/recipes-devtools/devel-config/distcc-config/distcc.sh index a2b543d6b8..b4205931dc 100644 --- a/meta/recipes-bsp/qemu-config/qemu-config/distcc.sh +++ b/meta/recipes-devtools/devel-config/distcc-config/distcc.sh @@ -1,4 +1,4 @@ -DISTCC_HOSTS="192.168.7.1" +DISTCC_HOSTS="@DISTCC_HOSTS@" #DISTCC_VERBOSE="1" export DISTCC_HOSTS diff --git a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb b/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb new file mode 100644 index 0000000000..e55eed52e3 --- /dev/null +++ b/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb @@ -0,0 +1,15 @@ +SUMMARY = "Provides a small set of tools for development on the device" +LICENSE = "MIT" + +inherit packagegroup + +RPROVIDES_${PN} = "qemu-config" +RREPLACES_${PN} = "qemu-config" + +RDEPENDS_${PN} = "\ + distcc-config \ + oprofileui-server \ + nfs-export-root \ + bash \ + " + |