From caab7fc509bf27706ff3248689f6afd04225cfda Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 1 Sep 2010 15:08:09 +0100
Subject: Drop chroot usage as its not well used, tested and is broken

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/oh/qemu-config.bb                 |  8 ++------
 meta/packages/oh/qemu-config/poky-chroot-init   |  7 -------
 meta/packages/oh/qemu-config/poky-chroot-launch | 26 -------------------------
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100755 meta/packages/oh/qemu-config/poky-chroot-init
 delete mode 100755 meta/packages/oh/qemu-config/poky-chroot-launch

(limited to 'meta')

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 @@
 DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
 LICENSE = "GPL"
-RDEPENDS = "distcc task-poky-nfs-server fakeroot oprofileui-server rsync bash"
-PR = "r16"
+RDEPENDS = "distcc task-poky-nfs-server oprofileui-server rsync bash"
+PR = "r17"
 
 SRC_URI = "file://distcc.sh \
            file://anjuta-remote-run \
            file://exports \
            file://shutdown.desktop \
-           file://poky-chroot-init \
-           file://poky-chroot-launch \
            file://qemu-autostart"
 
 S = "${WORKDIR}"
@@ -24,8 +22,6 @@ do_install() {
     
     install -d ${D}${bindir}
     install -m 0755 anjuta-remote-run ${D}${bindir}/
-    install -m 0775 poky-chroot-init ${D}${bindir}/
-    install -m 0775 poky-chroot-launch ${D}${bindir}/
     
     install -d ${D}${datadir}/applications
     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 @@
-#!/bin/bash
-
-export USER=root
-export HOME=/home/root
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-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 @@
-#!/bin/bash
-
-export USER=root
-export HOME=/home/root
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-export DISPLAY=:1
-
-unset DBUS_SESSION_BUS_ADDRESS
-
-SERVICES=dbus-1
-
-for S in $SERVICES; do
-        fakeroot /etc/init.d/$S start
-done
-
-/etc/X11/Xsession &
-
-bash -l
-
-# The --user option in the dbus stop script breaks under chroot
-/sbin/start-stop-daemon --stop  --pidfile /var/run/dbus/pid
-
-for S in $SERVICES; do
-        fakeroot /etc/init.d/$S stop
-done
-- 
cgit v1.2.3-54-g00ecf