summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-09-02 14:30:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-06 16:37:01 +0100
commit886440c535fdd0b39568a3acdcace677827d9f0f (patch)
tree963a07262a947a1417bf811001e1f9220734c5b6 /scripts
parent314131e472a7d728ea96cbd577d2947d7bc9f50e (diff)
downloadpoky-886440c535fdd0b39568a3acdcace677827d9f0f.tar.gz
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] (From OE-Core rev: b68f90b765e7c8923033ee7ff7746f39a2e91ff7) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/hob20
1 files changed, 15 insertions, 5 deletions
diff --git a/scripts/hob b/scripts/hob
index 19930bab32..bb88a76135 100755
--- a/scripts/hob
+++ b/scripts/hob
@@ -1,18 +1,28 @@
1#!/usr/bin/env bash 1#!/usr/bin/env bash
2if ! (test -r "$BUILDDIR/conf/hob.local.conf"); then 2if ! (test -r "$BUILDDIR/conf/hob-pre.conf"); then
3 cat <<EOM 3 cat <<EOM
4You had no conf/hob.local.conf file. An initial version of this configuration 4You had no conf/hob-pre.conf file. An initial version of this configuration
5file has therefore been created for you. This file will be used to store any 5file has therefore been created for you. This file will be used to store
6configuration values you set in hob.
7
8EOM
9touch conf/hob-pre.conf
10fi
11
12if ! (test -r "$BUILDDIR/conf/hob-post.conf"); then
13 cat <<EOM
14You had no conf/hob-post.conf file. An initial version of this configuration
15file has therefore been created for you. This file will be used to store
6configuration values you set in hob. 16configuration values you set in hob.
7 17
8EOM 18EOM
9(cat <<EOF 19(cat <<EOF
10INHERIT += "image_types" 20INHERIT += "image_types"
11EOF 21EOF
12) > conf/hob.local.conf 22) > conf/hob-post.conf
13fi 23fi
14 24
15bitbake -R conf/hob.local.conf -t xmlrpc -u hob 25bitbake -r conf/hob-pre.conf -R conf/hob-post.conf -u hob
16 26
17ret=$? 27ret=$?
18exit $ret 28exit $ret