summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-03-11 12:13:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-12 22:11:46 +0000
commit8ea5cdc77633831a34aeb09ccd7592b3a5ecbd3d (patch)
tree4f8f4062b0a50b75fe8fd0959913c5451c22865b
parentff5d9f760754cf2f049a41e1dd6d2e6eeea0bfdc (diff)
downloadpoky-8ea5cdc77633831a34aeb09ccd7592b3a5ecbd3d.tar.gz
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. (From OE-Core rev: cd43436def38a0a87f0cd330fa487ad5fc0748d0) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/builder/builder_0.1.bb10
-rw-r--r--meta/recipes-graphics/builder/files/builder_session.sh (renamed from meta/recipes-graphics/builder/files/builder_hob_start.sh)4
-rw-r--r--meta/recipes-graphics/builder/files/please_wait_dialog.py28
3 files changed, 4 insertions, 38 deletions
diff --git a/meta/recipes-graphics/builder/builder_0.1.bb b/meta/recipes-graphics/builder/builder_0.1.bb
index bb729fce22..0a64c31ab3 100644
--- 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
3SECTION = "x11" 3SECTION = "x11"
4PR = "r6" 4PR = "r6"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://builder_hob_start.sh;endline=5;md5=84796c3c41785d86100fdabcbdade00e" 6LIC_FILES_CHKSUM = "file://builder_session.sh;endline=5;md5=84796c3c41785d86100fdabcbdade00e"
7 7
8SRC_URI = "file://builder_hob_start.sh \ 8SRC_URI = "file://builder_session.sh \
9 file://please_wait_dialog.py \
10 " 9 "
11 10
12S = "${WORKDIR}" 11S = "${WORKDIR}"
@@ -25,9 +24,8 @@ USERADD_PARAM_${PN} = "--system --create-home \
25 24
26do_install () { 25do_install () {
27 install -d -m 755 ${D}${sysconfdir}/mini_x/session.d 26 install -d -m 755 ${D}${sysconfdir}/mini_x/session.d
28 install -p -m 755 builder_hob_start.sh ${D}${sysconfdir}/mini_x/session.d/ 27 install -p -m 755 builder_session.sh ${D}${sysconfdir}/mini_x/session.d/
29 28
30 chown builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_hob_start.sh 29 chown builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_session.sh
31 install -p -m 755 please_wait_dialog.py ${D}${sysconfdir}/mini_x
32} 30}
33 31
diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/meta/recipes-graphics/builder/files/builder_session.sh
index b394b0905e..001a03357d 100644
--- a/meta/recipes-graphics/builder/files/builder_hob_start.sh
+++ b/meta/recipes-graphics/builder/files/builder_session.sh
@@ -30,8 +30,4 @@ fi
30cd /home/builder/poky 30cd /home/builder/poky
31. ./oe-init-build-env 31. ./oe-init-build-env
32 32
33hob &
34
35matchbox-terminal& 33matchbox-terminal&
36
37/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
index fd2381bc88..0000000000
--- a/meta/recipes-graphics/builder/files/please_wait_dialog.py
+++ /dev/null
@@ -1,28 +0,0 @@
1#!/usr/bin/env python
2import glib
3import gtk
4
5def destroy_window_cb(widget, event):
6 gtk.main_quit()
7
8def all_done_cb():
9 gtk.main_quit()
10
11def dialogue_ui():
12 window = gtk.Window()
13 window.set_title("Please wait...")
14 window.connect("delete-event", destroy_window_cb)
15 window.show()
16 window.set_border_width(12)
17
18 msg = "Please wait while BitBake initializes Hob"
19 label = gtk.Label(msg)
20 label.show()
21 window.add(label)
22
23 glib.timeout_add_seconds(10, all_done_cb)
24
25if __name__ == "__main__":
26 dialogue_ui()
27 gtk.main()
28