Remove old USB stuff when the new stack is requested.
authorSascha Wildner <saw@online.de>
Fri, 12 Oct 2012 05:44:34 +0000 (07:44 +0200)
committerSascha Wildner <saw@online.de>
Fri, 12 Oct 2012 05:44:34 +0000 (07:44 +0200)
Makefile_upgrade.inc

index abcd77c..778a9b5 100644 (file)
@@ -2107,3 +2107,50 @@ TO_REMOVE+=/usr/share/man/man4/rum.4.gz
 TO_REMOVE+=/boot/kernel/if_ural.ko
 TO_REMOVE+=/usr/share/man/cat4/ural.4.gz
 TO_REMOVE+=/usr/share/man/man4/ural.4.gz
+
+# Clean up old USB stuff when the new stack is requested
+# and vice versa
+.ifdef ${WANT_USB4BSD}
+TO_REMOVE+=/boot/kernel/if_aue.ko
+TO_REMOVE+=/boot/kernel/if_cue.ko
+TO_REMOVE+=/boot/kernel/if_kue.ko
+TO_REMOVE+=/boot/kernel/if_lgue.ko
+TO_REMOVE+=/boot/kernel/if_rue.ko
+TO_REMOVE+=/boot/kernel/moscom.ko
+TO_REMOVE+=/boot/kernel/snd_uaudio.ko
+TO_REMOVE+=/boot/kernel/uark.ko
+TO_REMOVE+=/boot/kernel/ubsa.ko
+TO_REMOVE+=/boot/kernel/ubt.ko
+TO_REMOVE+=/boot/kernel/uchcom.ko
+TO_REMOVE+=/boot/kernel/ucom.ko
+TO_REMOVE+=/boot/kernel/ufm.ko
+TO_REMOVE+=/boot/kernel/uftdi.ko
+TO_REMOVE+=/boot/kernel/ugen.ko
+TO_REMOVE+=/boot/kernel/ugensa.ko
+TO_REMOVE+=/boot/kernel/ulpt.ko
+TO_REMOVE+=/boot/kernel/umct.ko
+TO_REMOVE+=/boot/kernel/umodem.ko
+TO_REMOVE+=/boot/kernel/uplcom.ko
+TO_REMOVE+=/boot/kernel/uscanner.ko
+TO_REMOVE+=/boot/kernel/uslcom.ko
+TO_REMOVE+=/boot/kernel/uticom.ko
+TO_REMOVE+=/boot/kernel/uvisor.ko
+TO_REMOVE+=/boot/kernel/uvscom.ko
+TO_REMOVE+=/usr/sbin/usbd
+TO_REMOVE+=/usr/share/man/cat5/usbd.conf.5.gz
+TO_REMOVE+=/usr/share/man/man5/usbd.conf.5.gz
+TO_REMOVE+=/usr/share/man/cat8/usbd.8.gz
+TO_REMOVE+=/usr/share/man/man8/usbd.8.gz
+TO_REMOVE+=/usr/sbin/usbdevs
+TO_REMOVE+=/usr/share/man/cat8/usbdevs.8.gz
+TO_REMOVE+=/usr/share/man/man8/usbdevs.8.gz
+.else
+TO_REMOVE+=/boot/kernel/if_udav.ko
+TO_REMOVE+=/boot/kernel/ohci.ko
+TO_REMOVE+=/boot/kernel/uaudio.ko
+TO_REMOVE+=/boot/kernel/uep.ko
+TO_REMOVE+=/boot/kernel/uether.ko
+TO_REMOVE+=/boot/kernel/uhci.ko
+TO_REMOVE+=/boot/kernel/usfs.ko
+TO_REMOVE+=/boot/kernel/xhci.ko
+.endif