imported code harmonisation

. common/include/arch/i386 is not actually an imported
	  sys/arch/i386/include but leftover Minix files;
	  remove and move to include/
	. move include/ufs to sys/ufs, where it came from, now that
	  we have a sys/ hierarchy
	. move mdocml/ to external/bsd/, now we have that
	. single sys/arch/i386/stand/ import for boot stuff
This commit is contained in:
Ben Gras 2012-03-13 02:37:22 +01:00
parent 6cdfedc12c
commit d65f6f7009
233 changed files with 56401 additions and 101 deletions

View file

@ -37,6 +37,7 @@ mkfiles:
includes: includes:
$(MAKE) -C include includes $(MAKE) -C include includes
$(MAKE) -C lib includes NBSD_LIBC=yes $(MAKE) -C lib includes NBSD_LIBC=yes
$(MAKE) -C sys includes
MKHEADERSS=/usr/pkg/gcc*/libexec/gcc/*/*/install-tools/mkheaders MKHEADERSS=/usr/pkg/gcc*/libexec/gcc/*/*/install-tools/mkheaders
gnu-includes: includes gnu-includes: includes
@ -50,6 +51,7 @@ commands: includes libraries
$(MAKE) -C bin all $(MAKE) -C bin all
$(MAKE) -C sbin all $(MAKE) -C sbin all
$(MAKE) -C usr.bin all $(MAKE) -C usr.bin all
$(MAKE) -C external all
$(MAKE) -C libexec all $(MAKE) -C libexec all
$(MAKE) -C usr.sbin all $(MAKE) -C usr.sbin all
@ -59,6 +61,7 @@ dep-all:
$(MAKE) -C bin dependall $(MAKE) -C bin dependall
$(MAKE) -C sbin dependall $(MAKE) -C sbin dependall
$(MAKE) -C usr.bin dependall $(MAKE) -C usr.bin dependall
$(MAKE) -C external dependall
$(MAKE) -C libexec dependall $(MAKE) -C libexec dependall
$(MAKE) -C usr.sbin dependall $(MAKE) -C usr.sbin dependall
$(MAKE) -C kernel dependall $(MAKE) -C kernel dependall
@ -77,6 +80,7 @@ all:
$(MAKE) -C bin all $(MAKE) -C bin all
$(MAKE) -C sbin all $(MAKE) -C sbin all
$(MAKE) -C usr.bin all $(MAKE) -C usr.bin all
$(MAKE) -C external all
$(MAKE) -C libexec all $(MAKE) -C libexec all
$(MAKE) -C usr.sbin all $(MAKE) -C usr.sbin all
$(MAKE) -C tools all $(MAKE) -C tools all
@ -89,6 +93,7 @@ install:
$(MAKE) -C bin install $(MAKE) -C bin install
$(MAKE) -C sbin install $(MAKE) -C sbin install
$(MAKE) -C usr.bin install $(MAKE) -C usr.bin install
$(MAKE) -C external install
$(MAKE) -C usr.sbin install $(MAKE) -C usr.sbin install
$(MAKE) -C servers install $(MAKE) -C servers install
$(MAKE) -C share install $(MAKE) -C share install
@ -100,6 +105,7 @@ clean: mkfiles
$(MAKE) -C bin clean $(MAKE) -C bin clean
$(MAKE) -C sbin clean $(MAKE) -C sbin clean
$(MAKE) -C usr.bin clean $(MAKE) -C usr.bin clean
$(MAKE) -C external clean
$(MAKE) -C libexec clean $(MAKE) -C libexec clean
$(MAKE) -C usr.sbin clean $(MAKE) -C usr.sbin clean
$(MAKE) -C share clean $(MAKE) -C share clean
@ -114,6 +120,7 @@ cleandepend: mkfiles
$(MAKE) -C bin cleandepend $(MAKE) -C bin cleandepend
$(MAKE) -C sbin cleandepend $(MAKE) -C sbin cleandepend
$(MAKE) -C usr.bin cleandepend $(MAKE) -C usr.bin cleandepend
$(MAKE) -C external cleandepend
$(MAKE) -C libexec cleandepend $(MAKE) -C libexec cleandepend
$(MAKE) -C usr.sbin cleandepend $(MAKE) -C usr.sbin cleandepend
$(MAKE) -C tools cleandepend $(MAKE) -C tools cleandepend

View file

@ -1,75 +0,0 @@
/* $NetBSD: disklabel.h,v 1.16 2011/08/30 12:39:55 bouyer Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Christopher G. Demetriou.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _I386_DISKLABEL_H_
#define _I386_DISKLABEL_H_
#define LABELUSESMBR 1 /* use MBR partitionning */
#define LABELSECTOR 1 /* sector containing label */
#define LABELOFFSET 0 /* offset of label in sector */
#define MAXPARTITIONS 16 /* number of partitions */
#define OLDMAXPARTITIONS 8 /* number of partitions before 1.6 */
#define RAW_PART 3 /* raw partition: XX?d (XXX) */
/*
* We use the highest bit of the minor number for the partition number.
* This maintains backward compatibility with device nodes created before
* MAXPARTITIONS was increased.
*/
#define __I386_MAXDISKS ((1 << 20) / MAXPARTITIONS)
#define DISKUNIT(dev) ((minor(dev) / OLDMAXPARTITIONS) % __I386_MAXDISKS)
#define DISKPART(dev) ((minor(dev) % OLDMAXPARTITIONS) + \
((minor(dev) / (__I386_MAXDISKS * OLDMAXPARTITIONS)) * OLDMAXPARTITIONS))
#define DISKMINOR(unit, part) \
(((unit) * OLDMAXPARTITIONS) + ((part) % OLDMAXPARTITIONS) + \
((part) / OLDMAXPARTITIONS) * (__I386_MAXDISKS * OLDMAXPARTITIONS))
/* Pull in MBR partition definitions. */
#if HAVE_NBTOOL_CONFIG_H
#include <nbinclude/sys/bootblock.h>
#else
#include <sys/bootblock.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
#ifndef __ASSEMBLER__
#if HAVE_NBTOOL_CONFIG_H
#include <nbinclude/sys/dkbad.h>
#else
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
#endif
#endif /* _I386_DISKLABEL_H_ */

