summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf4
-rw-r--r--meta/packages/oh/qemu-config.bb19
-rw-r--r--meta/packages/oh/qemu-config/distcc.sh4
-rw-r--r--meta/packages/oh/qemu-config/exports1
-rw-r--r--meta/packages/oh/qemu-distcc.bb15
5 files changed, 26 insertions, 17 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index f70c32ed59..cff8d45168 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -184,8 +184,8 @@ DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi"
184DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost" 184DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
185 185
186POKY_EXTRA_RDEPENDS = "" 186POKY_EXTRA_RDEPENDS = ""
187POKY_EXTRA_RDEPENDS_qemuarm = "qemu-distcc" 187POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
188POKY_EXTRA_RDEPENDS_qemux86 = "qemu-distcc" 188POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
189POKY_EXTRA_RDEPENDS_akita = "pointercal" 189POKY_EXTRA_RDEPENDS_akita = "pointercal"
190 190
191DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" 191DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
diff --git a/meta/packages/oh/qemu-config.bb b/meta/packages/oh/qemu-config.bb
new file mode 100644
index 0000000000..a042725fbe
--- /dev/null
+++ b/meta/packages/oh/qemu-config.bb
@@ -0,0 +1,19 @@
1DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
2LICENSE = "GPL"
3RDEPENDS = "distcc"
4PR = "r1"
5
6SRC_URI = "file://distcc.sh \
7 file://exports"
8
9S = "${WORKDIR}"
10
11COMPATIBLE_MACHINE = "(qemuarm|qemux86)"
12PACKAGE_ARCH = "all"
13
14do_install() {
15 install -d ${D}${sysconfdir}/profile.d
16
17 install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/
18 install -m 0644 exports ${D}${sysconfdir}
19}
diff --git a/meta/packages/oh/qemu-config/distcc.sh b/meta/packages/oh/qemu-config/distcc.sh
new file mode 100644
index 0000000000..a2b543d6b8
--- /dev/null
+++ b/meta/packages/oh/qemu-config/distcc.sh
@@ -0,0 +1,4 @@
1DISTCC_HOSTS="192.168.7.1"
2#DISTCC_VERBOSE="1"
3
4export DISTCC_HOSTS
diff --git a/meta/packages/oh/qemu-config/exports b/meta/packages/oh/qemu-config/exports
new file mode 100644
index 0000000000..56dc1e951b
--- /dev/null
+++ b/meta/packages/oh/qemu-config/exports
@@ -0,0 +1 @@
/ *(rw)
diff --git a/meta/packages/oh/qemu-distcc.bb b/meta/packages/oh/qemu-distcc.bb
deleted file mode 100644
index 26179aca70..0000000000
--- a/meta/packages/oh/qemu-distcc.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
2LICENSE = "GPL"
3RDEPENDS = "distcc"
4
5SRC_URI = "file://distcc.sh"
6S = "${WORKDIR}"
7
8COMPATIBLE_MACHINE = "(qemuarm|qemux86)"
9PACKAGE_ARCH = "all"
10
11do_install() {
12 install -d ${D}/etc
13 install -d ${D}/etc/profile.d
14 install distcc.sh ${D}/etc/profile.d/
15}