diff options
-rw-r--r-- | meta/conf/distro/poky.conf | 4 | ||||
-rw-r--r-- | meta/packages/oh/qemu-config.bb | 19 | ||||
-rw-r--r-- | meta/packages/oh/qemu-config/distcc.sh | 4 | ||||
-rw-r--r-- | meta/packages/oh/qemu-config/exports | 1 | ||||
-rw-r--r-- | meta/packages/oh/qemu-distcc.bb | 15 |
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" DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost" POKY_EXTRA_RDEPENDS = "" -POKY_EXTRA_RDEPENDS_qemuarm = "qemu-distcc" -POKY_EXTRA_RDEPENDS_qemux86 = "qemu-distcc" +POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" +POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config" POKY_EXTRA_RDEPENDS_akita = "pointercal" DISTRO_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 @@ +DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" +LICENSE = "GPL" +RDEPENDS = "distcc" +PR = "r1" + +SRC_URI = "file://distcc.sh \ + file://exports" + +S = "${WORKDIR}" + +COMPATIBLE_MACHINE = "(qemuarm|qemux86)" +PACKAGE_ARCH = "all" + +do_install() { + install -d ${D}${sysconfdir}/profile.d + + install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/ + install -m 0644 exports ${D}${sysconfdir} +} 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 @@ +DISTCC_HOSTS="192.168.7.1" +#DISTCC_VERBOSE="1" + +export 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 @@ -DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" -LICENSE = "GPL" -RDEPENDS = "distcc" - -SRC_URI = "file://distcc.sh" -S = "${WORKDIR}" - -COMPATIBLE_MACHINE = "(qemuarm|qemux86)" -PACKAGE_ARCH = "all" - -do_install() { - install -d ${D}/etc - install -d ${D}/etc/profile.d - install distcc.sh ${D}/etc/profile.d/ -} |