From owner-cvs-src@FreeBSD.ORG Fri Feb 10 00:38:09 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2B2D16A420; Fri, 10 Feb 2006 00:38:08 +0000 (GMT) (envelope-from yar@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A372A43D45; Fri, 10 Feb 2006 00:38:08 +0000 (GMT) (envelope-from yar@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1A0c84b052468; Fri, 10 Feb 2006 00:38:08 GMT (envelope-from yar@repoman.freebsd.org) Received: (from yar@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1A0c8r0052467; Fri, 10 Feb 2006 00:38:08 GMT (envelope-from yar) Message-Id: <200602100038.k1A0c8r0052467@repoman.freebsd.org> From: Yar Tikhiy Date: Fri, 10 Feb 2006 00:38:08 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/fs/nwfs nwfs_vfsops.c src/sys/fs/smbfs smbfs_vfsops.c src/sys/netgraph ng_mppc.c src/sys/modules/3dfx Makefile src/sys/modules/acpi/acpi Makefile src/sys/modules/aha Makefile src/sys/modules/ahb Makefile src/sys/modules/an Makefile ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 00:38:09 -0000 yar 2006-02-10 00:38:08 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/fs/nwfs nwfs_vfsops.c sys/fs/smbfs smbfs_vfsops.c sys/netgraph ng_mppc.c sys/modules/3dfx Makefile sys/modules/acpi/acpi Makefile sys/modules/aha Makefile sys/modules/ahb Makefile sys/modules/an Makefile sys/modules/ar Makefile sys/modules/arcnet Makefile sys/modules/arl Makefile sys/modules/awi Makefile sys/modules/bktr/bktr Makefile sys/modules/cam Makefile sys/modules/coda5 Makefile sys/modules/cp Makefile sys/modules/ctau Makefile sys/modules/cx Makefile sys/modules/dcons Makefile sys/modules/digi/digi Makefile sys/modules/en Makefile sys/modules/fatm Makefile sys/modules/firewire/fwip Makefile sys/modules/hatm Makefile sys/modules/hifn Makefile sys/modules/if_bridge Makefile sys/modules/if_disc Makefile sys/modules/if_ef Makefile sys/modules/if_faith Makefile sys/modules/if_gif Makefile sys/modules/if_gre Makefile sys/modules/if_ppp Makefile sys/modules/if_sl Makefile sys/modules/if_stf Makefile sys/modules/if_tap Makefile sys/modules/if_tun Makefile sys/modules/if_vlan Makefile sys/modules/ip_mroute_mod Makefile sys/modules/ipfilter Makefile sys/modules/kbdmux Makefile sys/modules/linux Makefile sys/modules/netgraph/gif Makefile sys/modules/netgraph/iface Makefile sys/modules/netgraph/mppc Makefile sys/modules/netgraph/sync_ar Makefile sys/modules/netgraph/sync_sr Makefile sys/modules/nfs4client Makefile sys/modules/nfsclient Makefile sys/modules/nfsserver Makefile sys/modules/nmdm Makefile sys/modules/nwfs Makefile sys/modules/osf1 Makefile sys/modules/patm Makefile sys/modules/rc Makefile sys/modules/rp Makefile sys/modules/safe Makefile sys/modules/sio Makefile sys/modules/smbfs Makefile sys/modules/snc Makefile sys/modules/sppp Makefile sys/modules/sr Makefile sys/modules/svr4 Makefile sys/modules/trm Makefile sys/modules/ubsec Makefile sys/modules/ukbd Makefile sys/modules/vkbd Makefile sys/modules/wi Makefile sys/modules/wlan Makefile Log: MFC: Avoid creating (and subsequently using) fake opt_*.h files when the modules are built with the kernel and hence actual opt_*.h files are available in ${KERNBUILDDIR}. Fix a few small bugs that would prevent this from working. At last the build options of the modules become consistent with those of the kernel unless the MODULES_WITH_WORLD way still is used. Approved by: re (kensmith, scottl) Requested by: ru Tested on: amd64 i386 sparc64 Tested by: md5 Revision Changes Path 1.40.2.2 +0 -4 src/sys/fs/nwfs/nwfs_vfsops.c 1.34.2.1 +0 -4 src/sys/fs/smbfs/smbfs_vfsops.c 1.11.14.1 +3 -1 src/sys/modules/3dfx/Makefile 1.11.2.2 +2 -0 src/sys/modules/acpi/acpi/Makefile 1.8.14.1 +3 -1 src/sys/modules/aha/Makefile 1.1.8.1 +2 -0 src/sys/modules/ahb/Makefile 1.7.8.1 +2 -0 src/sys/modules/an/Makefile 1.4.8.1 +3 -3 src/sys/modules/ar/Makefile 1.3.12.1 +6 -1 src/sys/modules/arcnet/Makefile 1.3.2.1 +2 -0 src/sys/modules/arl/Makefile 1.3.8.1 +2 -0 src/sys/modules/awi/Makefile 1.7.2.1 +1 -2 src/sys/modules/bktr/bktr/Makefile 1.13.2.1 +2 -0 src/sys/modules/cam/Makefile 1.4.2.1 +2 -0 src/sys/modules/coda5/Makefile 1.3.2.1 +7 -17 src/sys/modules/cp/Makefile 1.3.2.1 +6 -16 src/sys/modules/ctau/Makefile 1.4.2.1 +6 -17 src/sys/modules/cx/Makefile 1.3.2.1 +2 -0 src/sys/modules/dcons/Makefile 1.3.14.1 +2 -0 src/sys/modules/digi/digi/Makefile 1.3.10.1 +2 -0 src/sys/modules/en/Makefile 1.2.8.1 +2 -0 src/sys/modules/fatm/Makefile 1.1.8.1 +2 -0 src/sys/modules/firewire/fwip/Makefile 1.2.8.1 +2 -0 src/sys/modules/hatm/Makefile 1.3.12.1 +2 -0 src/sys/modules/hifn/Makefile 1.2.2.1 +2 -0 src/sys/modules/if_bridge/Makefile 1.17.14.1 +2 -0 src/sys/modules/if_disc/Makefile 1.11.8.1 +2 -0 src/sys/modules/if_ef/Makefile 1.2.14.1 +2 -0 src/sys/modules/if_faith/Makefile 1.6.2.1 +11 -3 src/sys/modules/if_gif/Makefile 1.5.10.1 +2 -0 src/sys/modules/if_gre/Makefile 1.33.2.1 +2 -0 src/sys/modules/if_ppp/Makefile 1.19.14.1 +2 -0 src/sys/modules/if_sl/Makefile 1.3.14.1 +2 -0 src/sys/modules/if_stf/Makefile 1.4.2.1 +2 -0 src/sys/modules/if_tap/Makefile 1.28.2.1 +2 -0 src/sys/modules/if_tun/Makefile 1.2.14.1 +2 -0 src/sys/modules/if_vlan/Makefile 1.12.8.1 +2 -0 src/sys/modules/ip_mroute_mod/Makefile 1.18.2.1 +2 -1 src/sys/modules/ipfilter/Makefile 1.1.2.2 +2 -0 src/sys/modules/kbdmux/Makefile 1.63.2.1 +2 -0 src/sys/modules/linux/Makefile 1.2.14.1 +3 -1 src/sys/modules/netgraph/gif/Makefile 1.15.12.1 +2 -0 src/sys/modules/netgraph/iface/Makefile 1.12.12.1 +2 -0 src/sys/modules/netgraph/mppc/Makefile 1.2.16.1 +3 -1 src/sys/modules/netgraph/sync_ar/Makefile 1.1.16.1 +3 -1 src/sys/modules/netgraph/sync_sr/Makefile 1.4.2.1 +5 -3 src/sys/modules/nfs4client/Makefile 1.30.2.1 +5 -3 src/sys/modules/nfsclient/Makefile 1.25.14.1 +3 -0 src/sys/modules/nfsserver/Makefile 1.2.12.1 +2 -0 src/sys/modules/nmdm/Makefile 1.13.8.1 +1 -4 src/sys/modules/nwfs/Makefile 1.13.2.1 +2 -0 src/sys/modules/osf1/Makefile 1.2.8.1 +2 -0 src/sys/modules/patm/Makefile 1.2.12.1 +2 -0 src/sys/modules/rc/Makefile 1.3.16.1 +2 -0 src/sys/modules/rp/Makefile 1.1.12.1 +2 -0 src/sys/modules/safe/Makefile 1.8.2.1 +2 -0 src/sys/modules/sio/Makefile 1.9.2.1 +5 -3 src/sys/modules/smbfs/Makefile 1.2.14.1 +3 -1 src/sys/modules/snc/Makefile 1.6.2.1 +2 -0 src/sys/modules/sppp/Makefile 1.3.8.1 +3 -3 src/sys/modules/sr/Makefile 1.27.14.1 +2 -0 src/sys/modules/svr4/Makefile 1.1.16.1 +2 -0 src/sys/modules/trm/Makefile 1.3.12.1 +2 -0 src/sys/modules/ubsec/Makefile 1.18.2.1 +2 -0 src/sys/modules/ukbd/Makefile 1.2.2.1 +2 -0 src/sys/modules/vkbd/Makefile 1.17.8.1 +2 -0 src/sys/modules/wi/Makefile 1.4.2.1 +2 -0 src/sys/modules/wlan/Makefile 1.23.2.1 +6 -0 src/sys/netgraph/ng_mppc.c