Skip to contentSkip to conversation

Patches for hob wrapper script

PATCH Applied Joshua Lock 2 participants 4 messages Sep 3, 2011 – Sep 5, 2011

lore
Share & tools
lore

Joshua Lock

author
#0 lore raw

cover Patches for hob wrapper script

This series adapts the wrapper script to provide 2 configuration files, as required by the patch series I just sent to the BitBake list, and warns the user that the UI may not be shown immediately if pseudo may need building.

Regards,
Joshua

The following changes since commit 6b5706d1f9ce7a3fd4d8f819ff8f3fd789665647:

scripts: Show sensible warning messages if expected binaries don't exist (2011-09-02 14:20:32 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/hob
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/hob

Joshua Lock (2):
scripts/hob: update to match recent hob changes scripts/hob: notify the user when the GUI won't launch immediately

 scripts/hob |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/2 scripts/hob: update to match recent hob changes

hob now uses both a pre and post file, update the wrapper script to generate and use both of these.

Addresses [YOCTO #1281]

Signed-off-by Joshua Lock <[email protected]>
---
 scripts/hob |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)
scripts/hob +15 -5
index 19930ba..bb88a76 100755
@@ -1,18 +1,28 @@
 #!/usr/bin/env bash
-if ! (test -r "$BUILDDIR/conf/hob.local.conf"); then
+if ! (test -r "$BUILDDIR/conf/hob-pre.conf"); then
     cat <<EOM
-You had no conf/hob.local.conf file. An initial version of this configuration
-file has therefore been created for you. This file will be used to store any
+You had no conf/hob-pre.conf file. An initial version of this configuration
+file has therefore been created for you. This file will be used to store
+configuration values you set in hob.
+
+EOM
+touch conf/hob-pre.conf
+fi
+
+if ! (test -r "$BUILDDIR/conf/hob-post.conf"); then
+    cat <<EOM
+You had no conf/hob-post.conf file. An initial version of this configuration
+file has therefore been created for you. This file will be used to store
 configuration values you set in hob.
 
 EOM
 (cat <<EOF
 INHERIT += "image_types"
 EOF
-) > conf/hob.local.conf
+) > conf/hob-post.conf
 fi
 
-bitbake -R conf/hob.local.conf -t xmlrpc -u hob
+bitbake -r conf/hob-pre.conf -R conf/hob-post.conf -u hob
 
 ret=$?
 exit $ret
Signature · 1 line
1.7.6
author
#2 lore raw

PATCH 2/2 scripts/hob: notify the user when the GUI won't launch immediately

In reply to Joshua Lock

If the wrapper script needs to build pseudo before we can launch hob we need to notify the user so they aren't shocked by the action of launching a GUI and seeing a bunch of text whiz by on the console.

Fixes [YOCTO #1435]

Signed-off-by Joshua Lock <[email protected]>
---
 scripts/hob |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
scripts/hob +5 -0
index bb88a76..480413b 100755
@@ -22,6 +22,11 @@ EOF
 ) > conf/hob-post.conf
 fi
 
+# Users don't like to launch GUI's and see a bunch of text whiz by, notify them
+if [ ! -e "$BUILDDIR/pseudodone" ]; then
+    echo "Before we can launch the GUI we need to build some native tools required for running"
+fi
+
 bitbake -r conf/hob-pre.conf -R conf/hob-post.conf -u hob
 
 ret=$?
Signature · 1 line
1.7.6
Applied
#3 lore raw
In reply to Joshua Lock
Quoted 11 lines · Joshua Lock

This series adapts the wrapper script to provide 2 configuration files, as required by the patch series I just sent to the BitBake list, and warns the user that the UI may not be shown immediately if pseudo may need building.

Regards,
Joshua

The following changes since commit 6b5706d1f9ce7a3fd4d8f819ff8f3fd789665647:

scripts: Show sensible warning messages if expected binaries don't exist (2011-09-02 14:20:32 +0100)

Quoted 7 lines

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/hob
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/hob

Joshua Lock (2):
scripts/hob: update to match recent hob changes scripts/hob: notify the user when the GUI won't launch immediately

Merged to master, thanks.

Richard