nanobsd and -current

[Marc Veldman]

On Fri, Sep 15, 2006 at 01:31:52AM +0400, Ruslan Ermilov wrote:

> > I want to slim it down to fit on a 64 MB usb key but it's not immediatly 
> > how to do this from the 'docs'
> > I'm resorting to reading the scripts and then the Makefiles but if 
> > anyone has this alreay all written down somewhere
> > that would be good.
> > 
> NO*'s are still provided for compatibility, but the modern syntax is
> WITH/WITHOUT, please see the src.conf(5) manpage for details.

I have changed the nanobsd.sh script to use an src.conf as well as a 
make.conf file. This should bring it more into line with the -current
way of making world. Diff is attached, as well as a sample conf file.

If it is useful, maybe someone could commit it.

Cheers,

Marc Veldman.
-------------- next part --------------
*** nanobsd.sh	Tue Aug 15 23:59:33 2006
--- nanobsd.src.sh	Fri Sep 15 18:01:11 2006
***************
*** 130,138 ****
  
  make_conf_build ( ) (
  	echo "## Construct build make.conf ($NANO_MAKE_CONF)"
- 
  	echo "${CONF_WORLD}" > ${NANO_MAKE_CONF}
  	echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF}
  )
  
  build_world ( ) (
--- 130,142 ----
  
  make_conf_build ( ) (
  	echo "## Construct build make.conf ($NANO_MAKE_CONF)"
  	echo "${CONF_WORLD}" > ${NANO_MAKE_CONF}
  	echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF}
+ 
+ 	echo "## Construct build src.conf ($NANO_SRC_CONF)"
+ 	echo "${SRC_WORLD}" > ${NANO_SRC_CONF}
+ 	echo "${SRC_BUILD}" >> ${NANO_SRC_CONF}
+ 
  )
  
  build_world ( ) (
***************
*** 140,147 ****
  	echo "### log: ${MAKEOBJDIRPREFIX}/_.bw"
  
  	cd ${NANO_SRC}
! 	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} buildworld \
! 		> ${MAKEOBJDIRPREFIX}/_.bw 2>&1
  )
  
  build_kernel ( ) (
--- 144,151 ----
  	echo "### log: ${MAKEOBJDIRPREFIX}/_.bw"
  
  	cd ${NANO_SRC}
! 	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} SRCCONF=${NANO_SRC_CONF} \
! 		buildworld > ${MAKEOBJDIRPREFIX}/_.bw 2>&1
  )
  
  build_kernel ( ) (
***************
*** 155,161 ****
  	cd ${NANO_SRC}
  	${NANO_PMAKE} buildkernel \
  		__MAKE_CONF=${NANO_MAKE_CONF} KERNCONF=${NANO_KERNEL} \
! 		> ${MAKEOBJDIRPREFIX}/_.bk 2>&1
  )
  
  clean_world ( ) (
--- 159,165 ----
  	cd ${NANO_SRC}
  	${NANO_PMAKE} buildkernel \
  		__MAKE_CONF=${NANO_MAKE_CONF} KERNCONF=${NANO_KERNEL} \
! 		SRCCONF=${NANO_SRC_CONF} > ${MAKEOBJDIRPREFIX}/_.bk 2>&1
  )
  
  clean_world ( ) (
***************
*** 171,179 ****
  
  make_conf_install ( ) (
  	echo "## Construct install make.conf ($NANO_MAKE_CONF)"
- 
  	echo "${CONF_WORLD}" > ${NANO_MAKE_CONF}
  	echo "${CONF_INSTALL}" >> ${NANO_MAKE_CONF}
  )
  
  install_world ( ) (
--- 175,186 ----
  
  make_conf_install ( ) (
  	echo "## Construct install make.conf ($NANO_MAKE_CONF)"
  	echo "${CONF_WORLD}" > ${NANO_MAKE_CONF}
  	echo "${CONF_INSTALL}" >> ${NANO_MAKE_CONF}
+ 
+ 	echo "## Construct install src.conf ($NANO_SRC_CONF)"
+ 	echo "${SRC_WORLD}" > ${NANO_SRC_CONF}
+ 	echo "${SRC_INSTALL}" >> ${NANO_SRC_CONF}
  )
  
  install_world ( ) (
***************
*** 181,188 ****
  	echo "### log: ${MAKEOBJDIRPREFIX}/_.iw"
  
  	cd ${NANO_SRC}
! 	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} installworld \
! 		DESTDIR=${NANO_WORLDDIR} \
  		> ${MAKEOBJDIRPREFIX}/_.iw 2>&1
  	chflags -R noschg ${NANO_WORLDDIR}
  )
--- 188,195 ----
  	echo "### log: ${MAKEOBJDIRPREFIX}/_.iw"
  
  	cd ${NANO_SRC}
! 	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} SRCCONF=${NANO_SRC_CONF} \
! 		installworld DESTDIR=${NANO_WORLDDIR} \
  		> ${MAKEOBJDIRPREFIX}/_.iw 2>&1
  	chflags -R noschg ${NANO_WORLDDIR}
  )
