scripts

misc scripts and tools
git clone git://git.2f30.org/scripts.git
Log | Files | Refs

commit 52725c7aabaf104c21c9163934b4b015b24d27de
parent 10c098474d809f51dfd2b60175abd5702d99f561
Author: sin <sin@2f30.org>
Date:   Tue Sep  2 15:49:10 +0100

Fix sysmerge usage in upgrade-obsd and build GENERIC.MP by default

Some more stylistic changes as well.

Diffstat:
upgrade-obsd | 12++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/upgrade-obsd b/upgrade-obsd @@ -4,22 +4,18 @@ # and/or /usr/xenocara is up to date. kernel() { - # Build the bsd.sp kernel. - # Ideally we should reboot after this stage - # and build the world with the new kernel. cd /usr/src/sys/arch/`uname -m`/conf - config GENERIC - cd ../compile/GENERIC + config GENERIC.MP + cd /usr/src/sys/arch/`uname -m`/compile/GENERIC.MP make clean make make install - # config -ef /bsd } world() { # Build the world - cd /usr/src rm -rf /usr/obj/* + cd /usr/src make clean make obj cd /usr/src/etc && env DESTDIR=/ make distrib-dirs @@ -41,7 +37,7 @@ finish() { cd /dev cp /usr/src/etc/etc.`machine`/MAKEDEV ./ ./MAKEDEV all - sysmerge -s /usr/src + sysmerge } kernel