diff options
| author | hschang <chang@dev3> | 2014-07-18 05:00:52 (GMT) |
|---|---|---|
| committer | hschang <chang@dev3> | 2014-07-18 05:00:52 (GMT) |
| commit | 8205d55cd1f4f813c303e01e8bf54b5aa45ce915 (patch) | |
| tree | 4adbc90908e55fd24eaccdf22420986da75e7059 /meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb | |
| parent | 735cc71cb1eef9d3ff532cc586dbde959c48bbbb (diff) | |
| parent | 3a8416b9628b940abaa6d8c4c825c1617cc3f42f (diff) | |
Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
Conflicts:
meta-openvuplus/recipes-core/tasks/task-core-boot.inc
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
Diffstat (limited to 'meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb')
| -rw-r--r-- | meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb index dba0e47..ecd49df 100644 --- a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb +++ b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Vuplus: W-LAN package group for the Vuplus Distribution" SECTION = "vuplus/base" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r15" +PR = "r16" inherit packagegroup @@ -36,13 +36,13 @@ KERNEL_WIFI_MODULES = " \ kernel-module-stp \ kernel-module-bridge \ kernel-module-hostap \ - ${@base_contains('VUPLUS_FEATURES', 'ralink-kmod', 'kernel-module-rt2800usb', ' ', d)} \ + kernel-module-rt2800usb \ " KERNEL_WIFI_MODULES += "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'kernel-module-r8192u-usb', '', d)}" LEGACY_MODULES = " \ - ${@base_contains('VUPLUS_FEATURES', 'ralink-legacy', 'rt3070', ' ', d)} \ + rt3070 \ r8192cu \ " |