summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/oh/qemu-config.bb8
-rwxr-xr-xmeta/packages/oh/qemu-config/poky-chroot-init7
-rwxr-xr-xmeta/packages/oh/qemu-config/poky-chroot-launch26
3 files changed, 2 insertions, 39 deletions
diff --git a/meta/packages/oh/qemu-config.bb b/meta/packages/oh/qemu-config.bb
index f1b7de74aa..fc59320282 100644
--- a/meta/packages/oh/qemu-config.bb
+++ b/meta/packages/oh/qemu-config.bb
@@ -1,14 +1,12 @@
1DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" 1DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
2LICENSE = "GPL" 2LICENSE = "GPL"
3RDEPENDS = "distcc task-poky-nfs-server fakeroot oprofileui-server rsync bash" 3RDEPENDS = "distcc task-poky-nfs-server oprofileui-server rsync bash"
4PR = "r16" 4PR = "r17"
5 5
6SRC_URI = "file://distcc.sh \ 6SRC_URI = "file://distcc.sh \
7 file://anjuta-remote-run \ 7 file://anjuta-remote-run \
8 file://exports \ 8 file://exports \
9 file://shutdown.desktop \ 9 file://shutdown.desktop \
10 file://poky-chroot-init \
11 file://poky-chroot-launch \
12 file://qemu-autostart" 10 file://qemu-autostart"
13 11
14S = "${WORKDIR}" 12S = "${WORKDIR}"
@@ -24,8 +22,6 @@ do_install() {
24 22
25 install -d ${D}${bindir} 23 install -d ${D}${bindir}
26 install -m 0755 anjuta-remote-run ${D}${bindir}/ 24 install -m 0755 anjuta-remote-run ${D}${bindir}/
27 install -m 0775 poky-chroot-init ${D}${bindir}/
28 install -m 0775 poky-chroot-launch ${D}${bindir}/
29 25
30 install -d ${D}${datadir}/applications 26 install -d ${D}${datadir}/applications
31 install -m 0644 shutdown.desktop ${D}${datadir}/applications/ 27 install -m 0644 shutdown.desktop ${D}${datadir}/applications/
diff --git a/meta/packages/oh/qemu-config/poky-chroot-init b/meta/packages/oh/qemu-config/poky-chroot-init
deleted file mode 100755
index 0afa505100..0000000000
--- a/meta/packages/oh/qemu-config/poky-chroot-init
+++ /dev/null
@@ -1,7 +0,0 @@
1#!/bin/bash
2
3export USER=root
4export HOME=/home/root
5export PATH=/sbin:/bin:/usr/sbin:/usr/bin
6
7fakeroot ipkg configure
diff --git a/meta/packages/oh/qemu-config/poky-chroot-launch b/meta/packages/oh/qemu-config/poky-chroot-launch
deleted file mode 100755
index dbc432b66c..0000000000
--- a/meta/packages/oh/qemu-config/poky-chroot-launch
+++ /dev/null
@@ -1,26 +0,0 @@
1#!/bin/bash
2
3export USER=root
4export HOME=/home/root
5export PATH=/sbin:/bin:/usr/sbin:/usr/bin
6
7export DISPLAY=:1
8
9unset DBUS_SESSION_BUS_ADDRESS
10
11SERVICES=dbus-1
12
13for S in $SERVICES; do
14 fakeroot /etc/init.d/$S start
15done
16
17/etc/X11/Xsession &
18
19bash -l
20
21# The --user option in the dbus stop script breaks under chroot
22/sbin/start-stop-daemon --stop --pidfile /var/run/dbus/pid
23
24for S in $SERVICES; do
25 fakeroot /etc/init.d/$S stop
26done