setup-mel-builddir: source meta-mentor/pre-setup.$MACHINE

This lets us alter layer inclusion on a per-machine basis. Signed-off-by: Christopher Larson <kergoth@gmail.com>
MentorEmbedded · May 15, 2015 · 31daed3 · 31daed3
1 parent 1d814f1
commit 31daed3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/scripts/setup-mel-builddir b/scripts/setup-mel-builddir
@@ -98,6 +98,7 @@ configure_for_machine () {
         set --
     fi
 
+
     sed -i -e"s/^#*MACHINE *?*=.*/MACHINE ??= \"$MACHINE\"/" $BUILDDIR/conf/local.conf
     sed -n -i -e "s|##COREBASE##|$OEROOT|g" -e '/^BBLAYERS /{ :start; /\\$/{n; b start}; d; }; p' $BUILDDIR/conf/bblayers.conf
 
@@ -270,6 +271,9 @@ setup_builddir () {
     fi
 
     if [ -n "$MACHINE" ]; then
+        if [ -e "$layerdir/pre-setup.$MACHINE" ]; then
+            . "$layerdir/pre-setup.$MACHINE"
+        fi
         PATH="$OEROOT/scripts:$OEROOT/bitbake/bin:$PATH" configure_for_machine "$BUILDDIR/conf"
     fi