There have been repeated reports of the 'make install' step not working
as expected. After installing and rebooting, the built-in kernel module
is loaded in preference to the compiled input-wacom version. From what
little information I've been able to gather, the issue appears to be a
result of inconsistent priority between the built-in and 'extra'
directories.

To ensure the input-wacom module is always preferred when found, this
patch has the 'make install' step create a configuration file at
/etc/depmod.d/input-wacom.conf with an "override" directive. See the
'depmod.d' manpage for more information.

Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
 2.6.30/Makefile.in | 1 +
 2.6.36/Makefile.in | 1 +
 2.6.38/Makefile.in | 1 +
 3.17/Makefile.in   | 1 +
 3.7/Makefile.in    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/2.6.30/Makefile.in b/2.6.30/Makefile.in
index e0c696f..d76fc4e 100644
--- a/2.6.30/Makefile.in
+++ b/2.6.30/Makefile.in
@@ -29,6 +29,7 @@ clean:
 
 install modules_install:
        $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) modules_install
+       echo "override wacom * extra" > /etc/depmod.d/input-wacom.conf
        PATH="$(PATH):/bin:/sbin" depmod -a $(MODUTS)
 
 endif  # End kbuild check
diff --git a/2.6.36/Makefile.in b/2.6.36/Makefile.in
index e0c696f..d76fc4e 100644
--- a/2.6.36/Makefile.in
+++ b/2.6.36/Makefile.in
@@ -29,6 +29,7 @@ clean:
 
 install modules_install:
        $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) modules_install
+       echo "override wacom * extra" > /etc/depmod.d/input-wacom.conf
        PATH="$(PATH):/bin:/sbin" depmod -a $(MODUTS)
 
 endif  # End kbuild check
diff --git a/2.6.38/Makefile.in b/2.6.38/Makefile.in
index e0c696f..d76fc4e 100644
--- a/2.6.38/Makefile.in
+++ b/2.6.38/Makefile.in
@@ -29,6 +29,7 @@ clean:
 
 install modules_install:
        $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) modules_install
+       echo "override wacom * extra" > /etc/depmod.d/input-wacom.conf
        PATH="$(PATH):/bin:/sbin" depmod -a $(MODUTS)
 
 endif  # End kbuild check
diff --git a/3.17/Makefile.in b/3.17/Makefile.in
index e96e628..2f3e4e9 100644
--- a/3.17/Makefile.in
+++ b/3.17/Makefile.in
@@ -29,6 +29,7 @@ clean:
 
 install modules_install:
        $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) modules_install
+       echo "override wacom * extra" > /etc/depmod.d/input-wacom.conf
        PATH="$(PATH):/bin:/sbin" depmod -a $(MODUTS)
 
 endif  # End kbuild check
diff --git a/3.7/Makefile.in b/3.7/Makefile.in
index e0c696f..d76fc4e 100644
--- a/3.7/Makefile.in
+++ b/3.7/Makefile.in
@@ -29,6 +29,7 @@ clean:
 
 install modules_install:
        $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) modules_install
+       echo "override wacom * extra" > /etc/depmod.d/input-wacom.conf
        PATH="$(PATH):/bin:/sbin" depmod -a $(MODUTS)
 
 endif  # End kbuild check
-- 
2.6.1


------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to