diff options
| -rw-r--r-- | release/picobsd/build/Makefile.crunch | 7 | ||||
| -rwxr-xr-x | release/picobsd/build/stage1 | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/release/picobsd/build/Makefile.crunch b/release/picobsd/build/Makefile.crunch index 8714a4c73253..53afe4f1c47e 100644 --- a/release/picobsd/build/Makefile.crunch +++ b/release/picobsd/build/Makefile.crunch @@ -8,11 +8,12 @@ all: crunch crunch: @cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf @( if [ -f crunch.inc ] ; then \ - crunchgen -h ./crunch.inc ./crunch1.conf ; \ + crunchgen -o -h ./crunch.inc ./crunch1.conf ; \ else \ - crunchgen ./crunch1.conf ; \ + crunchgen -o ./crunch1.conf ; \ fi ) - @env ${MAKE} -f crunch1.mk all + @perl -pi -e 's#${OBJ}#${PICO_OBJ}#g' crunch1.mk ; + @env MAKEOBJDIRPREFIX=${PICO_OBJ} ${MAKE} -f crunch1.mk all strip --remove-section=.note --remove-section=.comment crunch1 diff --git a/release/picobsd/build/stage1 b/release/picobsd/build/stage1 index 7fb2f5185ed5..42e419d9fb8c 100755 --- a/release/picobsd/build/stage1 +++ b/release/picobsd/build/stage1 @@ -14,6 +14,9 @@ MFS_NAME=fs.PICOBSD MFS_MOUNTPOINT=`mktemp -d "/tmp/picobsd.XXXXXXXXXX"` export MFS_MOUNTPOINT +PICO_OBJ=${OBJ}/picobsd/${TYPE} +export PICO_OBJ + # fail errno errcode # This function is used to trap errors and print msgs # |