diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-23 11:03:49 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-23 11:05:21 +0200 |
| commit | 8a305d92f858f5d33e5dddae83ca46d595d9165b (patch) | |
| tree | 4e1abded567a80a61673d191a7aff0b5a28943f4 /rules | |
| parent | 80f93b22fa5eac7e96489d81910566219da29f8b (diff) | |
| download | ptxdist-8a305d92f858f5d33e5dddae83ca46d595d9165b.tar.gz ptxdist-8a305d92f858f5d33e5dddae83ca46d595d9165b.tar.xz | |
udev: fix for !experimental version
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/udev.in | 8 | ||||
| -rw-r--r-- | rules/udev.make | 22 |
2 files changed, 30 insertions, 0 deletions
diff --git a/rules/udev.in b/rules/udev.in index 542f236f2..ae43d242f 100644 --- a/rules/udev.in +++ b/rules/udev.in @@ -8,6 +8,7 @@ menuconfig UDEV select GLIB if UDEV_EXTRA_UDEV_ACL select ACL if UDEV_EXTRA_UDEV_ACL select USBUTILS if UDEV_EXTRA_USB_DB + select LIBUSB_COMPAT if UDEV_EXTRA_HID2HCI select LIBUSB_COMPAT if UDEV_EXTRA_MOBILE_ACTION_MODESWITCH select PCIUTILS if UDEV_EXTRA_PCI_DB help @@ -186,6 +187,13 @@ if UDEV_EXTRAS help Find matching entry in fstab and export it + config UDEV_EXTRA_HID2HCI + bool + depends on !UDEV_EXPERIMENTAL + prompt "hid2hci" + help + Convert HID to HCI IDs + config UDEV_EXTRA_INPUT_ID bool prompt "input_id" diff --git a/rules/udev.make b/rules/udev.make index f4932a329..3dd74b778 100644 --- a/rules/udev.make +++ b/rules/udev.make @@ -81,6 +81,14 @@ else UDEV_AUTOCONF += --without-systemdsystemunitdir endif +ifndef PTXCONF_UDEV_EXPERIMENTAL +ifeq ($(PTXCONF_ARCH_ARM)-$(PTXCONF_UDEV_EXTRA_HID2HCI),-y) +UDEV_AUTOCONF += --enable-bluetooth +else +UDEV_AUTOCONF += --disable-bluetooth +endif +endif + ifdef PTXCONF_UDEV_EXTRA_KEYMAP UDEV_AUTOCONF += --enable-keymap else @@ -93,11 +101,25 @@ else UDEV_AUTOCONF += --disable-udev_acl endif +ifndef PTXCONF_UDEV_EXPERIMENTAL +ifdef PTXCONF_UDEV_EXTRA_USB_DB +UDEV_AUTOCONF += --enable-usbdb +else +UDEV_AUTOCONF += --disable-usbdb +endif + +ifdef PTXCONF_UDEV_EXTRA_PCI_DB +UDEV_AUTOCONF += --enable-pcidb +else +UDEV_AUTOCONF += --disable-pcidb +endif +else ifneq ($(PTXCONF_UDEV_EXTRA_USB_DB)$(PTXCONF_UDEV_EXTRA_PCI_DB),) UDEV_AUTOCONF += --enable-hwdb else UDEV_AUTOCONF += --disable-hwdb endif +endif ifdef PTXCONF_UDEV_EXTRA_MOBILE_ACTION_MODESWITCH UDEV_AUTOCONF += --enable-action_modeswitch |