commit 43ed114d438fa16fdd114a01bc3a12c02257855e
parent 52725c7aabaf104c21c9163934b4b015b24d27de
Author: sin <sin@2f30.org>
Date:   Tue,  2 Sep 2014 15:52:51 +0100
Some more stylistic changes
Make sure we do a make clean for xenocara as well (not strictly
necessary though).
Diffstat:
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/upgrade-obsd b/upgrade-obsd
@@ -3,7 +3,7 @@
 # You will have to manually ensure that your /usr/src
 # and/or /usr/xenocara is up to date.
 
-kernel() {
+buildkernel() {
 	cd /usr/src/sys/arch/`uname -m`/conf
 	config GENERIC.MP
 	cd /usr/src/sys/arch/`uname -m`/compile/GENERIC.MP
@@ -12,8 +12,7 @@ kernel() {
 	make install
 }
 
-world() {
-	# Build the world
+buildworld() {
 	rm -rf /usr/obj/*
 	cd /usr/src
 	make clean
@@ -23,24 +22,23 @@ world() {
 	make build
 }
 
-xenocara() {
-	# Build xenocara
-	cd /usr/xenocara
+buildxenocara() {
 	rm -rf /usr/xobj/*
+	cd /usr/xenocara
+	make clean
 	make bootstrap
 	make obj
 	make build
 }
 
 finish() {
-	# Make device nodes
 	cd /dev
 	cp /usr/src/etc/etc.`machine`/MAKEDEV ./
 	./MAKEDEV all
 	sysmerge
 }
 
-kernel
-world
-xenocara
+buildkernel
+buildworld
+buildxenocara
 finish