libstand - Make ether_sprintf() public.
[dragonfly.git] / Makefile_upgrade.inc
index 50a3c1b..2c68093 100644 (file)
@@ -1186,9 +1186,9 @@ TO_REMOVE+=/usr/share/games/fortune/fortunes2.dat
 TO_REMOVE+=/usr/share/man/cat8/tmpfs.8.gz
 TO_REMOVE+=/usr/share/man/man8/tmpfs.8.gz
 TO_REMOVE+=/usr/include/sys/msfbuf.h
-TO_REMOVE+=/boot/modules/wlan_ratectl_amrr.ko
-TO_REMOVE+=/boot/modules/wlan_ratectl_onoe.ko
-TO_REMOVE+=/boot/modules/wlan_ratectl_sample.ko
+TO_REMOVE+=/boot/kernel/wlan_ratectl_amrr.ko
+TO_REMOVE+=/boot/kernel/wlan_ratectl_onoe.ko
+TO_REMOVE+=/boot/kernel/wlan_ratectl_sample.ko
 TO_REMOVE+=/usr/include/dev/netif/wi/spectrum24t_cf.h
 TO_REMOVE+=/usr/include/netproto/802_11/if_wavelan_ieee.h
 TO_REMOVE+=/usr/include/ktrfmt.tab.h
@@ -1202,7 +1202,7 @@ TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl_sample.4.gz
 TO_REMOVE+=/usr/share/man/man4/wlan_ratectl_sample.4.gz
 TO_REMOVE+=/usr/include/kadm5
 TO_REMOVE+=/usr/include/sys/fbsd_firmware.h
-TO_REMOVE+=/boot/modules/fbsd_firmware.ko
+TO_REMOVE+=/boot/kernel/fbsd_firmware.ko
 TO_REMOVE+=/usr/share/man/cat9/firmware_image_load.9.gz
 TO_REMOVE+=/usr/share/man/man9/firmware_image_load.9.gz
 TO_REMOVE+=/usr/share/man/cat9/firmware_image_unload.9.gz
@@ -2041,26 +2041,95 @@ TO_REMOVE+=/usr/include/machine/ultrasound.h
 TO_REMOVE+=/usr/include/bus/pci/pcidevs_data.h
 TO_REMOVE+=/usr/share/man/cat4/i386/apm.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/apm.4.gz
-
-.if ${MACHINE_ARCH} == "x86_64"
-TO_REMOVE+=/usr/libdata/stallion/2681.sys
-TO_REMOVE+=/usr/libdata/stallion/cdk.sys
+TO_REMOVE+=/usr/include/c++/4.1
+TO_REMOVE+=/usr/lib/gcc41
+TO_REMOVE+=/usr/libexec/gcc41
+TO_REMOVE+=/usr/libdata/gcc41
+TO_REMOVE+=/usr/share/man/man1/cpp41.1.gz
+TO_REMOVE+=/usr/share/man/man1/g++41.1.gz
+TO_REMOVE+=/usr/share/man/man1/gcc41.1.gz
+TO_REMOVE+=/usr/share/man/man1/gcov41.1.gz
+TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc41.mk
+TO_REMOVE+=/usr/include/objc/runtime.h
+TO_REMOVE+=/usr/share/info/cpp41.info.gz
+TO_REMOVE+=/usr/share/info/cppinternals41.info.gz
+TO_REMOVE+=/usr/share/info/gcc41.info.gz
+TO_REMOVE+=/usr/share/info/gccint41.info.gz
+TO_REMOVE+=/usr/share/man/cat1/cpp41.1.gz
+TO_REMOVE+=/usr/share/man/cat1/g++41.1.gz
+TO_REMOVE+=/usr/share/man/cat1/gcc41.1.gz
+TO_REMOVE+=/usr/share/man/cat1/gcov41.1.gz
+TO_REMOVE+=/usr/include/sys/caps.h
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_abort.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_abort.2.gz
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_client.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_client.2.gz
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_close.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_close.2.gz
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_get.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_get.2.gz
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_getgen.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_getgen.2.gz
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_put.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_put.2.gz
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_reply.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_reply.2.gz
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_service.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_service.2.gz
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_setgen.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_setgen.2.gz
+TO_REMOVE+=/usr/share/man/cat2/caps_sys_wait.2.gz
+TO_REMOVE+=/usr/share/man/man2/caps_sys_wait.2.gz
+TO_REMOVE+=/var/caps
+TO_REMOVE+=/usr/include/objc
+TO_REMOVE+=/usr/include/machine/pc/msdos.h
+TO_REMOVE+=/usr/share/man/cat4/i386/stli.4.gz
+TO_REMOVE+=/usr/share/man/man4/i386/stli.4.gz
 TO_REMOVE+=/usr/sbin/stlload
 TO_REMOVE+=/usr/share/man/cat8/i386/stlload.8.gz
 TO_REMOVE+=/usr/share/man/man8/i386/stlload.8.gz
-TO_REMOVE+=/usr/sbin/stlstats
-TO_REMOVE+=/usr/share/man/cat8/i386/stlstats.8.gz
-TO_REMOVE+=/usr/share/man/man8/i386/stlstats.8.gz
 TO_REMOVE+=/usr/sbin/stlstty
 TO_REMOVE+=/usr/share/man/cat8/i386/stlstty.8.gz
 TO_REMOVE+=/usr/share/man/man8/i386/stlstty.8.gz
