From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 1 Feb 2011 15:03:31 +0000 (+0100)
Subject: multi-kernel.inc: the current fetcher2 in yocto started having a glitch, so fix it up
X-Git-Tag: v2012.05-yocto1.2~535
X-Git-Url: https://git.ti.com/gitweb?p=glsdk%2Fmeta-ti-glsdk.git;a=commitdiff_plain;h=1501b22dccd94023163092bebd5d52b85ba13fa1;ds=inline

multi-kernel.inc: the current fetcher2 in yocto started having a glitch, so fix it up

When the glitch has been fixed this can get removed

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---

diff --git a/recipes-bsp/linux/multi-kernel.inc b/recipes-bsp/linux/multi-kernel.inc
index 9f5a0a0..d34994f 100644
--- a/recipes-bsp/linux/multi-kernel.inc
+++ b/recipes-bsp/linux/multi-kernel.inc
@@ -23,11 +23,20 @@ EXTRA_OEMAKE = "${PARALLEL_MAKE} "
 
 do_compileconfigs () {
 
+  # fixup for fetcher change
+  if [ -e ${WORKDIR}/configs/configs ] ; then
+      if [ -e ${WORKDIR}/configs/configs/.empty ] ; then
+          mv ${WORKDIR}/configs/configs/.empty ${WORKDIR}/configs/
+      fi
+      mv ${WORKDIR}/configs/configs/* ${WORKDIR}/configs/
+      rm -rf ${WORKDIR}/configs/configs
+  fi
+
   # Compile and Install additional kernel configs if found
   if [ -e ${WORKDIR}/configs/.empty ] ; then
        echo "No configs found in configs/ directory, skipping to regular build"
   else
-       echo "Multiple configs found, building those first"
+      echo "Multiple configs found, building those first"
 
       # Context Save the regular 'defconfig'
       cp ${WORKDIR}/defconfig ${WORKDIR}/defconfig.save