diff options
author | Luotao Fu <l.fu@pengutronix.de> | 2009-05-08 08:02:41 +0000 |
---|---|---|
committer | Luotao Fu <l.fu@pengutronix.de> | 2009-05-08 08:02:41 +0000 |
commit | 99713982702699268dc0426ec192ef3ff85bf459 (patch) | |
tree | 99d3b890b4c05c3e547ce30877678ffef7a10ae8 /rules/udev.make | |
parent | 225bdcb1a403463f0b7404eabacea22d65012168 (diff) | |
download | ptxdist-99713982702699268dc0426ec192ef3ff85bf459.tar.gz ptxdist-99713982702699268dc0426ec192ef3ff85bf459.tar.xz |
* udev checks for customized rules in projectroot directory first before
it tries to install it
* install type fix for firmware script
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10402 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/udev.make')
-rw-r--r-- | rules/udev.make | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/rules/udev.make b/rules/udev.make index 53b61af99..a24d70ff8 100644 --- a/rules/udev.make +++ b/rules/udev.make @@ -128,12 +128,14 @@ ifdef PTXCONF_UDEV__COMMON_RULES endif ifdef PTXCONF_UDEV__CUST_RULES - @cd $(PTXDIST_WORKSPACE)/projectroot/lib/udev/rules.d/; \ - for file in *; do \ - $(call install_copy, udev, 0, 0, 0644, \ - $(PTXDIST_WORKSPACE)/projectroot/lib/udev/rules.d/$$file, \ - /lib/udev/rules.d/$$file, n); \ - done + @if [ -d $(PTXDIST_WORKSPACE)/projectroot/lib/udev/rules.d/ ]; then \ + cd $(PTXDIST_WORKSPACE)/projectroot/lib/udev/rules.d/; \ + for file in `find . -type f`; do \ + $(call install_copy, udev, 0, 0, 0644, \ + $(PTXDIST_WORKSPACE)/projectroot/lib/udev/rules.d/$$file, \ + /lib/udev/rules.d/$$file, n); \ + done; \ + fi endif # # @@ -172,7 +174,7 @@ ifdef PTXCONF_UDEV__EXTRA_EDD_ID endif ifdef PTXCONF_UDEV__EXTRA_FIRMWARE - @$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/firmware.sh) + @$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/firmware.sh, n) @$(call install_copy, udev, 0, 0, 0644, -, \ /lib/udev/rules.d/50-firmware.rules,n) endif |