From 15c1b7982f68f7323a4d38fbcd73424e82261381 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 10 Sep 2010 12:04:23 -0700 Subject: Revert now unnecessary do_unpack bug workarounds Signed-off-by: Chris Larson --- recipes/angstrom/exquisite-theme-angstrom.bb | 2 +- recipes/linux/files/configs/.empty | 0 recipes/linux/files/configs/empty | 0 recipes/linux/multi-kernel.inc | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 recipes/linux/files/configs/.empty delete mode 100644 recipes/linux/files/configs/empty diff --git a/recipes/angstrom/exquisite-theme-angstrom.bb b/recipes/angstrom/exquisite-theme-angstrom.bb index 8b3519fca5..5c17b311ff 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/recipes/linux/files/configs/empty b/recipes/linux/files/configs/empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/recipes/linux/multi-kernel.inc b/recipes/linux/multi-kernel.inc index 44c5b16780..70cfd87f74 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" -- cgit v1.2.3