From: hschang <chang@dev3>
Date: Fri, 23 Mar 2018 08:40:03 +0000 (+0900)
Subject: [linux-vuplus-3.14.28] fix SRC_URI for patch. (add missing dvbs2x patch for uno4k... 
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=34e4c6e6b77bdda6f43e204671d5b85ab19df2e1

[linux-vuplus-3.14.28] fix SRC_URI for patch. (add missing dvbs2x patch for uno4k, ultimo4k)
---

diff --git a/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28.inc b/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28.inc
index df166b3..4f2f3c2 100644
--- a/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28.inc
+++ b/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28.inc
@@ -13,18 +13,17 @@ MODULE = "linux-3.14.28"
 
 KERNEL_CONFIG = "${MACHINE}_defconfig"
 
-SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-3.14-1.8.tar.bz2 \
+KSRC_VER = "3.14-1.8"
+SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-${KSRC_VER}.tar.bz2 \
 	file://${KERNEL_CONFIG} \
 	file://bcm_genet_disable_warn.patch \
 	file://linux_dvb-core.patch \
-	file://linux_rpmb_not_alloc.patch \
 	file://rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch \
 	file://usb_core_hub_msleep.patch \
 	file://linux_3_1x_dvbs2x.patch \
+	${@base_contains("VUPLUS_FEATURES", "dvbproxy", "file://linux_dvb_adapter.patch", "", d)} \
 	"
 
-SRC_URI += "${@base_contains("VUPLUS_FEATURES", "dvbproxy", "file://linux_dvb_adapter.patch;patch=1;pnum=1", "", d)}"
-
 inherit kernel
 
 S = "${WORKDIR}/linux"
diff --git a/meta-bsp/recipes-kernel/linux/linux-vuplus-vusolo4k_3.14.28.bb b/meta-bsp/recipes-kernel/linux/linux-vuplus-vusolo4k_3.14.28.bb
index 0522f82..2609818 100644
--- a/meta-bsp/recipes-kernel/linux/linux-vuplus-vusolo4k_3.14.28.bb
+++ b/meta-bsp/recipes-kernel/linux/linux-vuplus-vusolo4k_3.14.28.bb
@@ -2,7 +2,8 @@ require linux-vuplus-3.14.28.inc
 
 COMPATIBLE_MACHINE = "^(vusolo4k)$"
 
-PR = "${INC_PR}.7"
+PR = "${INC_PR}.8"
 
 SRC_URI += "\
+	file://linux_rpmb_not_alloc.patch \
 "
diff --git a/meta-bsp/recipes-kernel/linux/linux-vuplus-vuultimo4k_3.14.28.bb b/meta-bsp/recipes-kernel/linux/linux-vuplus-vuultimo4k_3.14.28.bb
index f03970f..1abdd82 100644
--- a/meta-bsp/recipes-kernel/linux/linux-vuplus-vuultimo4k_3.14.28.bb
+++ b/meta-bsp/recipes-kernel/linux/linux-vuplus-vuultimo4k_3.14.28.bb
@@ -2,19 +2,13 @@ require linux-vuplus-3.14.28.inc
 
 COMPATIBLE_MACHINE = "^(vuultimo4k)$"
 
-PR = "${INC_PR}.11"
+PR = "${INC_PR}.12"
 
-SRC_URI = "http://archive.vuplus.com/download/kernel/stblinux-3.14-1.12.tar.bz2 \
-    file://${KERNEL_CONFIG} \
-    file://bcm_genet_disable_warn.patch \
-    file://linux_dvb-core.patch \
-    file://rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch \
-    file://usb_core_hub_msleep.patch \
-    file://bcmsysport_3.14.28-1.12.patch \
-    file://linux_prevent_usb_dma_from_bmem.patch \
-    "
-
-SRC_URI += "${@base_contains("VUPLUS_FEATURES", "dvbproxy", "file://linux_dvb_adapter.patch;patch=1;pnum=1", "", d)}"
+KSRC_VER = "3.14-1.12"
+SRC_URI += "\
+        file://bcmsysport_3.14.28-1.12.patch \
+        file://linux_prevent_usb_dma_from_bmem.patch \
+"
 
 SRC_URI[md5sum] = "2a3a0a7e5cd2a1392f1a26790d1cd8bf"
 SRC_URI[sha256sum] = "8284670c28a4dad9e94752b38d37a4368f27ce15e671653a3e2ac83915f37db1"
diff --git a/meta-bsp/recipes-kernel/linux/linux-vuplus-vuuno4k_3.14.28.bb b/meta-bsp/recipes-kernel/linux/linux-vuplus-vuuno4k_3.14.28.bb
index ff359e5..4fc018f 100644
--- a/meta-bsp/recipes-kernel/linux/linux-vuplus-vuuno4k_3.14.28.bb
+++ b/meta-bsp/recipes-kernel/linux/linux-vuplus-vuuno4k_3.14.28.bb
@@ -2,18 +2,12 @@ require linux-vuplus-3.14.28.inc
 
 COMPATIBLE_MACHINE = "^(vuuno4k)$"
 
-PR = "${INC_PR}.9"
+PR = "${INC_PR}.10"
 
-SRC_URI = "http://archive.vuplus.com/download/kernel/stblinux-3.14-1.12.tar.bz2 \
-    file://${KERNEL_CONFIG} \
-    file://bcm_genet_disable_warn.patch \
-    file://linux_dvb-core.patch \
-    file://rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch \
-    file://usb_core_hub_msleep.patch \
-    file://linux_prevent_usb_dma_from_bmem.patch \
-    "
-
-SRC_URI += "${@base_contains("VUPLUS_FEATURES", "dvbproxy", "file://linux_dvb_adapter.patch;patch=1;pnum=1", "", d)}"
+KSRC_VER = "3.14-1.12"
+SRC_URI += "\
+	file://linux_prevent_usb_dma_from_bmem.patch \
+"
 
 SRC_URI[md5sum] = "2a3a0a7e5cd2a1392f1a26790d1cd8bf"
 SRC_URI[sha256sum] = "8284670c28a4dad9e94752b38d37a4368f27ce15e671653a3e2ac83915f37db1"