[dvbmediasink] Remove WMV patch.

[vuplus_openvuplus_3.0] / meta-bsp / common / recipes / linux / linux-vuplus_3.13.5.bb

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb
index 08ed154..99ff507 100644 (file)
--- a/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb
@@ -5,20 +5,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "3.13.5"
 
-PR = "r3"
+PR = "r6"
 SRCREV = ""
 
 MODULE = "linux-3.13.5"
 
+KERNEL_CONFIG = "${@base_contains("VUPLUS_FEATURES", "dvbproxy", "${MACHINE}_defconfig_proxy", "${MACHINE}_defconfig", d)}"
+
 SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-${KV}.tar.bz2 \
         file://rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch \
-        file://${MACHINE}_defconfig \
+        file://linux-tcp_output.patch \
+        file://${KERNEL_CONFIG} \
        "
 
-S = "${WORKDIR}/linux"
+SRC_URI += "${@base_contains("VUPLUS_FEATURES", "dvbproxy", "file://linux_dvb_adapter.patch;patch=1;pnum=1", "", d)}"
 
 inherit kernel
 
+S = "${WORKDIR}/linux"
+
 export OS = "Linux"
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "vmlinux"
@@ -28,8 +33,7 @@ KERNEL_IMAGEDEST = "tmp"
 FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz /${KERNEL_IMAGEDEST}/autoexec.bat"
 
 do_configure_prepend() {
-        oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
-        oe_runmake oldconfig
+        oe_machinstall -m 0644 ${WORKDIR}/${KERNEL_CONFIG} ${WORKDIR}/defconfig
 }
 
 kernel_do_install_append() {