[oe-commits] Frans Meulenbroeks : Revert "wpa-supplicant : moved unused files to obsolete dir"

[git version control]

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

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Thu Sep 30 08:28:41 2010 +0200

Revert "wpa-supplicant : moved unused files to obsolete dir"

This reverts commit 9a5382aad4e5a3e52fa52722cf5587fdba958e9f.
This one accidentally also dragged in classes/kernel.bbclass

I will redo the commit for wpa-supplicant later.
classes/kernel.bbclass will be se a separate commit

Thanks for Paul Menzel for spotting this

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 classes/kernel.bbclass                             |   12 ++++++------
 .../wpa-supplicant/files/use-channel.patch         |    0
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index cfb4ad8..5f8bc8a 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -121,12 +121,7 @@ kernel_do_install() {
                 oe_runmake SUBDIRS="scripts/genksyms"
         fi
 
-
-}
-
-sysroot_stage_all_append() {
-
-	kerneldir=${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
+	kerneldir=${D}/kernel/
 
 	if [ -e include/asm ] ; then
 		# This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels
@@ -205,6 +200,11 @@ sysroot_stage_all_append() {
 	cp -fR scripts $kerneldir/
 }
 
+sysroot_stage_all_append() {
+	sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
+	cp -fpPR ${D}/kernel/.config ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
+}
+
 kernel_do_configure() {
 	yes '' | oe_runmake oldconfig
 	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
diff --git a/recipes/obsolete/wpa-supplicant/files/use-channel.patch b/recipes/wpa-supplicant/files/use-channel.patch
similarity index 100%
rename from recipes/obsolete/wpa-supplicant/files/use-channel.patch
rename to recipes/wpa-supplicant/files/use-channel.patch