Patchwork [1/2] scripts/hob: update to match recent hob changes

login
register
mail settings
Submitter Joshua Lock
Date Sept. 3, 2011, 12:19 a.m.
Message ID <b53adc180f983f025811d52bde2d7918385f182a.1315008793.git.josh@linux.intel.com>
Download mbox | patch
Permalink /patch/10915/
State New, archived
Headers show

Comments

Joshua Lock - Sept. 3, 2011, 12:19 a.m.
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 <josh@linux.intel.com>
---
 scripts/hob |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

Patch

diff --git a/scripts/hob b/scripts/hob
index 19930ba..bb88a76 100755
--- a/scripts/hob
+++ b/scripts/hob
@@ -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