summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-03 14:45:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:53:08 +0100
commitcbd1d867524dd86bb1b6922b5694e960db263e06 (patch)
treec1ff6ee16d7eef87126120c88ded9e5f504768e0
parentc8d739488574e422751f8d0f6052cdc0ef1429de (diff)
downloadpoky-cbd1d867524dd86bb1b6922b5694e960db263e06.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb23
-rw-r--r--meta/recipes-devtools/devel-config/distcc-config.bb25
-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.bb15
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 @@
1DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
2
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
6
7
8COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
9
10PR = "r25"
11
12SRC_URI = "file://distcc.sh"
13
14S = "${WORKDIR}"
15
16do_install() {
17 install -d ${D}${sysconfdir}/profile.d
18 install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/
19}
20
21RDEPENDS_${PN} = "distcc oprofileui-server bash"
22
23inherit 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 @@
1SUMMARY = "Sets up distcc for compilation on the target device"
2
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
6
7SRC_URI = "file://distcc.sh"
8
9S = "${WORKDIR}"
10
11# Default to the host machine for a running qemu session
12DISTCC_HOSTS ?= "192.168.7.1"
13
14do_configure() {
15 sed -i "s%@DISTCC_HOSTS@%${DISTCC_HOSTS}%" distcc.sh
16}
17
18do_install() {
19 install -d ${D}${sysconfdir}/profile.d
20 install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/
21}
22
23RDEPENDS_${PN} = "distcc"
24
25inherit 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 @@
1DISTCC_HOSTS="192.168.7.1" 1DISTCC_HOSTS="@DISTCC_HOSTS@"
2#DISTCC_VERBOSE="1" 2#DISTCC_VERBOSE="1"
3 3
4export DISTCC_HOSTS 4export 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 @@
1SUMMARY = "Provides a small set of tools for development on the device"
2LICENSE = "MIT"
3
4inherit packagegroup
5
6RPROVIDES_${PN} = "qemu-config"
7RREPLACES_${PN} = "qemu-config"
8
9RDEPENDS_${PN} = "\
10 distcc-config \
11 oprofileui-server \
12 nfs-export-root \
13 bash \
14 "
15