From cbd1d867524dd86bb1b6922b5694e960db263e06 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 3 Sep 2012 14:45:42 +0100 Subject: 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 (From OE-Core rev: ac510cb82c007f987b481df74c7a5fede81fa85a) Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-bsp/qemu-config/qemu-config.bb | 23 -------------------- meta/recipes-bsp/qemu-config/qemu-config/distcc.sh | 4 ---- .../recipes-devtools/devel-config/distcc-config.bb | 25 ++++++++++++++++++++++ .../devel-config/distcc-config/distcc.sh | 4 ++++ .../packagegroup-core-device-devel.bb | 15 +++++++++++++ 5 files changed, 44 insertions(+), 27 deletions(-) delete mode 100644 meta/recipes-bsp/qemu-config/qemu-config.bb delete mode 100644 meta/recipes-bsp/qemu-config/qemu-config/distcc.sh create mode 100644 meta/recipes-devtools/devel-config/distcc-config.bb create mode 100644 meta/recipes-devtools/devel-config/distcc-config/distcc.sh 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-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-bsp/qemu-config/qemu-config/distcc.sh b/meta/recipes-bsp/qemu-config/qemu-config/distcc.sh deleted file mode 100644 index a2b543d6b8..0000000000 --- a/meta/recipes-bsp/qemu-config/qemu-config/distcc.sh +++ /dev/null @@ -1,4 +0,0 @@ -DISTCC_HOSTS="192.168.7.1" -#DISTCC_VERBOSE="1" - -export DISTCC_HOSTS 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-devtools/devel-config/distcc-config/distcc.sh b/meta/recipes-devtools/devel-config/distcc-config/distcc.sh new file mode 100644 index 0000000000..b4205931dc --- /dev/null +++ b/meta/recipes-devtools/devel-config/distcc-config/distcc.sh @@ -0,0 +1,4 @@ +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 \ + " + -- cgit v1.2.3-54-g00ecf