[oe-commits] Chris Larson : Revert now unnecessary do_unpack bug workarounds

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 15c1b7982f68f7323a4d38fbcd73424e82261381
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=15c1b7982f68f7323a4d38fbcd73424e82261381

Author: Chris Larson <chris_larson at mentor.com>
Date:   Fri Sep 10 12:04:23 2010 -0700

Revert now unnecessary do_unpack bug workarounds

Signed-off-by: Chris Larson <chris_larson at mentor.com>

---

 recipes/angstrom/exquisite-theme-angstrom.bb  |    2 +-
 recipes/linux/files/configs/{empty => .empty} |    0 
 recipes/linux/multi-kernel.inc                |    4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/angstrom/exquisite-theme-angstrom.bb b/recipes/angstrom/exquisite-theme-angstrom.bb
index 8b3519f..5c17b31 100644
--- a/recipes/angstrom/exquisite-theme-angstrom.bb
+++ b/recipes/angstrom/exquisite-theme-angstrom.bb
@@ -15,7 +15,7 @@ ALTERNATIVE_LINK = "${sysconfdir}/exquisite/config"
 ALTERNATIVE_PATH = "${sysconfdir}/exquisite/config-angstrom"
 ALTERNATIVE_PRIORITY = "20"
 
-SRC_URI = "file://angstrom/*"
+SRC_URI = "file://angstrom/"
 
 S = "${WORKDIR}/angstrom"
 
diff --git a/recipes/linux/files/configs/empty b/recipes/linux/files/configs/.empty
similarity index 100%
rename from recipes/linux/files/configs/empty
rename to recipes/linux/files/configs/.empty
diff --git a/recipes/linux/multi-kernel.inc b/recipes/linux/multi-kernel.inc
index 44c5b16..70cfd87 100644
--- a/recipes/linux/multi-kernel.inc
+++ b/recipes/linux/multi-kernel.inc
@@ -13,14 +13,14 @@
 require linux.inc
 
 SRC_URI_append = " \
-           file://configs/* "
+           file://configs/ "
 
 MULTI_CONFIG_BASE_SUFFIX = "multi-config-"
 
 do_compileconfigs () {
 
   # 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"