Marcus Meissner
1a0cc6646c
- Update to 018 * no changelog available - Use url for source - Update project url - Remove pcmciautils_fix1.diff (similar fix already included in upstream) - Cleanup spec file with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/330039 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcmciautils?expand=0&rev=19
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
Index: pcmciautils-018/Makefile
|
|
===================================================================
|
|
--- pcmciautils-018.orig/Makefile
|
|
+++ pcmciautils-018/Makefile
|
|
@@ -74,7 +74,7 @@ exec_prefix = ${prefix}
|
|
etcdir = ${prefix}/etc
|
|
sbindir = ${exec_prefix}/sbin
|
|
mandir = ${prefix}/usr/share/man
|
|
-udevdir = ${prefix}/lib/udev
|
|
+udevdir = $(shell pkg-config --variable=udevdir udev)
|
|
|
|
INSTALL = /usr/bin/install -c
|
|
INSTALL_PROGRAM = ${INSTALL}
|
|
Index: pcmciautils-018/udev/rules-base
|
|
===================================================================
|
|
--- pcmciautils-018.orig/udev/rules-base
|
|
+++ pcmciautils-018/udev/rules-base
|
|
@@ -13,5 +13,4 @@ SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*"
|
|
# PCMCIA sockets:
|
|
#
|
|
# modprobe the pcmcia bus module so that 16-bit PCMCIA devices work
|
|
-SUBSYSTEM=="pcmcia_socket", \
|
|
- RUN+="/sbin/modprobe -b pcmcia"
|
|
+SUBSYSTEM=="pcmcia_socket", RUN{builtin}="kmod load pcmcia"
|
|
Index: pcmciautils-018/udev/rules-modprobe
|
|
===================================================================
|
|
--- pcmciautils-018.orig/udev/rules-modprobe
|
|
+++ pcmciautils-018/udev/rules-modprobe
|
|
@@ -1,3 +1,2 @@
|
|
# modprobe $env{MODALIAS} loads all possibly appropriate modules
|
|
-SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
|
|
- RUN+="/sbin/modprobe $env{MODALIAS}"
|
|
+SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
|