From: Sascha Wildner Date: Tue, 24 Oct 2006 17:09:46 +0000 (+0000) Subject: Fix file-/pathnames which have changed now. X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/23e12d009562b00e11c4f7c7dce4d0947fc1d812 Fix file-/pathnames which have changed now. --- diff --git a/README b/README index 0cc41ec9b1..f9f8ed82bd 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ This is the top level of the DragonFly source directory. This file was last revised on: $FreeBSD: src/README,v 1.15.2.4 2002/04/26 16:01:35 bmah Exp $ -$DragonFly: src/README,v 1.7 2005/09/25 04:49:39 swildner Exp $ +$DragonFly: src/README,v 1.8 2006/10/24 17:09:45 swildner Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -27,7 +27,7 @@ Note: If you want to build and install the kernel with the ``buildkernel'' and ``installkernel'' targets, you might need to build world before. More information is available in the DragonFly handbook. -The sample kernel configuration files reside in the sys//conf +The sample kernel configuration files reside in the sys/config sub-directory (assuming that you've installed the kernel sources), the file named GENERIC being the one used to build your initial installation kernel. The file LINT contains entries for all possible devices, not diff --git a/UPDATING b/UPDATING index 6b3d1a1b8c..83c939c564 100644 --- a/UPDATING +++ b/UPDATING @@ -1,4 +1,4 @@ -$DragonFly: src/UPDATING,v 1.21 2006/08/12 22:34:23 swildner Exp $ +$DragonFly: src/UPDATING,v 1.22 2006/10/24 17:09:45 swildner Exp $ Updating Information for DragonFly users. @@ -148,7 +148,7 @@ older DragonFly installations and should delete them automatically. NOTE! Never do a 'make upgrade' before 'make installworld' has been run. Doing so might leave your system in an unusable state. -If you are using 'config' manually from /usr/src/sys/i386/conf/BLAH, note +If you are using 'config' manually from /usr/src/sys/config, note that the build will use the current DragonFly environment rather than the post-build environment from the last buildworld. For this reason manual configs are discouraged. The proper way to build a kernel is to use the diff --git a/nrelease/root/README b/nrelease/root/README index 9adf6186eb..4eb047644d 100644 --- a/nrelease/root/README +++ b/nrelease/root/README @@ -282,7 +282,7 @@ make installworld # buildkernel and installkernel examples. Create your own custom kernel - # config in /usr/src/sys/i386/conf/ and you can build and + # config in /usr/src/sys/config/ and you can build and # install custom kernels. # # WARNING! Always keep a fully working backup kernel in / in case @@ -335,5 +335,5 @@ what they are, simply cat /mnt/etc/fstab after mounting the root partition. -$DragonFly: src/nrelease/root/README,v 1.21 2006/06/28 21:14:52 swildner Exp $ +$DragonFly: src/nrelease/root/README,v 1.22 2006/10/24 17:09:45 swildner Exp $ diff --git a/share/examples/diskless/clone_root b/share/examples/diskless/clone_root index 083b57df4c..f842ccb174 100644 --- a/share/examples/diskless/clone_root +++ b/share/examples/diskless/clone_root @@ -5,7 +5,7 @@ # Revised 2001.04.16 # # $FreeBSD: src/share/examples/diskless/clone_root,v 1.1.2.4 2002/04/07 18:16:18 luigi Exp $ -# $DragonFly: src/share/examples/diskless/clone_root,v 1.2 2003/06/17 04:36:57 dillon Exp $ +# $DragonFly: src/share/examples/diskless/clone_root,v 1.3 2006/10/24 17:09:45 swildner Exp $ # # clone root filesystem for diskless root stuff # @@ -36,7 +36,7 @@ # probably need to set local_startup="" so that the server's # local startup files will not be used. # -# create a kernel config file in /sys/i386/conf/DISKLESS with +# create a kernel config file in /sys/config/DISKLESS with # options MFS # options BOOTP # options BOOTP_NFSROOT diff --git a/share/examples/drivers/README b/share/examples/drivers/README index 12aacf98a5..d73ec7ae1e 100644 --- a/share/examples/drivers/README +++ b/share/examples/drivers/README @@ -1,5 +1,5 @@ $FreeBSD: src/share/examples/drivers/README,v 1.2.6.1 2002/11/16 13:24:28 blackend Exp $ -$DragonFly: src/share/examples/drivers/README,v 1.2 2003/06/17 04:36:57 dillon Exp $ +$DragonFly: src/share/examples/drivers/README,v 1.3 2006/10/24 17:09:45 swildner Exp $ Author: Julian Elischer @@ -40,5 +40,5 @@ fully callable (once you get your device to probe). You should simply edit the driver and continue to use 'make' (as done in the script) until your driver does what you want. -The driver will end up in /sys/i386/isa for the device driver script, +The driver will end up in /sys/arch/i386/isa for the device driver script, and in /sys/dev for the pseudo driver script. diff --git a/share/examples/drivers/make_device_driver.sh b/share/examples/drivers/make_device_driver.sh index 7605a6f42e..92af1d500d 100644 --- a/share/examples/drivers/make_device_driver.sh +++ b/share/examples/drivers/make_device_driver.sh @@ -8,7 +8,7 @@ # Trust me, RUN THIS SCRIPT :) # #-------cut here------------------ -cd /sys/i386/conf +cd /sys/config if [ "${1}X" = "X" ] then @@ -30,7 +30,7 @@ cat >${UPPER} <>${UPPER} @@ -446,7 +446,7 @@ then # everything you'll otherwise enter into the kernel # configuration file. -.PATH: \${.CURDIR}/../../sys/i386/isa +.PATH: \${.CURDIR}/../../sys/arch/i386/isa KMOD = ${1}_mod SRCS = ${1}.c ${1}.h diff --git a/share/examples/drivers/make_pseudo_driver.sh b/share/examples/drivers/make_pseudo_driver.sh index b48fa97411..2b4d279e5c 100644 --- a/share/examples/drivers/make_pseudo_driver.sh +++ b/share/examples/drivers/make_pseudo_driver.sh @@ -5,7 +5,7 @@ # Trust me, RUN THIS SCRIPT :) # #-------cut here------------------ -cd /sys/i386/conf +cd /sys/config if [ "${1}X" = "X" ] then @@ -22,7 +22,7 @@ cat >${UPPER} <>${UPPER} diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4 index d36dd672b5..f1d3674460 100644 --- a/share/man/man4/ata.4 +++ b/share/man/man4/ata.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/ata.4,v 1.3.2.18 2002/10/16 13:40:51 fjoe Exp $ -.\" $DragonFly: src/share/man/man4/ata.4,v 1.4 2005/08/01 01:49:17 swildner Exp $ +.\" $DragonFly: src/share/man/man4/ata.4,v 1.5 2006/10/24 17:09:45 swildner Exp $ .\" .Dd January 27, 2000 .Dt ATA 4 @@ -192,7 +192,7 @@ support it and can .Em hang the system. .Sh FILES -.Bl -tag -width "/sys/i386/conf/GENERIC " -compact +.Bl -tag -width "/sys/config/GENERIC " -compact .It Pa /dev/ad* ATA disk device nodes .It Pa /dev/acd* @@ -201,7 +201,7 @@ ATAPI CD-ROM device nodes ATAPI floppy drive device nodes .It Pa /dev/ast* ATAPI tape drive device nodes -.It Pa /sys/i386/conf/GENERIC +.It Pa /sys/config/GENERIC sample generic kernel config file for .Nm based systems diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4 index 5345119be6..ee750adcb8 100644 --- a/share/man/man4/fdc.4 +++ b/share/man/man4/fdc.4 @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/fdc.4,v 1.20.2.5 2001/10/01 13:07:23 dd Exp $ -.\" $DragonFly: src/share/man/man4/fdc.4,v 1.2 2003/06/17 04:36:59 dillon Exp $ +.\" $DragonFly: src/share/man/man4/fdc.4,v 1.3 2006/10/24 17:09:45 swildner Exp $ .\" .Dd August 31, 1994 .Dt FDC 4 @@ -77,7 +77,7 @@ floppy disk device nodes .It Pa /dev/fd*. Ns Ar "" floppy disk device nodes where the trailing number indicates the floppy capacity -.It Pa /sys/i386/conf/GENERIC +.It Pa /sys/config/GENERIC sample generic kernel config file .It Pa /sys/isa/fd.c floppy driver source diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4 index 852f1443a0..7dd6bcaf09 100644 --- a/share/man/man4/intro.4 +++ b/share/man/man4/intro.4 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/intro.4,v 1.13.2.6 2002/01/09 15:36:51 ru Exp $ -.\" $DragonFly: src/share/man/man4/intro.4,v 1.3 2003/09/07 17:04:00 hmp Exp $ +.\" $DragonFly: src/share/man/man4/intro.4,v 1.4 2006/10/24 17:09:45 swildner Exp $ .\" .Dd January 20, 1996 .Dt INTRO 4 @@ -155,7 +155,7 @@ for a detailed description of the files involved. The individual manual pages in this section provide a sample line for the configuration file in their synopsis portion. See also the sample config file -.Pa /sys/i386/conf/LINT +.Pa /sys/config/LINT (for the .Em i386 architecture). diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4 index 1b546d46e4..e6c75eadb5 100644 --- a/share/man/man4/man4.i386/ar.4 +++ b/share/man/man4/man4.i386/ar.4 @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/man4.i386/ar.4,v 1.17.2.4 2001/08/17 13:08:45 ru Exp $ -.\" $DragonFly: src/share/man/man4/man4.i386/ar.4,v 1.5 2006/05/26 19:39:40 swildner Exp $ +.\" $DragonFly: src/share/man/man4/man4.i386/ar.4,v 1.6 2006/10/24 17:09:45 swildner Exp $ .\" .Dd November 19, 1995 .Dt AR 4 i386 @@ -83,12 +83,12 @@ The node will have the same name as the device with ``sync_'' prepended, e.g., .Dv sync_ar0 . .Sh FILES -.Bl -tag -width /sys/i386/isa/ic/hd64570.h -compact +.Bl -tag -width /sys/arch/i386/isa/ic/hd64570.h -compact .It Pa /sys/dev/netif/ar/if_ar.c .It Pa /sys/dev/netif/ar/if_ar.h .It Pa /sys/dev/netif/ar/if_ar_pci.c .It Pa /sys/dev/netif/ar/if_arregs.h -.It Pa /sys/i386/isa/ic/hd64570.h +.It Pa /sys/arch/i386/isa/ic/hd64570.h .El .Sh DIAGNOSTICS .Bl -diag diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4 index 7bddb8b2d6..759fc97165 100644 --- a/share/man/man4/man4.i386/cx.4 +++ b/share/man/man4/man4.i386/cx.4 @@ -1,6 +1,6 @@ .\" .\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.7.2.6 2001/08/17 13:08:45 ru Exp $ -.\" $DragonFly: src/share/man/man4/man4.i386/cx.4,v 1.2 2003/06/17 04:36:59 dillon Exp $ +.\" $DragonFly: src/share/man/man4/man4.i386/cx.4,v 1.3 2006/10/24 17:09:45 swildner Exp $ .\" .Dd December 12, 1994 .Dt CX 4 i386 @@ -268,13 +268,13 @@ The special device file for the channel options management. The sources for the driver reside in: .Pp .Bl -tag -width /dev/cxXXXX -compact -.It Pa /sys/i386/isa/cronyx.c -.It Pa /sys/i386/isa/cx.c -.It Pa /sys/i386/isa/if_cx.c -.It Pa /sys/i386/isa/cronyx.h -.It Pa /sys/i386/isa/cxreg.h -.It Pa /sys/net/if_spppsubr.c -.It Pa /sys/net/if_sppp.h +.It Pa /sys/dev/serial/cronyx/cronyx.c +.It Pa /sys/dev/netif/cx/cx.c +.It Pa /sys/dev/netif/cx/if_cx.c +.It Pa /sys/arch/i386/include/cronyx.h +.It Pa /sys/dev/netif/cx/cxreg.h +.It Pa /sys/net/sppp/if_spppsubr.c +.It Pa /sys/net/sppp/if_sppp.h .El .Sh SEE ALSO .Xr cxconfig 8 , diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4 index 8a41571366..271a12994d 100644 --- a/share/man/man4/man4.i386/sr.4 +++ b/share/man/man4/man4.i386/sr.4 @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/man4.i386/sr.4,v 1.15.2.4 2001/08/17 13:08:46 ru Exp $ -.\" $DragonFly: src/share/man/man4/man4.i386/sr.4,v 1.5 2006/05/26 19:39:40 swildner Exp $ +.\" $DragonFly: src/share/man/man4/man4.i386/sr.4,v 1.6 2006/10/24 17:09:45 swildner Exp $ .\" .Dd July 4, 1996 .Dt SR 4 i386 @@ -111,12 +111,12 @@ The node will have the same name as the device with ``sync_'' prepended, e.g., .Dv sync_sr0 . .Sh FILES -.Bl -tag -width /sys/i386/isa/ic/hd64570.h -compact +.Bl -tag -width /sys/arch/i386/isa/ic/hd64570.h -compact .It Pa /sys/dev/netif/sr/if_sr.c .It Pa /sys/dev/netif/sr/if_sr.h .It Pa /sys/dev/netif/sr/if_sr_pci.c .It Pa /sys/dev/netif/sr/if_srregs.h -.It Pa /sys/i386/isa/ic/hd64570.h +.It Pa /sys/arch/i386/isa/ic/hd64570.h .El .Sh DIAGNOSTICS .Bl -diag diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index 1042d05f17..ed9ad31f94 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -3,7 +3,7 @@ .\" the FreeBSD source tree. .\" .\" $FreeBSD: src/share/man/man7/development.7,v 1.4.2.2 2003/05/23 07:48:35 brueffer Exp $ -.\" $DragonFly: src/share/man/man7/development.7,v 1.6 2006/03/26 22:56:57 swildner Exp $ +.\" $DragonFly: src/share/man/man7/development.7,v 1.7 2006/10/24 17:09:45 swildner Exp $ .\" .Dd December 21, 2002 .Dt DEVELOPMENT 7 @@ -265,7 +265,7 @@ mkdir /usr/ports.workdir Here is how you build a -STABLE kernel (on your main development box). If you want to create a custom kernel, cp GENERIC to YOURKERNEL and then edit it before configuring and building. -The kernel configuration file lives in /usr/src/sys/i386/conf/KERNELNAME. +The kernel configuration file lives in /usr/src/sys/config/KERNELNAME. .Bd -literal -offset 4n cd /usr/src make buildkernel KERNCONF=KERNELNAME diff --git a/sys/conf/options b/sys/conf/options index 9b54e5a917..49e1c1c588 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/conf/options,v 1.191.2.53 2003/06/04 17:56:58 sam Exp $ -# $DragonFly: src/sys/conf/options,v 1.55 2006/10/22 16:09:19 dillon Exp $ +# $DragonFly: src/sys/conf/options,v 1.56 2006/10/24 17:09:46 swildner Exp $ # # On the handling of kernel options # @@ -148,7 +148,7 @@ UDF opt_dontuse.h NTFS opt_dontuse.h # These static filesystems has one slightly bogus static dependency in -# sys/i386/i386/autoconf.c. If any of these filesystems are +# sys/arch/i386/i386/autoconf.c. If any of these filesystems are # statically compiled into the kernel, code for mounting them as root # filesystems will be enabled - but look below. Boot-code is purposely # unavailable for the LKM-based versions. diff --git a/sys/config/GENERIC b/sys/config/GENERIC index f39b0b8363..bdfad0fd0a 100644 --- a/sys/config/GENERIC +++ b/sys/config/GENERIC @@ -1,10 +1,10 @@ # # GENERIC -- Generic kernel configuration file for DragonFly/i386 # -# Check the LINT configuration file in sys/i386/conf, for an +# Check the LINT configuration file in sys/config, for an # exhaustive list of options. # -# $DragonFly: src/sys/config/GENERIC,v 1.40 2006/10/22 16:09:19 dillon Exp $ +# $DragonFly: src/sys/config/GENERIC,v 1.41 2006/10/24 17:09:46 swildner Exp $ machine i386 cpu I386_CPU diff --git a/sys/dev/netif/em/README b/sys/dev/netif/em/README index ea1d3a98b2..ea060960c1 100644 --- a/sys/dev/netif/em/README +++ b/sys/dev/netif/em/README @@ -1,4 +1,4 @@ -$DragonFly: src/sys/dev/netif/em/README,v 1.5 2006/08/12 13:03:44 sephe Exp $ +$DragonFly: src/sys/dev/netif/em/README,v 1.6 2006/10/24 17:09:46 swildner Exp $ FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters ============================================================ @@ -107,7 +107,7 @@ name of the driver tar file. dev/em/if_em_phy.c optional em Edit the kernel configuration file (i.e., GENERIC or MYKERNEL) in - /usr/src/sys/i386/conf, and ensure the following line is present: + /usr/src/sys/config, and ensure the following line is present: device em diff --git a/sys/platform/pc32/include/ioctl_fd.h b/sys/platform/pc32/include/ioctl_fd.h index d91a473501..4947603eea 100644 --- a/sys/platform/pc32/include/ioctl_fd.h +++ b/sys/platform/pc32/include/ioctl_fd.h @@ -25,7 +25,7 @@ * DAMAGE. * * $FreeBSD: src/sys/i386/include/ioctl_fd.h,v 1.13.2.1 2001/07/19 13:16:54 joerg Exp $ - * $DragonFly: src/sys/platform/pc32/include/ioctl_fd.h,v 1.3 2006/05/20 02:42:06 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/ioctl_fd.h,v 1.4 2006/10/24 17:09:45 swildner Exp $ */ #ifndef _MACHINE_IOCTL_FD_H_ @@ -124,7 +124,7 @@ struct fdc_status { #define FDOPT_NOERRLOG 0x002 /* no "hard error" kernel log messages */ /* - * The following definitions duplicate those in sys/i386/isa/fdreg.h + * The following definitions duplicate those in sys/dev/disk/fd/fdreg.h * They are here since their values are to be used in the above * structure when formatting a floppy. For very obvious reasons, both * definitions must match ;-) diff --git a/test/debug/chkincludes b/test/debug/chkincludes index 2c8c50ee06..e41c4d2fcc 100644 --- a/test/debug/chkincludes +++ b/test/debug/chkincludes @@ -7,7 +7,7 @@ # The goal is that the only error reported should be a specific #error # indicating that particular support is not available. # -# $DragonFly: src/test/debug/chkincludes,v 1.1 2006/05/21 00:27:59 dillon Exp $ +# $DragonFly: src/test/debug/chkincludes,v 1.2 2006/10/24 17:09:46 swildner Exp $ cd /usr/src/sys set files = ( sys/*.h vm/*.h net*/*.h ddb/*.h i386/include/*.h ) @@ -33,7 +33,7 @@ echo -n > opt_ktr.h echo -n > opt_icmp_bandlim.h echo "#define INET 1" > opt_inet.h -ln -s /usr/src/sys/i386/include machine +ln -s /usr/src/sys/arch/i386/include machine foreach i ( $files ) if ( "$i" == "sys/syscall-hide.h" ) then diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8 index 0bee9297a7..6b377ccede 100644 --- a/usr.sbin/lptcontrol/lptcontrol.8 +++ b/usr.sbin/lptcontrol/lptcontrol.8 @@ -11,7 +11,7 @@ .\" documentation and/or other materials provided with the distribution. .\" .\" $FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.12.2.6 2003/03/11 21:13:50 trhodes Exp $ -.\" $DragonFly: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.3 2006/02/17 19:40:17 swildner Exp $ +.\" $DragonFly: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.4 2006/10/24 17:09:46 swildner Exp $ .Dd September 3, 1994 .Dt LPTCONTROL 8 .Os @@ -62,12 +62,12 @@ or .Fl e must be specified. .Sh FILES -.Bl -tag -width /sys/i386/conf/GENERIC -compact +.Bl -tag -width /sys/config/GENERIC -compact .It Pa /dev/lpt? printer devices .It Pa /dev/lpctl? printer control devices -.It Pa /sys/i386/conf/GENERIC +.It Pa /sys/config/GENERIC kernel configuration file .El .Sh SEE ALSO