diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-09-03 14:45:38 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:53:07 +0100 |
commit | 125650776991e40168dcab1dca372cc3ebe1d490 (patch) | |
tree | e73e3941f4550833004d18e62bb7fe8a5065f387 /meta/recipes-bsp | |
parent | 80908c9f83660c10e39bd5ffb48bb6e417d14006 (diff) | |
download | poky-125650776991e40168dcab1dca372cc3ebe1d490.tar.gz |
qemu-config: split out anjuta-remote-run
Given that support for Anjuta is unlikely to be needed by everyone and
is by no means specific to qemu, split it out to a separate recipe. The
following changes were made in the process:
Also depend on dbus instead of dbus-x11 since dbus-launch is now back in
he main dbus package
Part of the fix for [YOCTO #1690].
(From OE-Core rev: e6755e3351ccf1116c06b9608728630505908ce4)
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>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/qemu-config/qemu-config.bb | 6 | ||||
-rw-r--r-- | meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run | 7 |
2 files changed, 1 insertions, 12 deletions
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb index ac3e7f3dad..6775af34e3 100644 --- a/meta/recipes-bsp/qemu-config/qemu-config.bb +++ b/meta/recipes-bsp/qemu-config/qemu-config.bb | |||
@@ -10,7 +10,6 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)" | |||
10 | PR = "r25" | 10 | PR = "r25" |
11 | 11 | ||
12 | SRC_URI = "file://distcc.sh \ | 12 | SRC_URI = "file://distcc.sh \ |
13 | file://anjuta-remote-run \ | ||
14 | file://exports \ | 13 | file://exports \ |
15 | file://shutdown.desktop \ | 14 | file://shutdown.desktop \ |
16 | file://qemu-autostart" | 15 | file://qemu-autostart" |
@@ -23,9 +22,6 @@ do_install() { | |||
23 | install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/ | 22 | install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/ |
24 | install -m 0644 exports ${D}${sysconfdir}/ | 23 | install -m 0644 exports ${D}${sysconfdir}/ |
25 | 24 | ||
26 | install -d ${D}${bindir} | ||
27 | install -m 0755 anjuta-remote-run ${D}${bindir}/ | ||
28 | |||
29 | install -d ${D}${datadir}/applications | 25 | install -d ${D}${datadir}/applications |
30 | install -m 0644 shutdown.desktop ${D}${datadir}/applications/ | 26 | install -m 0644 shutdown.desktop ${D}${datadir}/applications/ |
31 | 27 | ||
@@ -38,7 +34,7 @@ pkg_postinst_${PN} () { | |||
38 | sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' | 34 | sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' |
39 | } | 35 | } |
40 | 36 | ||
41 | RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} packagegroup-core-nfs-server oprofileui-server rsync bash" | 37 | RDEPENDS_${PN} = "distcc packagegroup-core-nfs-server oprofileui-server bash" |
42 | 38 | ||
43 | inherit update-rc.d allarch | 39 | inherit update-rc.d allarch |
44 | 40 | ||
diff --git a/meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run b/meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run deleted file mode 100644 index 620e3a705b..0000000000 --- a/meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . /etc/profile | ||
4 | export DISPLAY=:0 | ||
5 | dbus-launch $@ | ||
6 | |||
7 | |||