X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=blobdiff_plain;f=meta-bsp%2Fcommon%2Frecipes%2Fvuplus%2Fvuplus-dvb-modules.bb;fp=meta-bsp%2Fcommon%2Frecipes%2Fvuplus%2Fvuplus-dvb-modules.bb;h=0f00bdc44d06666a89ea1abd9772f88388c5b331;hp=2bccc28c534802da4da7de1ccb2609ad68de7dcd;hb=51a0a87e90d4beb0f224dcedb1126d3d8c9a4855;hpb=4b72030a9aa57e32f1e80f91e008fb9d5e55af13

diff --git a/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb b/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb
index 2bccc28..0f00bdc 100755
--- a/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb
@@ -1,43 +1,41 @@
 DESCRIPTION = "Hardware drivers for VuPlus"
 SECTION = "base"
-PRIORITY = "required"
 LICENSE = "CLOSED"
 
-KV = "${@base_contains('PREFERRED_VERSION_linux-vuplus', '2.6.18', '2.6.18', '3.1.1', d)}"
+KV = "${VUPLUS_KERNEL_VERSION}"
 PV = "${KV}"
+PR = "r19-${SRCDATE}"
 
-RDEPENDS_2.6.18 = "kernel (${KV}) kernel-module-firmware-class kernel-module-input kernel-module-evdev kernel-module-i2c-core kernel-module-snd kernel-module-snd-pcm"
-RDEPENDS_3.1 = "kernel (${KV})" 
-
-RDEPENDS = "\
-  ${@base_contains('PREFERRED_VERSION_linux-vuplus', '2.6.18', '${RDEPENDS_2.6.18}', '${RDEPENDS_3.1}', d)} \
-"
+PREFERRED_GCC_VERSION = "4.4.3"
 
-PR = "r19-${SRCDATE}"
 
-#hack
-DEPENDS = " module-init-tools"
-RDEPENDS_append_vuplus = " module-init-tools-depmod"
+DEPENDS = "\
+	virtual/kernel \
+	module-init-tools \
+"
 
-PREFERRED_GCC_VERSION = "4.4.3"
+RDEPENDS = "\
+	virtual/kernel \
+	module-init-tools-depmod \
+" 
 
 SRC_URI = "http://archive.vuplus.com/download/drivers/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
 
 S = "${WORKDIR}"
 
+inherit module-base
+
 do_install() {
-        install -d ${D}/lib/modules/${KV}/extra
+        install -d ${D}/lib/modules/${KERNEL_VERSION}/extra
         for f in *.ko; do
-                install -m 0644 ${WORKDIR}/$f ${D}/lib/modules/${KV}/extra/$f;
+                install -m 0644 ${WORKDIR}/$f ${D}/lib/modules/${KERNEL_VERSION}/extra/$f;
         done
-	if [ "${KV}" = "3.1.1" ]; then
-		install -d ${D}/etc/modules-load.d
-		echo -e "${MODULES_NAME}" > ${D}/etc/modules-load.d/${PN}.conf
-		echo -e "${MODULES_NAME}" > ${D}/etc/modules
-	fi
+	install -d ${D}/etc/modules-load.d
+	echo -e "${MODULES_NAME}" > ${D}/etc/modules-load.d/${PN}.conf
+	echo -e "${MODULES_NAME}" > ${D}/etc/modules
 }
 
-pkg_postinst_vuplus-dvb-modules () {
+pkg_postinst_${PN} () {
         if [ -d /proc/stb ]; then
                 depmod -ae
         fi