summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/picobsd/build/Makefile.conf10
-rwxr-xr-xrelease/picobsd/build/build3
2 files changed, 6 insertions, 7 deletions
diff --git a/release/picobsd/build/Makefile.conf b/release/picobsd/build/Makefile.conf
index 8b11d2b..07fa8f3 100644
--- a/release/picobsd/build/Makefile.conf
+++ b/release/picobsd/build/Makefile.conf
@@ -3,10 +3,11 @@
# Makefile for building PICOBSD kernels
SRC?=/usr/src
+OBJ?=/usr/obj
CONF?=$(SRC)/sys/i386/conf
CONFFILE=PICOBSD${suffix}
-COMPILE=$(SRC)/sys/compile/$(CONFFILE)
+COMPILE=$(OBJ)/usr/src/sys/$(CONFFILE)
KERNFILE=$(COMPILE)/kernel
all: $(KERNFILE)
@@ -15,13 +16,10 @@ all: $(KERNFILE)
${CONF}/${CONFFILE}: PICOBSD
cp PICOBSD ${CONF}/${CONFFILE}
cp PICOBSD.hints ${CONF}/${CONFFILE}.hints
- (cd ${CONF}; \
- config ${CONFFILE}; \
- cd ${COMPILE}; \
- make depend -DNO_MODULES)
${COMPILE}: ${CONF}/${CONFFILE}
$(KERNFILE): ${COMPILE}
- (cd ${COMPILE}; make -DNO_MODULES)
+ (cd ${SRC}; \
+ make buildkernel KERNEL=${CONFFILE} -DNO_MODULES)
diff --git a/release/picobsd/build/build b/release/picobsd/build/build
index 872c518..5dbc335 100755
--- a/release/picobsd/build/build
+++ b/release/picobsd/build/build
@@ -6,6 +6,7 @@
# You can set the SRC variable which points to your source tree. It's
# /usr/src by default (most people shouldn't change it).
SRC=/usr/src
+OBJ=/usr/obj
# --------- YOU SHOULD NOT NEED TO CHANGE ANYTHING BELOW -----------
# The "build" script will ask you for parameters. Just run it... :-)
@@ -93,7 +94,7 @@ main() {
echo ""
sleep 2
- export MFS_SIZE LANGUAGE TYPE SRC NO_DEVFS INIT
+ export MFS_SIZE LANGUAGE TYPE SRC OBJ NO_DEVFS INIT
export SITE MFS_INODES FLOPPY_INODES FLOPPY_SIZE
./stage1
OpenPOWER on IntegriCloud