# HG changeset patch # Parent 41ecf82bf7b874e69efb1e10b5b00e257f710d98 Make it easier to move /usr/obj. diff -r 41ecf82bf7b8 tools/tools/nanobsd/rescue/build.sh --- a/tools/tools/nanobsd/rescue/build.sh +++ b/tools/tools/nanobsd/rescue/build.sh @@ -4,6 +4,8 @@ # today=`date '+%Y%m%d'` +O=/usr/obj +R=$O/Rescue if [ -z "${1}" -o \! -f "${1}" ]; then echo "Usage: $0 cfg_file [-bhiknw]" @@ -17,14 +19,14 @@ fi CFG="${1}" shift; -if [ \! -d /usr/obj/Rescue ]; then - mkdir -p /usr/obj/Rescue +if [ \! -d $R ]; then + mkdir -p $R fi sh ../nanobsd.sh $* -c ${CFG} -F32="/usr/obj/Rescue/rescue_${today}_x32" -D32="/usr/obj/nanobsd.rescue_i386" +F32="$R/rescue_${today}_x32" +D32="$O/nanobsd.rescue_i386" if [ -f "${D32}/_.disk.full" ]; then mv "${D32}/_.disk.full" "${F32}.img" fi @@ -32,11 +34,19 @@ if [ -f "${D32}/_.disk.iso" ]; then mv "${D32}/_.disk.iso" "${F32}.iso" fi -F64="/usr/obj/Rescue/rescue_${today}_x64" -D64="/usr/obj/nanobsd.rescue_amd64" +F64="$R/rescue_${today}_x64" +D64="$O/nanobsd.rescue_amd64" if [ -f "${D64}/_.disk.full" ]; then mv "${D64}/_.disk.full" "${F64}.img" fi if [ -f "${D64}/_.disk.iso" ]; then mv "${D64}/_.disk.iso" "${F64}.iso" fi + +# Note: this is experimental and not yet a full image like +# crochet produces +FPI="$R/rescue_${today}_rpi" +DPI="$O/nanobsd.rescue_armv6" +if [ -f "${DPI}/_.disk.full" ]; then + mv "${DPI}/_.disk.full" "${F64}.img" +fi diff -r 41ecf82bf7b8 tools/tools/nanobsd/rescue/rescue_rpi.conf --- /dev/null +++ b/tools/tools/nanobsd/rescue/rescue_rpi.conf @@ -0,0 +1,8 @@ +# +# $FreeBSD$ +# +NANO_KERNEL=RPI-B +NANO_ARCH=armv6 +NANO_NAME=rescue_armv6 + +. common