On 08/06/2011 11:31 PM, Philip Prindeville wrote:
> On 8/6/11 10:09 AM, Hauke Mehrtens wrote:
>> On 07/28/2011 03:31 AM, Philip Prindeville wrote:
>>> Modules like input-gpio-keys rely on input-core, but that's not currently 
>>> expressed.
>>>
>>> Signed-off-by: Philip Prindeville <phil...@redfish-solutions.com>
>>>
>> This patch is wrong.
>>
>> x86 has input-core compiled into the kernel and for all other targets
>> there is already a dependency on kmod-input-core in AddDepends/input.
>> This patch is not needed at all.
>>
>> Hauke
> 
> It does?
> 
> 
> philipp@builder ~/openwrt2]$ grep CONFIG_INPUT target/linux/x86/config-default
> # CONFIG_INPUT is not set
> [philipp@builder ~/openwrt2]$ egrep '\<CONFIG_INPUT\>' 
> build_dir/linux-x86_alix2/linux-2.6.39.3/.config
> # CONFIG_INPUT is not set
> [philipp@builder ~/openwrt2]$
Hi,

for the generic and the kvm_guest profile CONFIG_INPUT=y is set and for
all other x86 profiles CONFIG_INPUT is not set. The code in
package/kernel/modules/001-depends.mk is wrong. I have not noticed that
because I am only testing the x86 generic image.
Could you please try the attached patch. It should disable kmod-input
just for the generic and kvm_gest profile and activate it for all other
x86 profiles.

Hauke
diff --git a/package/kernel/modules/001-depends.mk b/package/kernel/modules/001-depends.mk
index 602775c..238799e 100644
--- a/package/kernel/modules/001-depends.mk
+++ b/package/kernel/modules/001-depends.mk
@@ -27,11 +27,11 @@ endef
 
 
 define SetDepends/input
-  DEPENDS:= @!TARGET_x86
+  DEPENDS:= @!(TARGET_x86_generic||TARGET_x86_kvm_guest)
 endef
 
 define AddDepends/input
-  DEPENDS+= +!TARGET_x86:kmod-input-core $(1)
+  DEPENDS+= +!(TARGET_x86_generic||TARGET_x86_kvm_guest):kmod-input-core $(1)
 endef
 
 
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to