Patchwork FSLONLY: adjust the meta-oe layer sequence to make Yocto pick up the right bbclass file

login
register
mail settings
Submitter Zhenhua Luo
Date Jan. 9, 2012, 8:58 a.m.
Message ID <1326099506-5473-1-git-send-email-b19537@freescale.com>
Download mbox | patch
Permalink /patch/18789/
State Rejected
Headers show

Comments

Zhenhua Luo - Jan. 9, 2012, 8:58 a.m.
From: Zhenhua Luo <b19537@freescale.com>

Signed-off-by: Zhenhua Luo <b19537@freescale.com>
---
 fsl-setup-poky |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/fsl-setup-poky b/fsl-setup-poky
index a5cc702..d1faaae 100755
--- a/fsl-setup-poky
+++ b/fsl-setup-poky
@@ -168,13 +168,6 @@  echo >> build_${BOARD}_release/conf/local.conf
 sed "/  \"/d" build_${BOARD}_release/conf/bblayers.conf > build_${BOARD}_release/conf/bblayers.conf~
 mv build_${BOARD}_release/conf/bblayers.conf~ build_${BOARD}_release/conf/bblayers.conf
 
-# append meta-oe/meta-oe if it exists
-if [ -e $CUR_DIR/meta-oe/meta-oe ]; then
-    echo "  $CUR_DIR/meta-oe/meta-oe \\" >> build_${BOARD}_release/conf/bblayers.conf
-elif [ -e $CUR_DIR/../meta-oe/meta-oe ]; then
-    echo "  $CUR_DIR/../meta-oe/meta-oe \\" >> build_${BOARD}_release/conf/bblayers.conf
-fi
-
 # append meta-fsl-ppc bblayer into conf/bblayers.conf
 echo "  ${META_FSL_PPC_LAYER_PATH} \\" >> build_${BOARD}_release/conf/bblayers.conf
 
@@ -191,6 +184,13 @@  if [ -e $CUR_DIR/meta-fsl-local-sdk ]; then
 elif [ -e $CUR_DIR/../meta-fsl-local-sdk ]; then
     echo "  $CUR_DIR/../meta-fsl-local-sdk \\" >> build_${BOARD}_release/conf/bblayers.conf
 fi
+
+# append meta-oe/meta-oe if it exists
+if [ -e $CUR_DIR/meta-oe/meta-oe ]; then
+    echo "  $CUR_DIR/meta-oe/meta-oe \\" >> build_${BOARD}_release/conf/bblayers.conf
+elif [ -e $CUR_DIR/../meta-oe/meta-oe ]; then
+    echo "  $CUR_DIR/../meta-oe/meta-oe \\" >> build_${BOARD}_release/conf/bblayers.conf
+fi
 echo "  \"" >> build_${BOARD}_release/conf/bblayers.conf
 
 # enable 64b multilib if we are a p5020ds(-32b)