diff options
-rw-r--r-- | meta/classes/kernel.bbclass | 5 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-base.bb | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 1a71df64ba..e441748bf8 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -243,11 +243,6 @@ ALLOW_EMPTY_kernel = "1" | |||
243 | ALLOW_EMPTY_kernel-base = "1" | 243 | ALLOW_EMPTY_kernel-base = "1" |
244 | ALLOW_EMPTY_kernel-image = "1" | 244 | ALLOW_EMPTY_kernel-image = "1" |
245 | 245 | ||
246 | # Userspace workarounds for kernel modules issues | ||
247 | # This is shame, fix the kernel instead! | ||
248 | DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" | ||
249 | RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" | ||
250 | |||
251 | pkg_postinst_kernel-image () { | 246 | pkg_postinst_kernel-image () { |
252 | if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then | 247 | if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then |
253 | mkdir -p $D/lib/modules/${KERNEL_VERSION} | 248 | mkdir -p $D/lib/modules/${KERNEL_VERSION} |
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb index 97a854c2ef..99b7e17a69 100644 --- a/meta/recipes-core/tasks/task-base.bb +++ b/meta/recipes-core/tasks/task-base.bb | |||
@@ -80,7 +80,6 @@ RDEPENDS_task-base = "\ | |||
80 | ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ | 80 | ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ |
81 | ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ | 81 | ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ |
82 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ | 82 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ |
83 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \ | ||
84 | ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \ | 83 | ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \ |
85 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ | 84 | ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ |
86 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ | 85 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ |
@@ -99,7 +98,6 @@ RDEPENDS_task-base = "\ | |||
99 | ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \ | 98 | ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \ |
100 | ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \ | 99 | ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \ |
101 | " | 100 | " |
102 | # bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in | ||
103 | 101 | ||
104 | 102 | ||
105 | RRECOMMENDS_task-base = "\ | 103 | RRECOMMENDS_task-base = "\ |
@@ -229,10 +227,7 @@ RRECOMMENDS_task-base-bluetooth = "\ | |||
229 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ | 227 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ |
230 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ | 228 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ |
231 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ | 229 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ |
232 | ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \ | ||
233 | " | 230 | " |
234 | # bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in | ||
235 | # kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer. | ||
236 | 231 | ||
237 | RDEPENDS_task-base-irda = "\ | 232 | RDEPENDS_task-base-irda = "\ |
238 | irda-utils" | 233 | irda-utils" |