From: Joshua Lock <josh@linux.intel.com>
Date: Fri, 2 Sep 2011 21:30:43 +0000 (-0700)
Subject: scripts/hob: update to match recent hob changes
X-Git-Tag: 2011-1~169
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b68f90b765e7c8923033ee7ff7746f39a2e91ff7;p=openembedded-core.git

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 <josh@linux.intel.com>
---

diff --git a/scripts/hob b/scripts/hob
index 19930bab32..bb88a76135 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