builder: remove hob from autostart

hob has been removed so don't try and autostart it with the mini-x
session in the build appliance.

Remove the please_wait_dialog program which informed the user to
wait for Hob to start.

Rename the mini-x autostart file to reflect the removal of hob, we
now just start a matchbox-terminal with the environment configured.

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/builder/builder_0.1.bb b/meta/recipes-graphics/builder/builder_0.1.bb
index bb729fce22097317a445c8767a6365f6ada9cfb8..0a64c31ab3c9a0002b87a6daebeb544b60cdb44f 100644 (file)
--- a/meta/recipes-graphics/builder/builder_0.1.bb
+++ b/meta/recipes-graphics/builder/builder_0.1.bb
@@ -3,10 +3,9 @@ DESCRIPTION = "This recipe create a new user named ${PN}, who is used for specif
 SECTION = "x11"
 PR = "r6"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://builder_hob_start.sh;endline=5;md5=84796c3c41785d86100fdabcbdade00e"
+LIC_FILES_CHKSUM = "file://builder_session.sh;endline=5;md5=84796c3c41785d86100fdabcbdade00e"
 
-SRC_URI = "file://builder_hob_start.sh \
-           file://please_wait_dialog.py \
+SRC_URI = "file://builder_session.sh \
           "
 
 S = "${WORKDIR}"
@@ -25,9 +24,8 @@ USERADD_PARAM_${PN} = "--system --create-home \
 
 do_install () {
        install -d -m 755 ${D}${sysconfdir}/mini_x/session.d
-       install -p -m 755 builder_hob_start.sh ${D}${sysconfdir}/mini_x/session.d/
+       install -p -m 755 builder_session.sh ${D}${sysconfdir}/mini_x/session.d/
 
-       chown  builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_hob_start.sh
-        install -p -m 755 please_wait_dialog.py ${D}${sysconfdir}/mini_x
+       chown  builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_session.sh
 }
 

diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/meta/recipes-graphics/builder/files/builder_session.sh
similarity index 96%
rename from meta/recipes-graphics/builder/files/builder_hob_start.sh
rename to meta/recipes-graphics/builder/files/builder_session.sh
index b394b0905ed680ce6e02879ea9c2780ddaf4f059..001a03357df6768c30aecf9f7698853ac6b13ba9 100644 (file)
--- a/meta/recipes-graphics/builder/files/builder_hob_start.sh
+++ b/meta/recipes-graphics/builder/files/builder_session.sh
@@ -30,8 +30,4 @@ fi
 cd /home/builder/poky
 . ./oe-init-build-env
 
-hob &
-
 matchbox-terminal&
-
-/etc/mini_x/please_wait_dialog.py &

diff --git a/meta/recipes-graphics/builder/files/please_wait_dialog.py b/meta/recipes-graphics/builder/files/please_wait_dialog.py
deleted file mode 100644 (file)
index fd2381b..0000000
--- a/meta/recipes-graphics/builder/files/please_wait_dialog.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-import glib
-import gtk
- 
-def destroy_window_cb(widget, event):
-    gtk.main_quit()
- 
-def all_done_cb():
-    gtk.main_quit()
- 
-def dialogue_ui():
-    window = gtk.Window()
-    window.set_title("Please wait...")
-    window.connect("delete-event", destroy_window_cb)
-    window.show()
-    window.set_border_width(12)
- 
-    msg = "Please wait while BitBake initializes Hob"
-    label = gtk.Label(msg)
-    label.show()
-    window.add(label)
- 
-    glib.timeout_add_seconds(10, all_done_cb)
- 
-if __name__ == "__main__":
-    dialogue_ui()
-    gtk.main()
-