* 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 <[email protected]> --- .../devel-config/distcc-config.bb} | 20 +++++++++++--------- .../devel-config/distcc-config}/distcc.sh | 2 +- .../packagegroup-core-device-devel.bb | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 10 deletions(-) rename meta/{recipes-bsp/qemu-config/qemu-config.bb => recipes-devtools/devel-config/distcc-config.bb} (44%) rename meta/{recipes-bsp/qemu-config/qemu-config => recipes-devtools/devel-config/distcc-config}/distcc.sh (57%) create mode 100644 meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-devtools/devel-config/distcc-config.bb similarity index 44% rename from meta/recipes-bsp/qemu-config/qemu-config.bb rename to meta/recipes-devtools/devel-config/distcc-config.bb index 3ed07df..8deaa66 100644 --- a/meta/recipes-bsp/qemu-config/qemu-config.bb +++ b/meta/recipes-devtools/devel-config/distcc-config.bb @@ -1,23 +1,25 @@ -DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" +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" - -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)" - -PR = "r25" - 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/ + install -d ${D}${sysconfdir}/profile.d + install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/ } -RDEPENDS_${PN} = "distcc oprofileui-server bash" +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 similarity index 57% rename from meta/recipes-bsp/qemu-config/qemu-config/distcc.sh rename to meta/recipes-devtools/devel-config/distcc-config/distcc.sh index a2b543d..b420593 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 0000000..e55eed5 --- /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 \ + " + -- 1.7.9.5 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
