multi-kernel.inc: fix the unpack issue when there's no machine configs

[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / multi-kernel.inc

diff --git a/recipes-kernel/linux/multi-kernel.inc b/recipes-kernel/linux/multi-kernel.inc
index 27994867c4585e11fea7775fa3ce87aee48c691e..53144541ec90dd6995503f0f26f07e8aa9fd0e58 100644 (file)
--- a/recipes-kernel/linux/multi-kernel.inc
+++ b/recipes-kernel/linux/multi-kernel.inc
@@ -13,27 +13,23 @@
 require linux.inc
 
 SRC_URI += " \
-           file://configs/* "
+           file://configs "
 
 MULTI_CONFIG_BASE_SUFFIX = "multi-config-"
 
-# bitbake.conf only prepends PARALLEL make in tasks called do_compile, which isn't the case for multiconfig
-# So explicitly enable it for compileconfigs in here
-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/
+      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
+  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"