+TO_REMOVE+=/usr/libdata/stallion
+TO_REMOVE+=/usr/include/bus/isa/isa_compat.h
+TO_REMOVE+=/usr/include/sys/upcall.h
+TO_REMOVE+=/usr/share/man/cat2/upc_control.2.gz
+TO_REMOVE+=/usr/share/man/man2/upc_control.2.gz
+TO_REMOVE+=/usr/share/man/cat2/upc_register.2.gz
+TO_REMOVE+=/usr/share/man/man2/upc_register.2.gz
+TO_REMOVE+=/usr/share/man/cat9/VFS_INIT.9.gz
+TO_REMOVE+=/usr/share/man/man9/VFS_INIT.9.gz
+TO_REMOVE+=/sbin/mknod
+TO_REMOVE+=/usr/share/man/cat8/mknod.8.gz
+TO_REMOVE+=/usr/share/man/man8/mknod.8.gz
+TO_REMOVE+=/usr/share/man/cat2/aio_cancel.2.gz
+TO_REMOVE+=/usr/share/man/man2/aio_cancel.2.gz
+TO_REMOVE+=/usr/share/man/cat2/aio_error.2.gz
+TO_REMOVE+=/usr/share/man/man2/aio_error.2.gz
+TO_REMOVE+=/usr/share/man/cat2/aio_read.2.gz
+TO_REMOVE+=/usr/share/man/man2/aio_read.2.gz
+TO_REMOVE+=/usr/share/man/cat2/aio_return.2.gz
+TO_REMOVE+=/usr/share/man/man2/aio_return.2.gz
+TO_REMOVE+=/usr/share/man/cat2/aio_suspend.2.gz
+TO_REMOVE+=/usr/share/man/man2/aio_suspend.2.gz
+TO_REMOVE+=/usr/share/man/cat2/aio_waitcomplete.2.gz
+TO_REMOVE+=/usr/share/man/man2/aio_waitcomplete.2.gz
+TO_REMOVE+=/usr/share/man/cat2/aio_write.2.gz
+TO_REMOVE+=/usr/share/man/man2/aio_write.2.gz
+
+.if ${MACHINE_ARCH} == "x86_64"
+TO_REMOVE+=/usr/sbin/stlstats
+TO_REMOVE+=/usr/share/man/cat8/i386/stlstats.8.gz
+TO_REMOVE+=/usr/share/man/man8/i386/stlstats.8.gz
 TO_REMOVE+=/usr/share/man/cat4/i386/stl.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/stl.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/stli.4.gz
-TO_REMOVE+=/usr/share/man/man4/i386/stli.4.gz
 TO_REMOVE+=/usr/sbin/kgzip
 TO_REMOVE+=/usr/share/man/cat8/kgzip.8.gz
 TO_REMOVE+=/usr/share/man/man8/kgzip.8.gz
+TO_REMOVE+=/usr/sbin/pnpinfo
+TO_REMOVE+=/usr/share/man/cat8/pnpinfo.8.gz
+TO_REMOVE+=/usr/share/man/man8/pnpinfo.8.gz
 .endif
 
 # XXX Remove when pfsync(4) has been fixed
@@ -2068,21 +2137,76 @@ TO_REMOVE+=/usr/share/man/cat4/pfsync.4.gz
 TO_REMOVE+=/usr/share/man/man4/pfsync.4.gz
 
 # XXX Remove when adjusted to the new 802.11 framework
-TO_REMOVE+=/boot/modules/if_acx.ko
+TO_REMOVE+=/boot/kernel/if_acx.ko
 TO_REMOVE+=/usr/share/man/cat4/acx.4.gz
 TO_REMOVE+=/usr/share/man/man4/acx.4.gz
-TO_REMOVE+=/boot/modules/if_bwi.ko
+TO_REMOVE+=/boot/kernel/if_bwi.ko
 TO_REMOVE+=/usr/share/man/cat4/bwi.4.gz
 TO_REMOVE+=/usr/share/man/man4/bwi.4.gz
-TO_REMOVE+=/boot/modules/if_iwl.ko
+TO_REMOVE+=/boot/kernel/if_iwl.ko
 TO_REMOVE+=/usr/share/man/cat4/iwl.4.gz
 TO_REMOVE+=/usr/share/man/man4/iwl.4.gz
-TO_REMOVE+=/boot/modules/if_rtw.ko
+TO_REMOVE+=/boot/kernel/if_rtw.ko
 TO_REMOVE+=/usr/share/man/cat4/rtw.4.gz
 TO_REMOVE+=/usr/share/man/man4/rtw.4.gz
-TO_REMOVE+=/boot/modules/if_rum.ko
+TO_REMOVE+=/boot/kernel/if_rum.ko
 TO_REMOVE+=/usr/share/man/cat4/rum.4.gz
 TO_REMOVE+=/usr/share/man/man4/rum.4.gz
-TO_REMOVE+=/boot/modules/if_ural.ko
+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
+.if defined(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/usb_quirk.ko
+TO_REMOVE+=/boot/kernel/usfs.ko
+TO_REMOVE+=/boot/kernel/xhci.ko
+TO_REMOVE+=/usr/lib/libusb.a
+TO_REMOVE+=/usr/lib/libusb.so.2
+TO_REMOVE+=/usr/lib/libusb.so
+TO_REMOVE+=/usr/lib/profile/libusb.a
+TO_REMOVE+=/usr/sbin/usbcontrol
+TO_REMOVE+=/usr/share/man/cat8/usbcontrol.8.gz
+TO_REMOVE+=/usr/share/man/man8/usbcontrol.8.gz
+.endif