summaryrefslogtreecommitdiff
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-05 20:28:20 +0100
commitb68f90b765e7c8923033ee7ff7746f39a2e91ff7 (patch)
tree2a3ee76304a1ff031da5529822ed9da6e3dbba43 /scripts
parentd19eaf7ca92c6632d42d12120800028f77ef21aa (diff)
downloadopenembedded-core-b68f90b765e7c8923033ee7ff7746f39a2e91ff7.tar.gz
openembedded-core-b68f90b765e7c8923033ee7ff7746f39a2e91ff7.tar.bz2
openembedded-core-b68f90b765e7c8923033ee7ff7746f39a2e91ff7.tar.xz
openembedded-core-b68f90b765e7c8923033ee7ff7746f39a2e91ff7.zip
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/hob20
1 files changed, 15 insertions, 5 deletions
diff --git a/scripts/hob b/scripts/hob
index 19930bab3..bb88a7613 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