[Subtree] Bring openbmc machines to top level
The new subtree model brings the subtrees up from the openbmc-machines
layer.
Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/setup b/setup
index 109c83d..05a1c38 100755
--- a/setup
+++ b/setup
@@ -23,25 +23,23 @@
machine() {
local target=$1
- local arch mfg mach realmach
- for arch in meta-openbmc-machines/meta-*; do
- for mfg in $arch/meta-*; do
- for mach in $mfg/meta-*; do
- if [ -d "$mach" -a -d "$mach/conf/machine" ]; then
- realmach=${mach##*meta-}
- # If a target is specified, then check for a match,
- # otherwise just list what we've discovered
- if [ -n "$target" ]; then
- if [ "$realmach" = "$target" ]; then
- echo Machine $target is $mach
- TEMPLATECONF="$mach/conf" source oe-init-build-env build
- return
- fi
- else
- echo "$realmach"
+ local mfg mach realmach
+ for mfg in meta-*; do
+ for mach in $mfg/meta-*; do
+ if [ -d "$mach" -a -d "$mach/conf/machine" ]; then
+ realmach=${mach##*meta-}
+ # If a target is specified, then check for a match,
+ # otherwise just list what we've discovered
+ if [ -n "$target" ]; then
+ if [ "$realmach" = "$target" ]; then
+ echo Machine $target is $mach
+ TEMPLATECONF="$mach/conf" source oe-init-build-env build
+ return
fi
+ else
+ echo "$realmach"
fi
- done
+ fi
done
done