[oe-commits] Cliff Brake : module.bbclass: add common make options to module_do_install( )

[GIT User account]

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

Author: Cliff Brake <cbrake at bec-systems.com>
Date:   Tue Jan 27 11:16:03 2009 -0500

module.bbclass: add common make options to module_do_install()
the problem was that KERNELDIR was not getting passed to
"make install", so the host kernel src dir got used, and
the wrong kernel version was then extracted.

---

 classes/module.bbclass |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/classes/module.bbclass b/classes/module.bbclass
index 8ab92a5..eef9829 100644
--- a/classes/module.bbclass
+++ b/classes/module.bbclass
@@ -3,21 +3,24 @@ DEPENDS += "virtual/kernel"
 
 inherit module-base
 
+MODULE_MAKE_FLAGS = '\
+	KERNEL_PATH=${STAGING_KERNEL_DIR}\
+	KERNEL_SRC=${STAGING_KERNEL_DIR}\
+	KDIR=${STAGING_KERNEL_DIR}\
+	KERNELDIR=${STAGING_KERNEL_DIR}\
+	KERNEL_VERSION=${KERNEL_VERSION}\
+	CC="${KERNEL_CC}" LD="${KERNEL_LD}"\
+	AR="${KERNEL_AR}"\
+	'
+
 module_do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-		   KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-		   KDIR=${STAGING_KERNEL_DIR}    \
-		   KERNELDIR=${STAGING_KERNEL_DIR} \
-           KERNEL_VERSION=${KERNEL_VERSION}    \
-		   CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-		   AR="${KERNEL_AR}" \
-                   ${MAKE_TARGETS}
+	oe_runmake ${MODULE_MAKE_FLAGS} ${MAKE_TARGETS}
 }
 
 module_do_install() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" modules_install
+	oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" ${MODULE_MAKE_FLAGS} modules_install
 }
 
 pkg_postinst_append () {