Problem during kernel-build for a 6.x-to-7 upgrade

[clevershark]

I was doing an upgrade according to the instructions contained here:

http://people.freebsd.org/~rse/upgra...rade-6x-7x.txt

Things were going quite well until I got to the world-build and kernel-build instruction. I had an outdated directive (options GEOM_GPT) which resulted in the kernel build ending prematurely. At that point I had successfully completed the world-build, which in the instructions is done on the same line.

So I edited my kernel config file to remove the offending directive, and did a simple make kernel-build, but now the process doesn't even get started. I get this strange message:

only one machine directive is allowed

However I checked, and my machine configuration file only has the one machine directive. Has this happened to anyone else before? What could be causing this issue?

[glenbarber]

make buildworld

and

make buildkernel

[Carpetsmoker]

Originally Posted by clevershark

I was doing an upgrade according to the instructions contained here:

http://people.freebsd.org/~rse/upgra...rade-6x-7x.txt

IMO those instructions are unnecessarily complicated, I would just follow the official instructions contained in /usr/src/Makefile

# For individuals wanting to upgrade their sources (even if only a
# delta of a few days):
#
#  1.  `cd /usr/src'       (or to the directory containing your source tree).
#  2.  `make buildworld'
#  3.  `make buildkernel KERNCONF=YOUR_KERNEL_HERE'     (default is GENERIC).
#  4.  `make installkernel KERNCONF=YOUR_KERNEL_HERE'   (default is GENERIC).
#       [steps 3. & 4. can be combined by using the "kernel" target]
#  5.  `reboot'        (in single user mode: boot -s from the loader prompt).
#  6.  `mergemaster -p'
#  7.  `make installworld'
#  8.  `make delete-old'
#  9.  `mergemaster'                         (you may wish to use -U or -ai).
# 10.  `reboot'
# 11.  `make delete-old-libs' (in case no 3rd party program uses them anymore)

Personally, I always skip step 5, have done so since FreeBSD 4 and never had any problems.