svn commit: r235537 - in head: etc/mtree include lib lib/libnandfs lib/libstand sbin sbin/nandfs sbin/newfs_nandfs share/man/man4 share/man/man5 share/mk sys/boot/arm/uboot sys/boot/i386/loader sys...

[Andriy Gapon]

on 17/05/2012 13:11 Grzegorz Bernacki said the following:
> Author: gber
> Date: Thu May 17 10:11:18 2012
> New Revision: 235537
> URL: http://svn.freebsd.org/changeset/base/235537
> 
> Log:
>   Import work done under project/nand (@235533) into head.
>   
>   The NAND Flash environment consists of several distinct components:
>     - NAND framework (drivers harness for NAND controllers and NAND chips)
>     - NAND simulator (NANDsim)
>     - NAND file system (NAND FS)
>     - Companion tools and utilities
>     - Documentation (manual pages)
>   
>   This work is still experimental. Please use with caution.
>   
>   Obtained from: Semihalf
>   Supported by:  FreeBSD Foundation, Juniper Networks
[snip]
>   head/sys/modules/Makefile

Looks like this commit has unintentionally [?] removed wbwd-related lines from
sys/modules/Makefile.  Please fix.

>   head/usr.sbin/Makefile
[snip]
> 
> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

The diff that I see:
@@ -217,6 +217,8 @@ SUBDIR=     ${_3dfx} \
        ${_mwlfw} \
        mxge \
        my \
+       ${_nandfs} \
+       ${_nandsim} \
        ${_ncp} \
        ${_ncv} \
        ${_ndis} \
@@ -335,7 +337,6 @@ SUBDIR=     ${_3dfx} \
        vx \
        ${_vxge} \
        wb \
-       ${_wbwd} \
        ${_wi} \
        wlan \
        wlan_acl \
@@ -398,6 +399,11 @@ _ipdivert= ipdivert
 _ipfw=         ipfw
 .endif

+.if ${MK_NAND} != "no" || defined(ALL_MODULES)
+_nandfs=       nandfs
+_nandsim=      nandsim
+.endif
+
 .if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES)
 _netgraph=     netgraph
 .endif
@@ -513,7 +519,6 @@ _stg=               stg
 _streams=      streams
 _svr4=         svr4
 _vxge=         vxge
-_wbwd=         wbwd
 _wi=           wi
 _xe=           xe
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
@@ -708,7 +713,6 @@ _viawd=             viawd
 _virtio=       virtio
 _vxge=         vxge
 _x86bios=      x86bios
-_wbwd=         wbwd
 _wi=           wi
 _wpi=          wpi
 .if ${MK_SOURCELESS_UCODE} != "no"


-- 
Andriy Gapon