Add Wacom modules to the same file and uninstall them all together

wacom_i2c was accidently added to /etc/depmod.d/input-wacom_i2c.conf. Make it back to input-wacom.conf. Remove all Wacom modules and files together. Signed-off-by: Ping Cheng <[email protected]> Tested-by: Jason Gerecke <[email protected]>
linuxwacom · Jul 18, 2023 · 72cd1e6 · 72cd1e6
1 parent f4e976f
commit 72cd1e6
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/4.5/Makefile.in b/4.5/Makefile.in
@@ -55,7 +55,7 @@ install modules_install:
 	mkdir -p /etc/depmod.d
 	echo "override wacom * extra" > /etc/depmod.d/input-wacom.conf
 	echo "override wacom_w8001 * extra" >> /etc/depmod.d/input-wacom.conf
-	echo "override wacom_i2c * extra" >> /etc/depmod.d/input-wacom_i2c.conf
+	echo "override wacom_i2c * extra" >> /etc/depmod.d/input-wacom.conf
 	PATH="$(PATH):/bin:/sbin" depmod -a $(MODUTS)
 ifdef UPDATE_INITRAMFS
 	$(UPDATE_INITRAMFS) -u -k $(MODUTS)
@@ -70,10 +70,8 @@ uninstall:
 	@# which causes trouble for tools like 'rm' which don't
 	@# see the path how you might think. As a workaround,
 	@# first cd into the directory and then remove.
-	cd $(WCM_KERNEL_DIR)/../extra; rm wacom.ko*
-	cd $(WCM_KERNEL_DIR)/../extra; rm wacom_w8001.ko*
-	cd $(WCM_KERNEL_DIR)/../extra; rm wacom_i2c.ko*
-	rm -f /etc/depmod.d/input-wacom.conf
+	cd $(WCM_KERNEL_DIR)/../extra; rm wacom*.ko*
+	rm -f /etc/depmod.d/input-wacom*.conf
 	PATH="$(PATH):/bin:/sbin" depmod -a $(MODUTS)
 ifdef UPDATE_INITRAMFS
 	$(UPDATE_INITRAMFS) -u -k $(MODUTS)