Makefile_upgrade.inc: Adjust modules path.

This can be helpful in cases where old modules for some reason
had not been cleaned when the location was still /boot/modules
and have ended up getting objcopy'd to /boot/kernel after the
location was changed.

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 1baca75..abcd77c 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -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
@@ -2089,21 +2089,21 @@ 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