From owner-freebsd-embedded@FreeBSD.ORG Mon Jun 15 11:06:51 2009 Return-Path: Delivered-To: freebsd-embedded@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA44E1065672 for ; Mon, 15 Jun 2009 11:06:51 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C71D38FC0A for ; Mon, 15 Jun 2009 11:06:51 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5FB6psx076860 for ; Mon, 15 Jun 2009 11:06:51 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5FB6pxk076856 for freebsd-embedded@FreeBSD.org; Mon, 15 Jun 2009 11:06:51 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 15 Jun 2009 11:06:51 GMT Message-Id: <200906151106.n5FB6pxk076856@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: freebsd-embedded@FreeBSD.org Cc: Subject: Current problem reports assigned to freebsd-embedded@FreeBSD.org X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2009 11:06:52 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o misc/135301 embedded [tinybsd] [patch] Patch for fix architecture support f o kern/101228 embedded [nanobsd] [patch] Two more entries for FlashDevice.sub o misc/52256 embedded [picobsd] picobsd build script does not read in user/s o kern/42728 embedded [picobsd] many problems in src/usr.sbin/ppp/* after c o misc/15876 embedded [picobsd] PicoBSD message of the day problems 5 problems total. From owner-freebsd-embedded@FreeBSD.ORG Tue Jun 16 12:06:14 2009 Return-Path: Delivered-To: freebsd-embedded@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51DFF106566C; Tue, 16 Jun 2009 12:06:14 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 26D938FC0A; Tue, 16 Jun 2009 12:06:14 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (edwin@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GC6EN1081971; Tue, 16 Jun 2009 12:06:14 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5GC6DjM081967; Tue, 16 Jun 2009 12:06:13 GMT (envelope-from edwin) Date: Tue, 16 Jun 2009 12:06:13 GMT Message-Id: <200906161206.n5GC6DjM081967@freefall.freebsd.org> To: henrik@brixandersen.dk, edwin@FreeBSD.org, freebsd-embedded@FreeBSD.org, edwin@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: kern/101228: [nanobsd] [patch] Two more entries for FlashDevice.sub X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2009 12:06:14 -0000 Synopsis: [nanobsd] [patch] Two more entries for FlashDevice.sub State-Changed-From-To: open->patched State-Changed-By: edwin State-Changed-When: Tue Jun 16 12:05:47 UTC 2009 State-Changed-Why: Commited to head, waiting for MFC. Responsible-Changed-From-To: freebsd-embedded->edwin Responsible-Changed-By: edwin Responsible-Changed-When: Tue Jun 16 12:05:47 UTC 2009 Responsible-Changed-Why: I'll handle the MFC http://www.freebsd.org/cgi/query-pr.cgi?pr=101228 From owner-freebsd-embedded@FreeBSD.ORG Tue Jun 16 21:02:16 2009 Return-Path: Delivered-To: freebsd-embedded@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E13B106564A; Tue, 16 Jun 2009 21:02:16 +0000 (UTC) (envelope-from vwe@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1E6948FC0C; Tue, 16 Jun 2009 21:02:16 +0000 (UTC) (envelope-from vwe@FreeBSD.org) Received: from freefall.freebsd.org (vwe@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GL2GBJ097941; Tue, 16 Jun 2009 21:02:16 GMT (envelope-from vwe@freefall.freebsd.org) Received: (from vwe@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5GL2F9W097937; Tue, 16 Jun 2009 21:02:15 GMT (envelope-from vwe) Date: Tue, 16 Jun 2009 21:02:15 GMT Message-Id: <200906162102.n5GL2F9W097937@freefall.freebsd.org> To: vwe@FreeBSD.org, freebsd-bugs@FreeBSD.org, freebsd-embedded@FreeBSD.org From: vwe@FreeBSD.org Cc: Subject: Re: misc/135588: [nanobsd] simple patch for adding amd64 support X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2009 21:02:16 -0000 Synopsis: [nanobsd] simple patch for adding amd64 support Responsible-Changed-From-To: freebsd-bugs->freebsd-embedded Responsible-Changed-By: vwe Responsible-Changed-When: Tue Jun 16 21:00:32 UTC 2009 Responsible-Changed-Why: I hate code duplication. If it's really the same code, there's no need to copy'n paste. It's much simpler to maintain something like the following patch. Over to maintainer(s). sample replacement patch may look like: --- nanobsd.sh.orig 2009-06-16 22:56:29.000000000 +0200 +++ nanobsd.sh 2009-06-16 23:00:09.000000000 +0200 @@ -490,6 +490,10 @@ ) > ${MAKEOBJDIRPREFIX}/_.di 2>&1 ) +create_amd64_diskimage ( ) ( + create_i386_diskimage $@ +) + last_orders () ( # Redefine this function with any last orders you may have # after the build completed, for instance to copy the finished http://www.freebsd.org/cgi/query-pr.cgi?pr=135588 From owner-freebsd-embedded@FreeBSD.ORG Thu Jun 18 12:04:54 2009 Return-Path: Delivered-To: freebsd-embedded@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2331106566B for ; Thu, 18 Jun 2009 12:04:54 +0000 (UTC) (envelope-from nick@van-laarhoven.org) Received: from baranao.anywi.com (baranao.anywi.com [213.207.101.176]) by mx1.freebsd.org (Postfix) with ESMTP id 11AD18FC15 for ; Thu, 18 Jun 2009 12:04:53 +0000 (UTC) (envelope-from nick@van-laarhoven.org) Received: from hind.van-laarhoven.org (ip51cfcfde.direct-adsl.nl [81.207.207.222]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by baranao.anywi.com (Postfix) with ESMTPSA id BF8733F41E for ; Thu, 18 Jun 2009 14:04:49 +0200 (CEST) Content-Disposition: inline From: Nick Hibma To: FreeBSD Embedded Mailing List Date: Thu, 18 Jun 2009 14:04:47 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200906181404.48264.nick@van-laarhoven.org> X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,J_CHICKENPOX_31, J_CHICKENPOX_46,UNPARSEABLE_RELAY autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on baranao.anywi.com Cc: Subject: svn commit: r194431 - head/tools/tools/nanobsd X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2009 12:04:57 -0000 I've just committed a change to nanobsd that allows to build multiple different images with one built world. This is convenient if you, like us, have several projects with different nanobsd.conf files which create different images, but based on the same image. If you do not use this feature, this should be a no-op. Let me know if you run into problems. Nick > Author: n_hibma > Date: Thu Jun 18 10:39:08 2009 > New Revision: 194431 > URL: http://svn.freebsd.org/changeset/base/194431 > > Log: > Allow building world into a separate dir (for reuse in multiple > images): - buildworld and buildkernel are built into MAKEOBJDIRPREFIX > - installworld and installkernel are performed on NANO_OBJ. > > No change of functionality if MAKEOBJDIRPREFIX is not set. If it is > sea,t clean_world deletes NANO_OBJ instead of NANO_WORLDDIR. By starting > nanobsd.sh with the -b option the existing world can be reused to build a > new world reducing time and disk space considerably. > > While there: > - Fix two cases where (in comments) MAKEOBJDIRPREFIX should have been > NANO_DISKIMGDIR. > - Simplify an 'if (not wrong); then true; else action; fi' into > 'if wrong; then action; fi'. 'if ! false; then echo hello; fi' > produces hello. > > Note: Make sure you use NANO_OBJ were you use MAKEOBJDIRPREFIX now in > your nanobsd.conf files if you want to split out. > > Modified: > head/tools/tools/nanobsd/nanobsd.sh > > Modified: head/tools/tools/nanobsd/nanobsd.sh > ========================================================================= >===== --- head/tools/tools/nanobsd/nanobsd.sh Thu Jun 18 09:55:26 > 2009 (r194430) +++ head/tools/tools/nanobsd/nanobsd.sh Thu Jun 18 > 10:39:08 2009 (r194431) @@ -51,7 +51,6 @@ NANO_PACKAGE_LIST="*" > > # Object tree directory > # default is subdir of /usr/obj > -# XXX: MAKEOBJDIRPREFIX handling... ? > #NANO_OBJ="" > > # The directory to put the final images > @@ -147,21 +146,19 @@ NANO_ARCH=i386 > clean_build ( ) ( > pprint 2 "Clean and create object directory (${MAKEOBJDIRPREFIX})" > > - if rm -rf ${MAKEOBJDIRPREFIX} > /dev/null 2>&1 ; then > - true > - else > + if ! rm -rf ${MAKEOBJDIRPREFIX} > /dev/null 2>&1 ; then > chflags -R noschg ${MAKEOBJDIRPREFIX} > - rm -rf ${MAKEOBJDIRPREFIX} > + rm -r ${MAKEOBJDIRPREFIX} > fi > mkdir -p ${MAKEOBJDIRPREFIX} > printenv > ${MAKEOBJDIRPREFIX}/_.env > ) > > make_conf_build ( ) ( > - pprint 2 "Construct build make.conf ($NANO_MAKE_CONF)" > + pprint 2 "Construct build make.conf ($NANO_MAKE_CONF_BUILD)" > > - echo "${CONF_WORLD}" > ${NANO_MAKE_CONF} > - echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF} > + echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_BUILD} > + echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF_BUILD} > ) > > build_world ( ) ( > @@ -170,7 +167,7 @@ build_world ( ) ( > > cd ${NANO_SRC} > env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} \ > - __MAKE_CONF=${NANO_MAKE_CONF} buildworld \ > + __MAKE_CONF=${NANO_MAKE_CONF_BUILD} buildworld \ > > > ${MAKEOBJDIRPREFIX}/_.bw 2>&1 > > ) > > @@ -188,62 +185,70 @@ build_kernel ( ) ( > unset TARGET_CPUTYPE > unset TARGET_BIG_ENDIAN > env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \ > - __MAKE_CONF=${NANO_MAKE_CONF} KERNCONF=`basename ${NANO_KERNEL}` \ > - > ${MAKEOBJDIRPREFIX}/_.bk 2>&1 > + __MAKE_CONF=${NANO_MAKE_CONF_BUILD} KERNCONF=`basename ${NANO_KERNEL}` > \ + > ${NANO_OBJ}/_.bk 2>&1 > ) > ) > > clean_world ( ) ( > - pprint 2 "Clean and create world directory (${NANO_WORLDDIR})" > - if rm -rf ${NANO_WORLDDIR}/ > /dev/null 2>&1 ; then > - true > + if [ "${NANO_OBJ}" != "${MAKEOBJDIRPREFIX}" ]; then > + pprint 2 "Clean and create object directory (${NANO_OBJ})" > + if ! rm -rf ${NANO_OBJ} > /dev/null 2>&1 ; then > + chflags -R noschg ${NANO_OBJ} > + rm -r ${NANO_OBJ} > + fi > + mkdir -p ${NANO_OBJ} ${NANO_WORLDDIR} > + printenv > ${NANO_OBJ}/_.env > else > - chflags -R noschg ${NANO_WORLDDIR}/ > - rm -rf ${NANO_WORLDDIR}/ > + pprint 2 "Clean and create world directory (${NANO_WORLDDIR})" > + if ! rm -rf ${NANO_WORLDDIR}/ > /dev/null 2>&1 ; then > + chflags -R noschg ${NANO_WORLDDIR} > + rm -rf ${NANO_WORLDDIR} > + fi > + mkdir -p ${NANO_WORLDDIR} > fi > - mkdir -p ${NANO_WORLDDIR}/ > ) > > make_conf_install ( ) ( > - pprint 2 "Construct install make.conf ($NANO_MAKE_CONF)" > + pprint 2 "Construct install make.conf ($NANO_MAKE_CONF_INSTALL)" > > - echo "${CONF_WORLD}" > ${NANO_MAKE_CONF} > - echo "${CONF_INSTALL}" >> ${NANO_MAKE_CONF} > + echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_INSTALL} > + echo "${CONF_INSTALL}" >> ${NANO_MAKE_CONF_INSTALL} > ) > > install_world ( ) ( > pprint 2 "installworld" > - pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.iw" > + pprint 3 "log: ${NANO_OBJ}/_.iw" > > cd ${NANO_SRC} > env TARGET_ARCH=${NANO_ARCH} \ > - ${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} installworld \ > + ${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \ > DESTDIR=${NANO_WORLDDIR} \ > - > ${MAKEOBJDIRPREFIX}/_.iw 2>&1 > + > ${NANO_OBJ}/_.iw 2>&1 > chflags -R noschg ${NANO_WORLDDIR} > ) > > install_etc ( ) ( > > pprint 2 "install /etc" > - pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.etc" > + pprint 3 "log: ${NANO_OBJ}/_.etc" > > cd ${NANO_SRC} > env TARGET_ARCH=${NANO_ARCH} \ > - ${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} distribution \ > + ${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \ > DESTDIR=${NANO_WORLDDIR} \ > - > ${MAKEOBJDIRPREFIX}/_.etc 2>&1 > + > ${NANO_OBJ}/_.etc 2>&1 > ) > > install_kernel ( ) ( > pprint 2 "install kernel" > - pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.ik" > + pprint 3 "log: ${NANO_OBJ}/_.ik" > > cd ${NANO_SRC} > env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} installkernel \ > DESTDIR=${NANO_WORLDDIR} \ > - __MAKE_CONF=${NANO_MAKE_CONF} KERNCONF=`basename ${NANO_KERNEL}` \ > - > ${MAKEOBJDIRPREFIX}/_.ik 2>&1 > + __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} KERNCONF=`basename > ${NANO_KERNEL}` \ + > ${NANO_OBJ}/_.ik 2>&1 > ) > > run_customize() ( > @@ -252,9 +257,9 @@ run_customize() ( > for c in $NANO_CUSTOMIZE > do > pprint 2 "customize \"$c\"" > - pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.cust.$c" > + pprint 3 "log: ${NANO_OBJ}/_.cust.$c" > pprint 4 "`type $c`" > - ( $c ) > ${MAKEOBJDIRPREFIX}/_.cust.$c 2>&1 > + ( $c ) > ${NANO_OBJ}/_.cust.$c 2>&1 > done > ) > > @@ -264,15 +269,15 @@ run_late_customize() ( > for c in $NANO_LATE_CUSTOMIZE > do > pprint 2 "late customize \"$c\"" > - pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.late_cust.$c" > + pprint 3 "log: ${NANO_OBJ}/_.late_cust.$c" > pprint 4 "`type $c`" > - ( $c ) > ${MAKEOBJDIRPREFIX}/_.late_cust.$c 2>&1 > + ( $c ) > ${NANO_OBJ}/_.late_cust.$c 2>&1 > done > ) > > setup_nanobsd ( ) ( > pprint 2 "configure nanobsd setup" > - pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.dl" > + pprint 3 "log: ${NANO_OBJ}/_.dl" > > ( > cd ${NANO_WORLDDIR} > @@ -312,7 +317,7 @@ setup_nanobsd ( ) ( > rm tmp || true > ln -s var/tmp tmp > > - ) > ${MAKEOBJDIRPREFIX}/_.dl 2>&1 > + ) > ${NANO_OBJ}/_.dl 2>&1 > ) > > setup_nanobsd_etc ( ) ( > @@ -348,7 +353,7 @@ prune_usr() ( > > create_i386_diskimage ( ) ( > pprint 2 "build diskimage" > - pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.di" > + pprint 3 "log: ${NANO_OBJ}/_.di" > > ( > echo $NANO_MEDIASIZE $NANO_IMAGES \ > @@ -417,10 +422,10 @@ create_i386_diskimage ( ) ( > # for booting the image from a USB device to work. > print "a 1" > } > - ' > ${MAKEOBJDIRPREFIX}/_.fdisk > + ' > ${NANO_OBJ}/_.fdisk > > IMG=${NANO_DISKIMGDIR}/${NANO_IMGNAME} > - MNT=${MAKEOBJDIRPREFIX}/_.mnt > + MNT=${NANO_OBJ}/_.mnt > mkdir -p ${MNT} > > if [ "${NANO_MD_BACKING}" = "swap" ] ; then > @@ -429,14 +434,14 @@ create_i386_diskimage ( ) ( > else > echo "Creating md backing file..." > dd if=/dev/zero of=${IMG} bs=${NANO_SECTS}b \ > - count=`expr ${NANO_MEDIASIZE} / ${NANO_SECTS}` > + seek=`expr ${NANO_MEDIASIZE} / ${NANO_SECTS}` count=0 > MD=`mdconfig -a -t vnode -f ${IMG} -x ${NANO_SECTS} \ > -y ${NANO_HEADS}` > fi > > trap "df -i ${MNT} ; umount ${MNT} || true ; mdconfig -d -u $MD" 1 2 15 > EXIT > > - fdisk -i -f ${MAKEOBJDIRPREFIX}/_.fdisk ${MD} > + fdisk -i -f ${NANO_OBJ}/_.fdisk ${MD} > fdisk ${MD} > # XXX: params > # XXX: pick up cached boot* files, they may not be in image anymore. > @@ -446,27 +451,26 @@ create_i386_diskimage ( ) ( > > # Create first image > newfs ${NANO_NEWFS} /dev/${MD}s1a > - mount /dev/${MD}s1a ${MNT} > + mount -o async /dev/${MD}s1a ${MNT} > df -i ${MNT} > echo "Copying worlddir..." > ( cd ${NANO_WORLDDIR} && find . -print | cpio -dump ${MNT} ) > df -i ${MNT} > echo "Generating mtree..." > - ( cd ${MNT} && mtree -c ) > ${MAKEOBJDIRPREFIX}/_.mtree > - ( cd ${MNT} && du -k ) > ${MAKEOBJDIRPREFIX}/_.du > + ( cd ${MNT} && mtree -c ) > ${NANO_OBJ}/_.mtree > + ( cd ${MNT} && du -k ) > ${NANO_OBJ}/_.du > umount ${MNT} > > if [ $NANO_IMAGES -gt 1 -a $NANO_INIT_IMG2 -gt 0 ] ; then > # Duplicate to second image (if present) > echo "Duplicating to second image..." > - dd if=/dev/${MD}s1 of=/dev/${MD}s2 bs=64k > + dd conv=sparse if=/dev/${MD}s1 of=/dev/${MD}s2 bs=64k > mount /dev/${MD}s2a ${MNT} > for f in ${MNT}/etc/fstab ${MNT}/conf/base/etc/fstab > do > sed -i "" "s/${NANO_DRIVE}s1/${NANO_DRIVE}s2/g" $f > done > umount ${MNT} > - > fi > > # Create Config slice > @@ -474,7 +478,7 @@ create_i386_diskimage ( ) ( > # XXX: fill from where ? > > # Create Data slice, if any. > - if [ $NANO_DATASIZE -ne 0 ] ; then > + if [ $NANO_DATASIZE -gt 0 ] ; then > newfs ${NANO_NEWFS} /dev/${MD}s4 > # XXX: fill from where ? > fi > @@ -485,16 +489,16 @@ create_i386_diskimage ( ) ( > fi > > echo "Writing out _.disk.image..." > - dd if=/dev/${MD}s1 of=${NANO_DISKIMGDIR}/_.disk.image bs=64k > + dd conv=sparse if=/dev/${MD}s1 of=${NANO_DISKIMGDIR}/_.disk.image > bs=64k mdconfig -d -u $MD > - ) > ${MAKEOBJDIRPREFIX}/_.di 2>&1 > + ) > ${NANO_OBJ}/_.di 2>&1 > ) > > last_orders () ( > # Redefine this function with any last orders you may have > # after the build completed, for instance to copy the finished > # image to a more convenient place: > - # cp ${MAKEOBJDIRPREFIX}/_.disk.image /home/ftp/pub/nanobsd.disk > + # cp ${NANO_DISKIMGDIR}/_.disk.image /home/ftp/pub/nanobsd.disk > ) > > ####################################################################### > @@ -751,19 +755,13 @@ fi > ####################################################################### > # Setup and Export Internal variables > # > -if [ "x${NANO_OBJ}" = "x" ] ; then > - MAKEOBJDIRPREFIX=/usr/obj/nanobsd.${NANO_NAME}/ > - NANO_OBJ=${MAKEOBJDIRPREFIX} > -else > - MAKEOBJDIRPREFIX=${NANO_OBJ} > -fi > - > -if [ "x${NANO_DISKIMGDIR}" = "x" ] ; then > - NANO_DISKIMGDIR=${MAKEOBJDIRPREFIX} > -fi > - > -NANO_WORLDDIR=${MAKEOBJDIRPREFIX}/_.w > -NANO_MAKE_CONF=${MAKEOBJDIRPREFIX}/make.conf > +test -n "${NANO_OBJ}" || NANO_OBJ=/usr/obj/nanobsd.${NANO_NAME}/ > +test -n "${MAKEOBJDIRPREFIX}" || MAKEOBJDIRPREFIX=${NANO_OBJ} > +test -n "${NANO_DISKIMGDIR}" || NANO_DISKIMGDIR=${NANO_OBJ} > + > +NANO_WORLDDIR=${NANO_OBJ}/_.w > +NANO_MAKE_CONF_BUILD=${MAKEOBJDIRPREFIX}/make.conf.build > +NANO_MAKE_CONF_INSTALL=${NANO_OBJ}/make.conf.install > > if [ -d ${NANO_TOOLS} ] ; then > true > @@ -791,7 +789,8 @@ export NANO_DRIVE > export NANO_HEADS > export NANO_IMAGES > export NANO_IMGNAME > -export NANO_MAKE_CONF > +export NANO_MAKE_CONF_BUILD > +export NANO_MAKE_CONF_INSTALL > export NANO_MEDIASIZE > export NANO_NAME > export NANO_NEWFS > @@ -840,7 +839,7 @@ prune_usr > run_late_customize > if $do_image ; then > create_${NANO_ARCH}_diskimage > - echo "# Created NanoBSD disk image: > ${MAKEOBJDIRPREFIX}/${NANO_IMGNAME}" + echo "# Created NanoBSD disk > image: ${NANO_DISKIMGDIR}/${NANO_IMGNAME}" else > pprint 2 "Skipping image build (as instructed)" > fi > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" -- AnyWi Technologies ------------------------------------------------------- From owner-freebsd-embedded@FreeBSD.ORG Thu Jun 18 12:05:17 2009 Return-Path: Delivered-To: freebsd-embedded@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 755F3106567E for ; Thu, 18 Jun 2009 12:05:17 +0000 (UTC) (envelope-from nick@van-laarhoven.org) Received: from baranao.anywi.com (baranao.anywi.com [213.207.101.176]) by mx1.freebsd.org (Postfix) with ESMTP id 388D28FC08 for ; Thu, 18 Jun 2009 12:05:17 +0000 (UTC) (envelope-from nick@van-laarhoven.org) Received: from hind.van-laarhoven.org (ip51cfcfde.direct-adsl.nl [81.207.207.222]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by baranao.anywi.com (Postfix) with ESMTPSA id 5BD5F3F41F for ; Thu, 18 Jun 2009 14:05:14 +0200 (CEST) Content-Disposition: inline From: Nick Hibma To: FreeBSD Embedded Mailing List Date: Thu, 18 Jun 2009 14:05:12 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200906181405.13008.nick@van-laarhoven.org> X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on baranao.anywi.com Cc: Subject: nanobsd disk usage display X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2009 12:05:17 -0000 We use an extra function to display the amount of free space on the image. But it is not entirely accurate: disk_usage () { sync; sync; sync set -- `du -sk $NANO_WORLDDIR/` used=$1 set -- `ls -sk $NANO_DISKIMGDIR/_.disk.image` size=$1 avail=$(( $size - $used )) availp=$(( ${avail}00 / $size)) pprint 1 "disk usage: $used of $size used, $avail available ($availp%)" } last_orders () { disk_usage } Shall I commit this or does anyone have a better idea on how to do this? Nick ------------------------------------------------------- From owner-freebsd-embedded@FreeBSD.ORG Thu Jun 18 22:44:16 2009 Return-Path: Delivered-To: freebsd-embedded@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A3571065686; Thu, 18 Jun 2009 22:44:16 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 293538FC27; Thu, 18 Jun 2009 22:44:16 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (edwin@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5IMiGG3071820; Thu, 18 Jun 2009 22:44:16 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5IMiFmC071816; Thu, 18 Jun 2009 22:44:15 GMT (envelope-from edwin) Date: Thu, 18 Jun 2009 22:44:15 GMT Message-Id: <200906182244.n5IMiFmC071816@freefall.freebsd.org> To: peter.jeremy@ALCATEL.COM.AU, edwin@FreeBSD.org, freebsd-embedded@FreeBSD.org, edwin@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: misc/15876: [picobsd] PicoBSD message of the day problems X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2009 22:44:17 -0000 Synopsis: [picobsd] PicoBSD message of the day problems State-Changed-From-To: open->patched State-Changed-By: edwin State-Changed-When: Thu Jun 18 22:40:09 UTC 2009 State-Changed-Why: Fixed in HEAD Responsible-Changed-From-To: freebsd-embedded->edwin Responsible-Changed-By: edwin Responsible-Changed-When: Thu Jun 18 22:40:09 UTC 2009 Responsible-Changed-Why: I'll do the MFC . http://www.freebsd.org/cgi/query-pr.cgi?pr=15876 From owner-freebsd-embedded@FreeBSD.ORG Sat Jun 20 20:36:32 2009 Return-Path: Delivered-To: freebsd-embedded@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3975A106567F; Sat, 20 Jun 2009 20:36:32 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0E26E8FC0C; Sat, 20 Jun 2009 20:36:32 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from freefall.freebsd.org (remko@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5KKaVrr075424; Sat, 20 Jun 2009 20:36:31 GMT (envelope-from remko@freefall.freebsd.org) Received: (from remko@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5KKaVa1075420; Sat, 20 Jun 2009 20:36:31 GMT (envelope-from remko) Date: Sat, 20 Jun 2009 20:36:31 GMT Message-Id: <200906202036.n5KKaVa1075420@freefall.freebsd.org> To: olivier@cochard.me, remko@FreeBSD.org, freebsd-embedded@FreeBSD.org, remko@FreeBSD.org From: remko@FreeBSD.org Cc: Subject: Re: misc/135301: [tinybsd] [patch] Patch for fix architecture support for tinybsd script X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jun 2009 20:36:32 -0000 Synopsis: [tinybsd] [patch] Patch for fix architecture support for tinybsd script State-Changed-From-To: open->patched State-Changed-By: remko State-Changed-When: Sat Jun 20 20:36:15 UTC 2009 State-Changed-Why: Grab, committed to -HEAD Responsible-Changed-From-To: freebsd-embedded->remko Responsible-Changed-By: remko Responsible-Changed-When: Sat Jun 20 20:36:15 UTC 2009 Responsible-Changed-Why: Grab, committed to -HEAD http://www.freebsd.org/cgi/query-pr.cgi?pr=135301