diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 15:08:09 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 15:08:45 +0100 |
| commit | caab7fc509bf27706ff3248689f6afd04225cfda (patch) | |
| tree | f832f656c91502303968fcee1aae382b9f713626 /meta/packages/oh | |
| parent | 232ef8430e2cfbf6eee54f602dc74b9986e3997f (diff) | |
| download | poky-caab7fc509bf27706ff3248689f6afd04225cfda.tar.gz | |
Drop chroot usage as its not well used, tested and is broken
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/oh')
| -rw-r--r-- | meta/packages/oh/qemu-config.bb | 8 | ||||
| -rwxr-xr-x | meta/packages/oh/qemu-config/poky-chroot-init | 7 | ||||
| -rwxr-xr-x | meta/packages/oh/qemu-config/poky-chroot-launch | 26 |
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 @@ | |||
| 1 | DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" | 1 | DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" |
| 2 | LICENSE = "GPL" | 2 | LICENSE = "GPL" |
| 3 | RDEPENDS = "distcc task-poky-nfs-server fakeroot oprofileui-server rsync bash" | 3 | RDEPENDS = "distcc task-poky-nfs-server oprofileui-server rsync bash" |
| 4 | PR = "r16" | 4 | PR = "r17" |
| 5 | 5 | ||
| 6 | SRC_URI = "file://distcc.sh \ | 6 | SRC_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 | ||
| 14 | S = "${WORKDIR}" | 12 | S = "${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 | |||
| 3 | export USER=root | ||
| 4 | export HOME=/home/root | ||
| 5 | export PATH=/sbin:/bin:/usr/sbin:/usr/bin | ||
| 6 | |||
| 7 | fakeroot 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 | |||
| 3 | export USER=root | ||
| 4 | export HOME=/home/root | ||
| 5 | export PATH=/sbin:/bin:/usr/sbin:/usr/bin | ||
| 6 | |||
| 7 | export DISPLAY=:1 | ||
| 8 | |||
| 9 | unset DBUS_SESSION_BUS_ADDRESS | ||
| 10 | |||
| 11 | SERVICES=dbus-1 | ||
| 12 | |||
| 13 | for S in $SERVICES; do | ||
| 14 | fakeroot /etc/init.d/$S start | ||
| 15 | done | ||
| 16 | |||
| 17 | /etc/X11/Xsession & | ||
| 18 | |||
| 19 | bash -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 | |||
| 24 | for S in $SERVICES; do | ||
| 25 | fakeroot /etc/init.d/$S stop | ||
| 26 | done | ||
