diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-22 17:31:06 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-03-23 15:13:02 +0100 |
| commit | ceea3c678279a81daa3f28c4e549a7e37f04188e (patch) | |
| tree | b2ee0f6d674af5ea3cb0a71ae9ba8bd043cfc239 /callouts | |
| parent | 7ba30cfd265d5cde4afc96685f138cad23921138 (diff) | |
data: move OLPC MESH udev rules away from callouts
No idea why was it there in the first place.
This also fixes a bug that the rules file was conditionally included in dist
depending on presence of udev dir at configure time.
Diffstat (limited to 'callouts')
| -rw-r--r-- | callouts/77-nm-olpc-mesh.rules | 6 | ||||
| -rw-r--r-- | callouts/Makefile.am | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/callouts/77-nm-olpc-mesh.rules b/callouts/77-nm-olpc-mesh.rules deleted file mode 100644 index a1a1554c2b..0000000000 --- a/callouts/77-nm-olpc-mesh.rules +++ /dev/null @@ -1,6 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# The fact that this device is driven by libertas is not currently exposed -# in the sysfs tree..? -KERNEL=="msh*", SUBSYSTEM=="net", DRIVERS=="usb", ATTRS{idVendor}=="1286", ATTRS{idProduct}=="2001", ENV{ID_NM_OLPC_MESH}="1" - diff --git a/callouts/Makefile.am b/callouts/Makefile.am index f682579e91..cc38e01a82 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -87,11 +87,6 @@ libtest_dispatcher_envp_la_LIBADD = \ $(GLIB_LIBS) -if WITH_UDEV_DIR -udevrulesdir = $(UDEV_DIR)/rules.d -udevrules_DATA = 77-nm-olpc-mesh.rules -endif - dbusactivationdir = $(datadir)/dbus-1/system-services dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service) @@ -115,7 +110,6 @@ CLEANFILES = $(nodist_libnmdbus_dispatcher_la_SOURCES) $(dbusactivation_DATA) EXTRA_DIST = \ $(dbusservice_DATA) \ - $(udevrules_DATA) \ $(dbusactivation_in_files) \ nm-dispatcher.xml |