3
external/Makefile vendored Normal file
View file

@ -0,0 +1,3 @@
SUBDIR=bsd
.include <bsd.subdir.mk>

3
external/bsd/Makefile vendored Normal file
View file

@ -0,0 +1,3 @@
.include <bsd.own.mk>
SUBDIR=mdocml
.include <bsd.subdir.mk>

View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile.inc,v 1.12 2010/07/25 19:16:18 joerg Exp $ # $NetBSD: Makefile.inc,v 1.12 2010/07/25 19:16:18 joerg Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
.include "../Makefile.inc"
VERSION!= cd ${.PARSEDIR}/dist && ${MAKE} -V VERSION VERSION!= cd ${.PARSEDIR}/dist && ${MAKE} -V VERSION

View file

@ -25,19 +25,6 @@ INCS= a.out.h aio.h ar.h assert.h atomic.h \
ttyent.h tzfile.h ucontext.h ulimit.h unistd.h util.h utime.h utmp.h \ ttyent.h tzfile.h ucontext.h ulimit.h unistd.h util.h utime.h utmp.h \
utmpx.h uuid.h varargs.h vis.h wchar.h wctype.h wordexp.h utmpx.h uuid.h varargs.h vis.h wchar.h wctype.h wordexp.h
INCS += ufs/chfs/chfs.h ufs/chfs/chfs_args.h ufs/chfs/chfs_inode.h \
ufs/chfs/chfs_pool.h ufs/chfs/debug.h ufs/chfs/ebh.h \
ufs/chfs/ebh_media.h ufs/chfs/ebh_misc.h ufs/chfs/media.h \
ufs/ext2fs/ext2fs.h ufs/ext2fs/ext2fs_dinode.h \
ufs/ext2fs/ext2fs_dir.h ufs/ext2fs/ext2fs_extern.h \
ufs/ffs/ffs_extern.h ufs/ffs/fs.h ufs/lfs/lfs.h \
ufs/lfs/lfs_extern.h ufs/mfs/mfs_extern.h ufs/mfs/mfsnode.h \
ufs/ufs/dinode.h ufs/ufs/dir.h ufs/ufs/dirhash.h \
ufs/ufs/extattr.h ufs/ufs/inode.h ufs/ufs/quota.h \
ufs/ufs/quota1.h ufs/ufs/quota2.h ufs/ufs/ufs_bswap.h \
ufs/ufs/ufs_extern.h ufs/ufs/ufs_quota.h ufs/ufs/ufs_wapbl.h \
ufs/ufs/ufsmount.h \
.else .else
INCS= a.out.h aio.h ar.h assert.h atomic.h \ INCS= a.out.h aio.h ar.h assert.h atomic.h \
bitstring.h bm.h cdbr.h cdbw.h complex.h cpio.h ctype.h \ bitstring.h bm.h cdbr.h cdbw.h complex.h cpio.h ctype.h \

View file

@ -9,8 +9,12 @@ INCS= ansi.h asm.h bswap.h byte_swap.h cdefs.h \
int_mwgwtypes.h int_types.h limits.h \ int_mwgwtypes.h int_types.h limits.h \
math.h mcontext.h npx.h param.h profile.h \ math.h mcontext.h npx.h param.h profile.h \
setjmp.h signal.h stdarg.h types.h \ setjmp.h signal.h stdarg.h types.h \
vmparam.h wchar_limits.h vmparam.h wchar_limits.h \
archtypes.h bios.h cmos.h cpu.h diskparm.h fpu.h int86.h \
interrupt.h memory.h multiboot.h partition.h \
pci.h pci_amd.h pci_intel.h pci_sis.h pci_via.h \
ports.h stackframe.h vm.h elf.h elf_machdep.h mutex.h \
disklabel.h
.include "${MINIXSRCDIR}/common/include/arch/i386/Makefile.inc"
.include <bsd.kinc.mk> .include <bsd.kinc.mk>

View file

@ -1,4 +1,4 @@
/* $NetBSD: disklabel.h,v 1.15 2009/11/23 13:40:10 pooka Exp $ */ /* $NetBSD: disklabel.h,v 1.16 2011/08/30 12:39:55 bouyer Exp $ */
/* /*
* Copyright (c) 1994 Christopher G. Demetriou * Copyright (c) 1994 Christopher G. Demetriou
@ -33,6 +33,7 @@
#ifndef _I386_DISKLABEL_H_ #ifndef _I386_DISKLABEL_H_
#define _I386_DISKLABEL_H_ #define _I386_DISKLABEL_H_
#define LABELUSESMBR 1 /* use MBR partitionning */
#define LABELSECTOR 1 /* sector containing label */ #define LABELSECTOR 1 /* sector containing label */
#define LABELOFFSET 0 /* offset of label in sector */ #define LABELOFFSET 0 /* offset of label in sector */
#define MAXPARTITIONS 16 /* number of partitions */ #define MAXPARTITIONS 16 /* number of partitions */

Some files were not shown because too many files have changed in this diff Show more