***************
*** 193,200 ****
  	echo "### log: ${MAKEOBJDIRPREFIX}/_.etc"
  
  	cd ${NANO_SRC}
! 	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} distribution \
! 		DESTDIR=${NANO_WORLDDIR} \
  		> ${MAKEOBJDIRPREFIX}/_.etc 2>&1
  )
  
--- 200,207 ----
  	echo "### log: ${MAKEOBJDIRPREFIX}/_.etc"
  
  	cd ${NANO_SRC}
! 	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} SRCCONF=${NANO_SRC_CONF} \
! 		distribution DESTDIR=${NANO_WORLDDIR} \
  		> ${MAKEOBJDIRPREFIX}/_.etc 2>&1
  )
  
***************
*** 204,211 ****
  
  	cd ${NANO_SRC}
  	${NANO_PMAKE} installkernel \
! 		DESTDIR=${NANO_WORLDDIR} \
! 		__MAKE_CONF=${NANO_MAKE_CONF} KERNCONF=${NANO_KERNEL} \
  		> ${MAKEOBJDIRPREFIX}/_.ik 2>&1
  )
  
--- 211,218 ----
  
  	cd ${NANO_SRC}
  	${NANO_PMAKE} installkernel \
! 		DESTDIR=${NANO_WORLDDIR} __MAKE_CONF=${NANO_MAKE_CONF} \
! 		SRCCONF=${NANO_SRC_CONF} KERNCONF=${NANO_KERNEL} \
  		> ${MAKEOBJDIRPREFIX}/_.ik 2>&1
  )
  
***************
*** 543,548 ****
--- 550,556 ----
  
  NANO_WORLDDIR=${MAKEOBJDIRPREFIX}/_.w
  NANO_MAKE_CONF=${MAKEOBJDIRPREFIX}/make.conf
+ NANO_SRC_CONF=${MAKEOBJDIRPREFIX}/src.conf
  
  if [ -d ${NANO_TOOLS} ] ; then
  	true
***************
*** 564,569 ****
--- 572,578 ----
  export NANO_HEADS
  export NANO_IMAGES
  export NANO_MAKE_CONF
+ export NANO_SRC_CONF
  export NANO_MEDIASIZE
  export NANO_NAME
  export NANO_NEWFS
-------------- next part --------------
NANO_NAME=custom
NANO_SRC=/usr/src
NANO_KERNEL=SOEKRIS4521
NANO_IMAGES=2

SRC_BUILD='
WITHOUT_KLDLOAD=YES
WITHOUT_NETGRAPH=YES
WITHOUT_PAM=YES
'

SRC_INSTALL='
WITHOUT_ACPI=YES
WITHOUT_BLUETOOTH=YES
WITHOUT_CVS=YES
WITHOUT_FORTRAN=YES
WITHOUT_HTML=YES
WITHOUT_LPR=YES
WITHOUT_MAN=YES
WITHOUT_SENDMAIL=YES
WITHOUT_SHAREDOCS=YES
WITHOUT_EXAMPLES=YES
WITHOUT_INSTALLLIB=YES
WITHOUT_CALENDAR=YES
WITHOUT_MISC=YES
WITHOUT_SHARE=YES
'

SRC_WORLD='
WITHOUT_BIND=YES
WITHOUT_MODULES=YES
WITHOUT_KERBEROS=YES
WITHOUT_GAMES=YES
WITHOUT_RESCUE=YES
WITHOUT_LOCALES=YES
WITHOUT_SYSCONS=YES
WITHOUT_INFO=YES
'

FlashDevice SanDisk 1G