mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 18:49:32 +02:00
kernel.bbclass, task-base: remove references to obsolete bluez-dtl1-workaround
(From OE-Core rev: a78b644a8aebd078b9cc51bf7d102feef8191d95) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
9b36cd78ff
commit
88c6c7abbf
@@ -243,11 +243,6 @@ ALLOW_EMPTY_kernel = "1"
|
|||||||
ALLOW_EMPTY_kernel-base = "1"
|
ALLOW_EMPTY_kernel-base = "1"
|
||||||
ALLOW_EMPTY_kernel-image = "1"
|
ALLOW_EMPTY_kernel-image = "1"
|
||||||
|
|
||||||
# Userspace workarounds for kernel modules issues
|
|
||||||
# This is shame, fix the kernel instead!
|
|
||||||
DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
|
|
||||||
RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
|
|
||||||
|
|
||||||
pkg_postinst_kernel-image () {
|
pkg_postinst_kernel-image () {
|
||||||
if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
|
if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
|
||||||
mkdir -p $D/lib/modules/${KERNEL_VERSION}
|
mkdir -p $D/lib/modules/${KERNEL_VERSION}
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ RDEPENDS_task-base = "\
|
|||||||
${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
|
${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
|
||||||
${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
|
${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
|
||||||
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
|
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
|
||||||
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \
|
|
||||||
${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \
|
${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \
|
||||||
${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
|
${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
|
||||||
${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
|
${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
|
||||||
@@ -99,7 +98,6 @@ RDEPENDS_task-base = "\
|
|||||||
${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
|
${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
|
||||||
${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \
|
${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \
|
||||||
"
|
"
|
||||||
# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
|
|
||||||
|
|
||||||
|
|
||||||
RRECOMMENDS_task-base = "\
|
RRECOMMENDS_task-base = "\
|
||||||
@@ -229,10 +227,7 @@ RRECOMMENDS_task-base-bluetooth = "\
|
|||||||
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
|
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
|
||||||
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
|
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
|
||||||
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
|
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
|
||||||
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \
|
|
||||||
"
|
"
|
||||||
# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
|
|
||||||
# kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer.
|
|
||||||
|
|
||||||
RDEPENDS_task-base-irda = "\
|
RDEPENDS_task-base-irda = "\
|
||||||
irda-utils"
|
irda-utils"
|
||||||
|
|||||||
Reference in New Issue
Block a user