diff options
| author | Juergen Borleis <jbe@pengutronix.de> | 2015-01-31 06:31:15 +0100 |
|---|---|---|
| committer | Juergen Borleis <jbe@pengutronix.de> | 2015-01-31 07:49:37 +0100 |
| commit | 20b63eb6b9937745b76d739f00094c61e26570bb (patch) | |
| tree | 3aa16c9e378f144f5bd3254644c743cff11de160 | |
| parent | 61c4ac5578c1f41561da999207aa7ab91d41b72c (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini2440-20b63eb6b9937745b76d739f00094c61e26570bb.tar.gz OSELAS.BSP-Pengutronix-Mini2440-20b63eb6b9937745b76d739f00094c61e26570bb.tar.xz | |
Platform: adapt the local udev rule to the curent PTXdist version
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/Changelog | 5 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/rules/udev.make | 23 |
2 files changed, 19 insertions, 9 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog index 3d41ede..009c554 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -1,3 +1,8 @@ +2015-01-31 Juergen Borleis <jbe@pengutronix.de + + * Platform: + - adapt the local udev rule to the curent PTXdist version + 2015-01-26 Juergen Borleis <jbe@pengutronix.de * Platform: use ptxdist-2015.01.0 diff --git a/configs/platform-friendlyarm-mini2440/rules/udev.make b/configs/platform-friendlyarm-mini2440/rules/udev.make index bbdf76b..7d4f73d 100644 --- a/configs/platform-friendlyarm-mini2440/rules/udev.make +++ b/configs/platform-friendlyarm-mini2440/rules/udev.make @@ -96,21 +96,21 @@ UDEV_RULES-y := \ 78-sound-card.rules \ 95-udev-late.rules -ifndef PTXCONF_UDEV_LEGACY -UDEV_RULES-y += \ +UDEV_RULES-$(PTXCONF_UDEV_LEGACY) += \ 42-usb-hid-pm.rules -endif -ifdef PTXCONF_SYSTEMD +UDEV_RULES-$(PTXCONF_SYSTEMD) += \ + 60-drm.rules \ + 64-btrfs.rules \ + 70-mouse.rules \ + 80-net-setup-link.rules -UDEV_RULES-y += \ +UDEV_RULES-$(PTXCONF_SYSTEMD_LOGIND) += \ 70-power-switch.rules \ 70-uaccess.rules \ 71-seat.rules \ 73-seat-late.rules -endif - UDEV_RULES-$(PTXCONF_UDEV_ACCELEROMETER) += 61-accelerometer.rules ifdef PTXCONF_UDEV_LEGACY UDEV_RULES-$(PTXCONF_UDEV_ACL) += 70-acl.rules @@ -118,6 +118,7 @@ else UDEV_RULES-$(PTXCONF_UDEV_ACL) += 70-udev-acl.rules endif UDEV_RULES-$(PTXCONF_UDEV_DRIVERS_RULES) += 80-drivers.rules +UDEV_RULES-$(PTXCONF_UDEV_HWDB) += 60-keyboard.rules UDEV_RULES-$(PTXCONF_UDEV_KEYMAPS) += 95-keyboard-force-release.rules UDEV_RULES-$(PTXCONF_UDEV_KEYMAPS) += 95-keymap.rules UDEV_RULES-$(PTXCONF_UDEV_MTD_PROBE) += 75-probe_mtd.rules @@ -157,7 +158,8 @@ endif # ---------------------------------------------------------------------------- ifdef PTXCONF_SYSTEMD -$(STATEDIR)/udev.extract.post: $(STATEDIR)/systemd.install.post +$(STATEDIR)/systemd.prepare: $(STATEDIR)/udev.prepare +$(STATEDIR)/udev.install: $(STATEDIR)/systemd.install.post $(STATEDIR)/udev.install.unpack: $(STATEDIR)/systemd.install.post endif @@ -173,6 +175,9 @@ $(STATEDIR)/udev.targetinstall: ifdef PTXCONF_UDEV_ETC_CONF @$(call install_alternative, udev, 0, 0, 0644, /etc/udev/udev.conf) endif +ifdef PTXCONF_UDEV_HWDB + @$(call install_copy, udev, 0, 0, 0644, -, /etc/udev/hwdb.bin) +endif ifdef PTXCONF_UDEV_LEGACY @$(call install_copy, udev, 0, 0, 0755, -, /sbin/udevd) @@ -180,7 +185,7 @@ ifdef PTXCONF_UDEV_LEGACY else ifdef PTXCONF_SYSTEMD @$(call install_copy, udev, 0, 0, 0755, -, /lib/systemd/systemd-udevd) - @$(call install_copy, udev, 0, 0, 0755, -, /usr/bin/udevadm) + @$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm) else @$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/udevd) @$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm) |