Build - for /rescue transition must make upgrade
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 13 Aug 2018 04:03:28 +0000 (21:03 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 13 Aug 2018 04:03:28 +0000 (21:03 -0700)
* Must make upgrade before make rescue when transitioning to the new
  /rescue topology.

* Must ensure certain header files are not present.  make rescue
  currently improperly uses /usr/include which can have all sorts of
  cruft in it.

* This is a quick hack, will be fixed by a later cleanup of the
  make rescue target to properly split it into buildworld (to build)
  and installworld (to install).

Makefile.inc1
Makefile_upgrade.inc

index fa91c90..bfdb5a4 100644 (file)
@@ -496,6 +496,10 @@ installworld: installcheck
        # Do not leave an empty '/rescue' directory when switching the rescue
        # tools from '/usr/share/initrd' to '/rescue'.
        @echo "--------------------------------------------------------------"
+       @echo ">>> we have to run make upgrade to transition rescue tools"
+       @echo "--------------------------------------------------------------"
+       (cd ${.CURDIR} && make upgrade)
+       @echo "--------------------------------------------------------------"
        @echo ">>> build and install rescue tools"
        @echo "--------------------------------------------------------------"
        (cd ${.CURDIR} && make rescue)
index c4ab960..0cf6718 100644 (file)
@@ -3431,6 +3431,12 @@ TO_REMOVE+=/usr/share/man/man8/mkinitrd.8.gz
 TO_REMOVE+=/rescue/rescue.sbin
 TO_REMOVE+=/usr/share/man/man3/fpresetsticky.3.gz
 
+# Obsolete /usr/include files that blow up the kdump build
+# during a make rescue
+#
+TO_REMOVE+=/usr/include/bus/pccard/cardinfo.h
+TO_REMOVE+=/usr/include/linux/linux_input.h
+
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
 TO_REMOVE+=/usr/sbin/dfuife_curses