use kernel-abiversion instead of kernel-version for external modules

BKrev: 411211df_5OfetKywF391rJssADBIQ

6 files changed, 59 insertions, 4 deletions

diff --git a/classes/module.oeclass b/classes/module.oeclass
index e69de29bb2..68291b2918 100644
--- a/classes/module.oeclass
+++ b/classes/module.oeclass
@@ -0,0 +1,32 @@
+RDEPENDS_append = " kernel (${KERNEL_VERSION})"
+DEPENDS_append = " virtual/kernel"
+
+export ARCH = "${TARGET_ARCH}"
+export OS = "${TARGET_OS}"
+export CROSS_COMPILE = "${TARGET_PREFIX}"
+
+
+export KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
+export KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
+KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ccsuffix')}
+KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ldsuffix')}
+KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}"
+KERNEL_LD = "${LD}${KERNEL_LDSUFFIX}"
+
+module_do_compile() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
+		   KERNEL_SRC=${STAGING_KERNEL_DIR}    \
+		   KERNEL_VERSION=${KERNEL_VERSION}    \
+		   CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+		   ${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
+}
+
+EXPORT_FUNCTIONS do_compile do_install
+
+FILES_${PN} = "/etc /lib/modules"
diff --git a/lirc/lirc-modules_0.6.6.oe b/lirc/lirc-modules_0.6.6.oe
index 675bd94cf6..8e9b7ee43e 100644
--- a/lirc/lirc-modules_0.6.6.oe
+++ b/lirc/lirc-modules_0.6.6.oe
@@ -15,7 +15,7 @@ export ARCH=${TARGET_ARCH}
 export OS=${TARGET_OS}
 export CROSS_COMPILE=${CROSS}
 
-KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-version')}
+KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
 KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
 KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ccsuffix')}
 KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ldsuffix')}
diff --git a/lirc/lirc_0.6.6.oe b/lirc/lirc_0.6.6.oe
index b408962c3d..d877b4642d 100644
--- a/lirc/lirc_0.6.6.oe
+++ b/lirc/lirc_0.6.6.oe
@@ -11,7 +11,7 @@ S = "${WORKDIR}/lirc-${PV}"
 
 inherit autotools
 
-KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-version')}
+KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
 KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
 KERNEL_PATH = "${STAGING_LIBDIR}/../kernel"
 
diff --git a/lockstat/lockstat_1.4.10.oe b/lockstat/lockstat_1.4.10.oe
index bf4a3d9b78..d1e0879a13 100644
--- a/lockstat/lockstat_1.4.10.oe
+++ b/lockstat/lockstat_1.4.10.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/kernel"
 SRC_URI = "ftp://oss.sgi.com/projects/lockmeter/download/lockstat-${PV}.tar.gz"
 S = "${WORKDIR}/lockstat"
 
-export KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-version')}
+export KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
 export KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
 CFLAGS += " -I${KERNEL_SOURCE}/include"
 
diff --git a/shfs/shfs-utils_0.33.oe b/shfs/shfs-utils_0.33.oe
index e69de29bb2..48344746a7 100644
--- a/shfs/shfs-utils_0.33.oe
+++ b/shfs/shfs-utils_0.33.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "A simple and easy to use Linux kernel (2.4+) module which allows you to mount remote filesystems using plain shell (ssh/rsh) connection. \
+It supports some nice features like number of different caches for access speedup, target system optimisations, etc."
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "shfs-modules (${PV})"
+DEPENDS = "virtual/kernel"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/shfs/shfs-${PV}.tar.gz"
+S = "${WORKDIR}/shfs-${PV}/shfsmount"
+
+KERNEL_VERSION = "${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}"
+CFLAGS_append=' -DVERSION=\\"${KERNEL_VERSION}\\" -DSHFS_VERSION=\\"${PV}\\"'
+
+do_compile() {
+        oe_runmake LINKER="${CC}"
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 shfsmount shfsumount ${D}/${bindir}
+}
diff --git a/wireless-tools/wireless-tools_26.oe b/wireless-tools/wireless-tools_26.oe
index 73e5a14a19..21d7d8c730 100644
--- a/wireless-tools/wireless-tools_26.oe
+++ b/wireless-tools/wireless-tools_26.oe
@@ -12,7 +12,7 @@ SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar
 S = "${WORKDIR}/wireless_tools.${PV}"
 
 export KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
-export KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-version')}
+export KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
 KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ccsuffix')}
 KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ldsuffix')}
 KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}"