X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-bsp%2Fcommon%2Frecipes%2Flinux%2Flinux-vuplus_3.13.5.bb;h=99ff507e60baf6732dea3f105f6a01bdc55d3188;hp=75d37d1f61183d77af2ae938b05c1b0bc6772f4e;hb=4e75626197dab638fab963c486c979e329f917ae;hpb=d79918a4bef758142074ba69a93edf029ab3cdf7 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 75d37d1..99ff507 100644 --- 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,21 +5,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" KV = "3.13.5" -PR = "r4" +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://linux-tcp_output.patch \ - file://${MACHINE}_defconfig \ + 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" @@ -29,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() {