From: Lionel Sambuc Date: Mon, 28 Jul 2014 19:19:37 +0000 (+0200) Subject: New sources layout X-Git-Tag: v3.3.0~90 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/static/doc/zpipe.c?a=commitdiff_plain;h=433d6423c39e34ec4b79c950597bb2d236f886be;p=minix.git New sources layout Change-Id: Ic716f336b7071063997cf5b4dae6d50e0b4631e9 --- diff --git a/Makefile b/Makefile index c50912c9a..502982b75 100644 --- a/Makefile +++ b/Makefile @@ -137,10 +137,9 @@ _SRC_TOP_OBJ_= # _SUBDIR is used to set SUBDIR, after removing directories that have # BUILD_${dir}=no, or that have no ${dir}/Makefile. # -_SUBDIR= tools lib include gnu external crypto/external minix bin games +_SUBDIR= tools lib include gnu external crypto/external bin games .if defined(__MINIX) -_SUBDIR+= commands man benchmarks test -_SUBDIR+= kernel servers drivers +_SUBDIR+= minix .endif # defined(__MINIX) _SUBDIR+= libexec sbin usr.bin _SUBDIR+= usr.sbin share sys etc tests compat @@ -168,7 +167,7 @@ afterinstall: .PHONY .MAKE .if !defined(__MINIX) ${MAKEDIRTARGET} share/man makedb .else - ${MAKEDIRTARGET} man makedb + ${MAKEDIRTARGET} minix/man makedb .endif # !defined(__MINIX) .endif .if (${MKUNPRIVED} != "no" && ${MKINFO} != "no") diff --git a/benchmarks/unixbench-5.1.2/Makefile.inc b/benchmarks/unixbench-5.1.2/Makefile.inc deleted file mode 100644 index 63ca782bd..000000000 --- a/benchmarks/unixbench-5.1.2/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -BINDIR=/usr/benchmarks/unixbench diff --git a/commands/tcpstat/Makefile b/commands/tcpstat/Makefile deleted file mode 100644 index 298b47f3d..000000000 --- a/commands/tcpstat/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -PROG= tcpstat -CPPFLAGS+= -I${NETBSDSRCDIR}/servers -D'ARGS(a)=a' - -MAN= - -.include diff --git a/commands/udpstat/Makefile b/commands/udpstat/Makefile deleted file mode 100644 index 8d0894d5e..000000000 --- a/commands/udpstat/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -PROG= udpstat -CPPFLAGS+= -I${NETBSDSRCDIR}/servers -D'ARGS(a)=a' -MAN= - -.include diff --git a/commands/writeisofs/Makefile b/commands/writeisofs/Makefile deleted file mode 100644 index eb0dfb14a..000000000 --- a/commands/writeisofs/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -PROG= writeisofs -MAN= - -CPPFLAGS+= -I${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include - -.include diff --git a/drivers/Makefile b/drivers/Makefile deleted file mode 100644 index 5f0aa4355..000000000 --- a/drivers/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# Makefile for all device drivers. -# -.include - -.if ${MKIMAGEONLY} != "yes" -# The default case - -# Drivers available on all platforms -SUBDIR= hello \ - log \ - mmc \ - pty \ - random \ - tty \ - uds \ - usb_storage \ - vnd \ - readclock - -.if ${MACHINE_ARCH} == "i386" -SUBDIR+= ahci \ - amddev \ - atl2 \ - at_wini \ - audio \ - dec21140A \ - dp8390 \ - dpeth \ - e1000 \ - fbd \ - filter \ - floppy \ - fxp \ - lance \ - orinoco \ - pci pckbd \ - printer \ - rtl8139 \ - rtl8169 \ - ti1225 \ - vbox \ - acpi \ - virtio_blk \ - virtio_net -.endif - -.if ${MACHINE_ARCH} == "earm" -SUBDIR+= bmp085 \ - cat24c256 \ - fb \ - gpio \ - i2c \ - lan8710a \ - sht21 \ - tda19988 \ - tps65217 \ - tps65950 \ - tsl2550 \ - usbd -.endif - -.endif # ${MKIMAGEONLY} != "yes" - - -.if ${MKIMAGEONLY} == "yes" -# MKIMAGEONLY builds are specialized builds that are targeted -# at being small. - -SUBDIR= tty -.if ${MACHINE_ARCH} == "i386" -SUBDIR+= at_wini \ - floppy \ - pci \ - pckbd -.endif - -.endif # ${MKIMAGEONLY} == "yes" - -# memory driver must be last for ramdisk image -SUBDIR+= ramdisk .WAIT memory - -.include diff --git a/drivers/audio/Makefile b/drivers/audio/Makefile deleted file mode 100644 index 7dcffe42e..000000000 --- a/drivers/audio/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# Makefile for all audio drivers. - -.include - -SUBDIR= .WAIT es1370 es1371 sb16 - -.include diff --git a/drivers/audio/Makefile.inc b/drivers/audio/Makefile.inc deleted file mode 100644 index 704d229a3..000000000 --- a/drivers/audio/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -.include - -DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} -LDADD+= -laudiodriver -lchardriver -lsys - -.if exists(${.CURDIR}/../../Makefile.inc) -.include "${.CURDIR}/../../Makefile.inc" -.endif diff --git a/drivers/tty/keymaps/Makefile b/drivers/tty/keymaps/Makefile deleted file mode 100644 index 46eef2122..000000000 --- a/drivers/tty/keymaps/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Generate binary keymaps. - -.include - -FILES= dvorak.map french.map german.map italian.map japanese.map \ - latin-america.map norwegian.map polish.map russian-cp866.map \ - russian.map scandinavian.map spanish.map uk.map \ - us-std.map us-swap.map russian-cp1251.map \ - ukraine-koi8-u.map portuguese.map abnt2.map - -.include "Makefile.inc" - -.include diff --git a/drivers/tty/keymaps/Makefile.inc b/drivers/tty/keymaps/Makefile.inc deleted file mode 100644 index 0e5a73cd7..000000000 --- a/drivers/tty/keymaps/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -FILESDIR= /usr/lib/keymaps - -.SUFFIXES: .src .map - -.src.map: - ${_MKTARGET_CREATE} - ${HOST_CC} ${HOST_CFLAGS} ${HOST_CPPFLAGS} ${HOST_LDFLAGS} -DKEYSRC=\"$<\" -o ${.OBJDIR}/${.TARGET}_genmap ${.CURDIR}/genmap.c - ${.OBJDIR}/${.TARGET}_genmap > ${.OBJDIR}/${.TARGET} - rm -f ${.OBJDIR}/${.TARGET}_genmap - -realall: ${FILES} - -CLEANFILES+= ${FILES} diff --git a/etc/Makefile b/etc/Makefile index a8a6ecf98..c1835d81d 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -203,9 +203,9 @@ MAKEDEV: ${.CURDIR}/MAKEDEV.awk ${.CURDIR}/MAKEDEV.tmpl \ .else MAKEDEV: .PHONY if [ ${MKUNPRIVED} != "yes" ]; then \ - cd ${DESTDIR}/dev && sh ${NETBSDSRCDIR}/commands/MAKEDEV/MAKEDEV.sh -s; \ + cd ${DESTDIR}/dev && sh ${NETBSDSRCDIR}/minix/commands/MAKEDEV/MAKEDEV.sh -s; \ else \ - sh ${NETBSDSRCDIR}/commands/MAKEDEV/MAKEDEV.sh -m -s >> ${DESTDIR}/METALOG; \ + sh ${NETBSDSRCDIR}/minix/commands/MAKEDEV/MAKEDEV.sh -m -s >> ${DESTDIR}/METALOG; \ fi .endif # !defined(__MINIX) @@ -448,7 +448,7 @@ install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV ${_MKMSG_INSTALL} ${DESTDIR}/etc/rc.capes ${INSTALL_DIR} ${DESTDIR}/etc/rc.capes ${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/etc/rc.capes/* ${DESTDIR}/etc/rc.capes - ${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/drivers/usbd/usbd.conf ${DESTDIR}/etc/system.conf.d/usbd + ${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/minix/drivers/usb/usbd/usbd.conf ${DESTDIR}/etc/system.conf.d/usbd .endif # Minix/earm specific .for subdir in . defaults mtree ${MAKEDIRTARGET} ${subdir} configinstall diff --git a/include/Makefile b/include/Makefile index 608c070c3..d84b8b53f 100644 --- a/include/Makefile +++ b/include/Makefile @@ -37,11 +37,6 @@ INCS+= ssp/ssp.h ssp/stdio.h ssp/string.h ssp/strings.h ssp/unistd.h INCS+= ieeefp.h .endif -.if defined(__MINIX) -# MINIX Specific headers. -INCS+= env.h fetch.h lib.h libutil.h varargs.h -.endif - .include @@ -50,17 +45,11 @@ INCSDIR= /usr/include .if defined(__MINIX) # RPC is not compiled in the libc. This include also needs # rpcgen, which can be compiled if needed. +SUBDIR+= ../minix/include .else SUBDIR= rpc .endif # defined(__MINIX) SUBDIR+= ../common/include/prop - -.if defined(__MINIX) -SUBDIR+= arch sys minix -SUBDIR+= net -SUBDIR+= ddekit -SUBDIR+= libdde -.endif # defined(__MINIX) SUBDIR+= ../common/include/ppath .include diff --git a/lib/Makefile b/lib/Makefile index ce85d6649..a5ec01b86 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -19,59 +19,60 @@ SUBDIR+= ../external/gpl3/gcc/lib/libgcc .WAIT . endif .endif +.if defined(__MINIX) #LSC MINIX libc depends on -# - libminlib because of minix/malloc-debug.c +# - libminlib because of minix/lib/libc/malloc-debug.c # - libmthread because of sys/lib/libunwind -SUBDIR+= libminlib +SUBDIR+= ../minix/lib/libminlib SUBDIR+= .WAIT -SUBDIR+= libsys -SUBDIR+= libmthread +SUBDIR+= ../minix/lib/libsys +SUBDIR+= ../minix/lib/libmthread SUBDIR+= .WAIT - +.endif # defined(__MINIX) SUBDIR+= libc SUBDIR+= .WAIT .if defined(__MINIX) -SUBDIR+= libasyn \ - libaudiodriver \ - libbdev \ - libblockdriver \ - libchardriver \ - libcompat_minix \ - libddekit \ - libdevman \ - libexec \ - libfetch \ - libinputdriver \ - libminc \ - libminixfs \ - libnetdriver \ - libsffs \ - libtimers \ - libusb \ - libvtreefs +SUBDIR+= ../minix/lib/libasyn \ + ../minix/lib/libaudiodriver \ + ../minix/lib/libbdev \ + ../minix/lib/libblockdriver \ + ../minix/lib/libchardriver \ + ../minix/lib/libcompat_minix \ + ../minix/lib/libddekit \ + ../minix/lib/libdevman \ + ../minix/lib/libexec \ + ../minix/lib/libfetch \ + ../minix/lib/libinputdriver \ + ../minix/lib/libminc \ + ../minix/lib/libminixfs \ + ../minix/lib/libnetdriver \ + ../minix/lib/libsffs \ + ../minix/lib/libtimers \ + ../minix/lib/libusb \ + ../minix/lib/libvtreefs .if (${HAVE_LIBGCC} == "no") -SUBDIR+= libgcc_s_empty +SUBDIR+= ../minix/lib/libgcc_s_empty .endif .if (${MKLWIP} == "yes") -SUBDIR+= liblwip \ - libnetsock +SUBDIR+= ../minix/lib/liblwip \ + ../minix/lib/libnetsock .endif .if (${MACHINE_ARCH} == "i386") -SUBDIR+= libhgfs \ - libvassert \ - libvboxfs \ - libvirtio +SUBDIR+= ../minix/lib/libhgfs \ + ../minix/lib/libvassert \ + ../minix/lib/libvboxfs \ + ../minix/lib/libvirtio .endif .if (${MACHINE_ARCH} == "earm") -SUBDIR+= libclkconf \ - libgpio \ - libi2cdriver +SUBDIR+= ../minix/lib/libclkconf \ + ../minix/lib/libgpio \ + ../minix/lib/libi2cdriver .endif .endif # defined(__MINIX) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index b10d8d06c..32775fb03 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -111,7 +111,7 @@ SUBDIR+= pkgconfig .include "${.CURDIR}/thread-stub/Makefile.inc" .include "${.CURDIR}/time/Makefile.inc" .if defined(__MINIX) -.include "${.CURDIR}/sys-minix/Makefile.inc" +.include "${NETBSDSRCDIR}/minix/lib/libc/sys/Makefile.inc" .else .include "${.CURDIR}/tls/Makefile.inc" .endif diff --git a/lib/libc/arch/arm/gen/Makefile.inc b/lib/libc/arch/arm/gen/Makefile.inc index 7fa9347ae..ea8985c1c 100644 --- a/lib/libc/arch/arm/gen/Makefile.inc +++ b/lib/libc/arch/arm/gen/Makefile.inc @@ -27,7 +27,7 @@ SRCS+= _setjmp.S SRCS+= sigsetjmp.S .if defined(__MINIX) -# Already defined in sys-minix +# Already defined in minix/lib/libc/arch/arm/sys .else SRCS+= makecontext.c resumecontext.c swapcontext.S diff --git a/lib/libc/arch/i386/gen/Makefile.inc b/lib/libc/arch/i386/gen/Makefile.inc index 460ffbd1d..86abdd204 100644 --- a/lib/libc/arch/i386/gen/Makefile.inc +++ b/lib/libc/arch/i386/gen/Makefile.inc @@ -9,7 +9,7 @@ SRCS+= alloca.S byte_swap_2.S byte_swap_4.S fabs.S \ SRCS+= setjmp.S _setjmp.S sigsetjmp.S .if defined(__MINIX) -# Already defined in sys-minix +# Already defined in minix/lib/libc/arch/i386/sys .else SRCS+= resumecontext.S swapcontext.S .endif diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index cedef2f68..b44e1401c 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -3,7 +3,7 @@ # gen sources .if defined(__MINIX) -.PATH: ${.CURDIR}/gen/minix +.PATH: ${NETBSDSRCDIR}/minix/lib/libc/gen .endif # defined(__MINIX) .PATH: ${ARCHDIR}/gen ${.CURDIR}/gen diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index e8db73446..03d954054 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -3,7 +3,7 @@ # net sources .if defined(__MINIX) -.PATH: ${.CURDIR}/net/minix +.PATH: ${NETBSDSRCDIR}/minix/lib/libc/net CPPFLAGS.getpeereid.c+= -D_MINIX_SYSTEM=1 CPPFLAGS.getsockopt.c+= -D_MINIX_SYSTEM=1 diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index bd9c8d8b8..979910f7e 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -28,7 +28,7 @@ SRCS+= erand48_ieee754.c .if (${USE_JEMALLOC} != "no") SRCS+= jemalloc.c .elif (${USE_MINIXMALLOC:Uno} != "no") -.include "../minix/Makefile.inc" +.include "${NETBSDSRCDIR}/minix/lib/libc/Makefile.inc" .else SRCS+= malloc.c .endif diff --git a/man/man6/Makefile b/man/man6/Makefile deleted file mode 100644 index 63f5aa1c7..000000000 --- a/man/man6/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -MAN= - -.include -.include diff --git a/minix/Makefile b/minix/Makefile index 55ae5b945..a2a3cbe4d 100644 --- a/minix/Makefile +++ b/minix/Makefile @@ -1,5 +1,20 @@ -# $NetBSD: Makefile,v 1.18 2012/06/14 04:14:36 riz Exp $ -SUBDIR+= llvm +SUBDIR+= include .WAIT +SUBDIR+= benchmarks +SUBDIR+= bin +SUBDIR+= commands +SUBDIR+= drivers +SUBDIR+= fs +SUBDIR+= kernel +SUBDIR+= lib +SUBDIR+= llvm +SUBDIR+= man +SUBDIR+= net +SUBDIR+= sbin +SUBDIR+= servers +SUBDIR+= share +SUBDIR+= tests +SUBDIR+= usr.bin +SUBDIR+= usr.sbin .include diff --git a/minix/Makefile.inc b/minix/Makefile.inc new file mode 100644 index 000000000..8739d0d31 --- /dev/null +++ b/minix/Makefile.inc @@ -0,0 +1,3 @@ +WARNS?= 0 + +.include "../Makefile.inc" diff --git a/benchmarks/Makefile b/minix/benchmarks/Makefile similarity index 100% rename from benchmarks/Makefile rename to minix/benchmarks/Makefile diff --git a/minix/benchmarks/Makefile.inc b/minix/benchmarks/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/benchmarks/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/benchmarks/run b/minix/benchmarks/run similarity index 100% rename from benchmarks/run rename to minix/benchmarks/run diff --git a/benchmarks/unixbench-5.1.2/Makefile b/minix/benchmarks/unixbench-5.1.2/Makefile similarity index 70% rename from benchmarks/unixbench-5.1.2/Makefile rename to minix/benchmarks/unixbench-5.1.2/Makefile index a35ba60b0..16f604460 100644 --- a/benchmarks/unixbench-5.1.2/Makefile +++ b/minix/benchmarks/unixbench-5.1.2/Makefile @@ -1,5 +1,8 @@ SCRIPTS=Run + SUBDIR=pgms testdir run.sh -.include "Makefile.inc" + +BINDIR=/usr/benchmarks/unixbench + .include .include diff --git a/benchmarks/unixbench-5.1.2/README b/minix/benchmarks/unixbench-5.1.2/README similarity index 100% rename from benchmarks/unixbench-5.1.2/README rename to minix/benchmarks/unixbench-5.1.2/README diff --git a/benchmarks/unixbench-5.1.2/Run b/minix/benchmarks/unixbench-5.1.2/Run similarity index 100% rename from benchmarks/unixbench-5.1.2/Run rename to minix/benchmarks/unixbench-5.1.2/Run diff --git a/benchmarks/unixbench-5.1.2/USAGE b/minix/benchmarks/unixbench-5.1.2/USAGE similarity index 100% rename from benchmarks/unixbench-5.1.2/USAGE rename to minix/benchmarks/unixbench-5.1.2/USAGE diff --git a/benchmarks/unixbench-5.1.2/WRITING_TESTS b/minix/benchmarks/unixbench-5.1.2/WRITING_TESTS similarity index 100% rename from benchmarks/unixbench-5.1.2/WRITING_TESTS rename to minix/benchmarks/unixbench-5.1.2/WRITING_TESTS diff --git a/benchmarks/unixbench-5.1.2/pgms/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/Makefile.inc b/minix/benchmarks/unixbench-5.1.2/pgms/Makefile.inc similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/Makefile.inc rename to minix/benchmarks/unixbench-5.1.2/pgms/Makefile.inc diff --git a/benchmarks/unixbench-5.1.2/pgms/arithoh/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/arithoh/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/arithoh/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/arithoh/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/context1/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/context1/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/context1/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/context1/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/dhry2/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/dhry2/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/dhry2/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/dhry2/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/dhry2reg/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/dhry2reg/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/dhry2reg/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/dhry2reg/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/double/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/double/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/double/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/double/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/execl/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/execl/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/execl/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/execl/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/float/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/float/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/float/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/float/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/fstime/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/fstime/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/fstime/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/fstime/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/gfx-x11 b/minix/benchmarks/unixbench-5.1.2/pgms/gfx-x11 similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/gfx-x11 rename to minix/benchmarks/unixbench-5.1.2/pgms/gfx-x11 diff --git a/benchmarks/unixbench-5.1.2/pgms/hanoi/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/hanoi/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/hanoi/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/hanoi/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/index.base/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/index.base/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/index.base/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/index.base/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/index.base/index.base b/minix/benchmarks/unixbench-5.1.2/pgms/index.base/index.base similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/index.base/index.base rename to minix/benchmarks/unixbench-5.1.2/pgms/index.base/index.base diff --git a/benchmarks/unixbench-5.1.2/pgms/int/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/int/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/int/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/int/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/long/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/long/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/long/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/long/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/looper/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/looper/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/looper/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/looper/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/multi.sh/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/multi.sh/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/multi.sh/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/multi.sh/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/multi.sh/multi.sh b/minix/benchmarks/unixbench-5.1.2/pgms/multi.sh/multi.sh similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/multi.sh/multi.sh rename to minix/benchmarks/unixbench-5.1.2/pgms/multi.sh/multi.sh diff --git a/benchmarks/unixbench-5.1.2/pgms/pipe/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/pipe/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/pipe/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/pipe/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/poll/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/poll/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/poll/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/poll/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/poll2/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/poll2/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/poll2/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/poll2/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/register/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/register/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/register/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/register/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/select/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/select/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/select/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/select/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/short/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/short/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/short/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/short/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/spawn/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/spawn/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/spawn/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/spawn/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/syscall/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/syscall/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/syscall/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/syscall/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/tst.sh/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/tst.sh/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/tst.sh/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/tst.sh/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/tst.sh/tst.sh b/minix/benchmarks/unixbench-5.1.2/pgms/tst.sh/tst.sh similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/tst.sh/tst.sh rename to minix/benchmarks/unixbench-5.1.2/pgms/tst.sh/tst.sh diff --git a/benchmarks/unixbench-5.1.2/pgms/ubgears/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/ubgears/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/ubgears/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/ubgears/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/unixbench.logo/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/Makefile diff --git a/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/unixbench.logo b/minix/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/unixbench.logo similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/unixbench.logo/unixbench.logo rename to minix/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/unixbench.logo diff --git a/benchmarks/unixbench-5.1.2/pgms/whetstone-double/Makefile b/minix/benchmarks/unixbench-5.1.2/pgms/whetstone-double/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/pgms/whetstone-double/Makefile rename to minix/benchmarks/unixbench-5.1.2/pgms/whetstone-double/Makefile diff --git a/benchmarks/unixbench-5.1.2/run.sh/Makefile b/minix/benchmarks/unixbench-5.1.2/run.sh/Makefile similarity index 60% rename from benchmarks/unixbench-5.1.2/run.sh/Makefile rename to minix/benchmarks/unixbench-5.1.2/run.sh/Makefile index 5f7b3a85e..e0e787507 100644 --- a/benchmarks/unixbench-5.1.2/run.sh/Makefile +++ b/minix/benchmarks/unixbench-5.1.2/run.sh/Makefile @@ -1,3 +1,5 @@ SCRIPTS=run.sh SCRIPTSNAME=run.sh +SCRIPTSDIR=/usr/benchmarks/unixbench + .include diff --git a/benchmarks/unixbench-5.1.2/run.sh/run.sh b/minix/benchmarks/unixbench-5.1.2/run.sh/run.sh similarity index 100% rename from benchmarks/unixbench-5.1.2/run.sh/run.sh rename to minix/benchmarks/unixbench-5.1.2/run.sh/run.sh diff --git a/benchmarks/unixbench-5.1.2/src/arith.c b/minix/benchmarks/unixbench-5.1.2/src/arith.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/arith.c rename to minix/benchmarks/unixbench-5.1.2/src/arith.c diff --git a/benchmarks/unixbench-5.1.2/src/big.c b/minix/benchmarks/unixbench-5.1.2/src/big.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/big.c rename to minix/benchmarks/unixbench-5.1.2/src/big.c diff --git a/benchmarks/unixbench-5.1.2/src/context1.c b/minix/benchmarks/unixbench-5.1.2/src/context1.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/context1.c rename to minix/benchmarks/unixbench-5.1.2/src/context1.c diff --git a/benchmarks/unixbench-5.1.2/src/dhry.h b/minix/benchmarks/unixbench-5.1.2/src/dhry.h similarity index 100% rename from benchmarks/unixbench-5.1.2/src/dhry.h rename to minix/benchmarks/unixbench-5.1.2/src/dhry.h diff --git a/benchmarks/unixbench-5.1.2/src/dhry_1.c b/minix/benchmarks/unixbench-5.1.2/src/dhry_1.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/dhry_1.c rename to minix/benchmarks/unixbench-5.1.2/src/dhry_1.c diff --git a/benchmarks/unixbench-5.1.2/src/dhry_2.c b/minix/benchmarks/unixbench-5.1.2/src/dhry_2.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/dhry_2.c rename to minix/benchmarks/unixbench-5.1.2/src/dhry_2.c diff --git a/benchmarks/unixbench-5.1.2/src/dummy.c b/minix/benchmarks/unixbench-5.1.2/src/dummy.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/dummy.c rename to minix/benchmarks/unixbench-5.1.2/src/dummy.c diff --git a/benchmarks/unixbench-5.1.2/src/execl.c b/minix/benchmarks/unixbench-5.1.2/src/execl.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/execl.c rename to minix/benchmarks/unixbench-5.1.2/src/execl.c diff --git a/benchmarks/unixbench-5.1.2/src/fstime.c b/minix/benchmarks/unixbench-5.1.2/src/fstime.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/fstime.c rename to minix/benchmarks/unixbench-5.1.2/src/fstime.c diff --git a/benchmarks/unixbench-5.1.2/src/hanoi.c b/minix/benchmarks/unixbench-5.1.2/src/hanoi.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/hanoi.c rename to minix/benchmarks/unixbench-5.1.2/src/hanoi.c diff --git a/benchmarks/unixbench-5.1.2/src/looper.c b/minix/benchmarks/unixbench-5.1.2/src/looper.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/looper.c rename to minix/benchmarks/unixbench-5.1.2/src/looper.c diff --git a/benchmarks/unixbench-5.1.2/src/pipe.c b/minix/benchmarks/unixbench-5.1.2/src/pipe.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/pipe.c rename to minix/benchmarks/unixbench-5.1.2/src/pipe.c diff --git a/benchmarks/unixbench-5.1.2/src/spawn.c b/minix/benchmarks/unixbench-5.1.2/src/spawn.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/spawn.c rename to minix/benchmarks/unixbench-5.1.2/src/spawn.c diff --git a/benchmarks/unixbench-5.1.2/src/syscall.c b/minix/benchmarks/unixbench-5.1.2/src/syscall.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/syscall.c rename to minix/benchmarks/unixbench-5.1.2/src/syscall.c diff --git a/benchmarks/unixbench-5.1.2/src/time-polling.c b/minix/benchmarks/unixbench-5.1.2/src/time-polling.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/time-polling.c rename to minix/benchmarks/unixbench-5.1.2/src/time-polling.c diff --git a/benchmarks/unixbench-5.1.2/src/timeit.c b/minix/benchmarks/unixbench-5.1.2/src/timeit.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/timeit.c rename to minix/benchmarks/unixbench-5.1.2/src/timeit.c diff --git a/benchmarks/unixbench-5.1.2/src/ubgears.c b/minix/benchmarks/unixbench-5.1.2/src/ubgears.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/ubgears.c rename to minix/benchmarks/unixbench-5.1.2/src/ubgears.c diff --git a/benchmarks/unixbench-5.1.2/src/whets.c b/minix/benchmarks/unixbench-5.1.2/src/whets.c similarity index 100% rename from benchmarks/unixbench-5.1.2/src/whets.c rename to minix/benchmarks/unixbench-5.1.2/src/whets.c diff --git a/benchmarks/unixbench-5.1.2/testdir/Makefile b/minix/benchmarks/unixbench-5.1.2/testdir/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/Makefile rename to minix/benchmarks/unixbench-5.1.2/testdir/Makefile diff --git a/benchmarks/unixbench-5.1.2/testdir/Makefile.inc b/minix/benchmarks/unixbench-5.1.2/testdir/Makefile.inc similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/Makefile.inc rename to minix/benchmarks/unixbench-5.1.2/testdir/Makefile.inc diff --git a/benchmarks/unixbench-5.1.2/testdir/cctest.c/Makefile b/minix/benchmarks/unixbench-5.1.2/testdir/cctest.c/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/cctest.c/Makefile rename to minix/benchmarks/unixbench-5.1.2/testdir/cctest.c/Makefile diff --git a/benchmarks/unixbench-5.1.2/testdir/cctest.c/cctest.c b/minix/benchmarks/unixbench-5.1.2/testdir/cctest.c/cctest.c similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/cctest.c/cctest.c rename to minix/benchmarks/unixbench-5.1.2/testdir/cctest.c/cctest.c diff --git a/benchmarks/unixbench-5.1.2/testdir/dc.dat/Makefile b/minix/benchmarks/unixbench-5.1.2/testdir/dc.dat/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/dc.dat/Makefile rename to minix/benchmarks/unixbench-5.1.2/testdir/dc.dat/Makefile diff --git a/benchmarks/unixbench-5.1.2/testdir/dc.dat/dc.dat b/minix/benchmarks/unixbench-5.1.2/testdir/dc.dat/dc.dat similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/dc.dat/dc.dat rename to minix/benchmarks/unixbench-5.1.2/testdir/dc.dat/dc.dat diff --git a/benchmarks/unixbench-5.1.2/testdir/large.txt/Makefile b/minix/benchmarks/unixbench-5.1.2/testdir/large.txt/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/large.txt/Makefile rename to minix/benchmarks/unixbench-5.1.2/testdir/large.txt/Makefile diff --git a/benchmarks/unixbench-5.1.2/testdir/large.txt/large.txt b/minix/benchmarks/unixbench-5.1.2/testdir/large.txt/large.txt similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/large.txt/large.txt rename to minix/benchmarks/unixbench-5.1.2/testdir/large.txt/large.txt diff --git a/benchmarks/unixbench-5.1.2/testdir/sort.src/Makefile b/minix/benchmarks/unixbench-5.1.2/testdir/sort.src/Makefile similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/sort.src/Makefile rename to minix/benchmarks/unixbench-5.1.2/testdir/sort.src/Makefile diff --git a/benchmarks/unixbench-5.1.2/testdir/sort.src/sort.src b/minix/benchmarks/unixbench-5.1.2/testdir/sort.src/sort.src similarity index 100% rename from benchmarks/unixbench-5.1.2/testdir/sort.src/sort.src rename to minix/benchmarks/unixbench-5.1.2/testdir/sort.src/sort.src diff --git a/minix/bin/Makefile b/minix/bin/Makefile new file mode 100644 index 000000000..d1ef87892 --- /dev/null +++ b/minix/bin/Makefile @@ -0,0 +1,2 @@ + +.include diff --git a/minix/bin/Makefile.inc b/minix/bin/Makefile.inc new file mode 100644 index 000000000..5544948f2 --- /dev/null +++ b/minix/bin/Makefile.inc @@ -0,0 +1,3 @@ +BINDIR?=/bin + +.include "../Makefile.inc" diff --git a/commands/DESCRIBE/DESCRIBE.sh b/minix/commands/DESCRIBE/DESCRIBE.sh similarity index 100% rename from commands/DESCRIBE/DESCRIBE.sh rename to minix/commands/DESCRIBE/DESCRIBE.sh diff --git a/commands/DESCRIBE/Makefile b/minix/commands/DESCRIBE/Makefile similarity index 100% rename from commands/DESCRIBE/Makefile rename to minix/commands/DESCRIBE/Makefile diff --git a/commands/MAKEDEV/MAKEDEV.8 b/minix/commands/MAKEDEV/MAKEDEV.8 similarity index 100% rename from commands/MAKEDEV/MAKEDEV.8 rename to minix/commands/MAKEDEV/MAKEDEV.8 diff --git a/commands/MAKEDEV/MAKEDEV.sh b/minix/commands/MAKEDEV/MAKEDEV.sh similarity index 100% rename from commands/MAKEDEV/MAKEDEV.sh rename to minix/commands/MAKEDEV/MAKEDEV.sh diff --git a/commands/MAKEDEV/Makefile b/minix/commands/MAKEDEV/Makefile similarity index 100% rename from commands/MAKEDEV/Makefile rename to minix/commands/MAKEDEV/Makefile diff --git a/commands/Makefile b/minix/commands/Makefile similarity index 95% rename from commands/Makefile rename to minix/commands/Makefile index 1eb4cdee3..83a732241 100644 --- a/commands/Makefile +++ b/minix/commands/Makefile @@ -38,8 +38,4 @@ SUBDIR= add_route arp ash at backup btrace \ command expr getopts read test \ umask wait -.if ${MACHINE_ARCH} == "earm" -SUBDIR+= eepromread -.endif - .include diff --git a/commands/Makefile.inc b/minix/commands/Makefile.inc similarity index 91% rename from commands/Makefile.inc rename to minix/commands/Makefile.inc index 32212f7ba..dbfc37950 100644 --- a/commands/Makefile.inc +++ b/minix/commands/Makefile.inc @@ -1,4 +1,3 @@ - # Only include Minix-specific libraries when compiling # for non-Minix, i.e. not natively in a crossbuild. .if !defined(HOSTPROGNAME) @@ -11,3 +10,4 @@ BINDIR?=/usr/bin NOGCCERROR?= yes NOCLANGERROR?= yes +.include "../Makefile.inc" diff --git a/commands/add_route/Makefile b/minix/commands/add_route/Makefile similarity index 100% rename from commands/add_route/Makefile rename to minix/commands/add_route/Makefile diff --git a/commands/add_route/add_route.c b/minix/commands/add_route/add_route.c similarity index 100% rename from commands/add_route/add_route.c rename to minix/commands/add_route/add_route.c diff --git a/commands/arp/Makefile b/minix/commands/arp/Makefile similarity index 100% rename from commands/arp/Makefile rename to minix/commands/arp/Makefile diff --git a/commands/arp/arp.c b/minix/commands/arp/arp.c similarity index 100% rename from commands/arp/arp.c rename to minix/commands/arp/arp.c diff --git a/commands/ash/Makefile b/minix/commands/ash/Makefile similarity index 100% rename from commands/ash/Makefile rename to minix/commands/ash/Makefile diff --git a/commands/ash/TOUR b/minix/commands/ash/TOUR similarity index 100% rename from commands/ash/TOUR rename to minix/commands/ash/TOUR diff --git a/commands/ash/alias.c b/minix/commands/ash/alias.c similarity index 100% rename from commands/ash/alias.c rename to minix/commands/ash/alias.c diff --git a/commands/ash/alias.h b/minix/commands/ash/alias.h similarity index 100% rename from commands/ash/alias.h rename to minix/commands/ash/alias.h diff --git a/commands/ash/arith.y b/minix/commands/ash/arith.y similarity index 100% rename from commands/ash/arith.y rename to minix/commands/ash/arith.y diff --git a/commands/ash/arith_lex.h b/minix/commands/ash/arith_lex.h similarity index 100% rename from commands/ash/arith_lex.h rename to minix/commands/ash/arith_lex.h diff --git a/commands/ash/arith_lex.l b/minix/commands/ash/arith_lex.l similarity index 100% rename from commands/ash/arith_lex.l rename to minix/commands/ash/arith_lex.l diff --git a/commands/ash/bltin/LICENSE b/minix/commands/ash/bltin/LICENSE similarity index 100% rename from commands/ash/bltin/LICENSE rename to minix/commands/ash/bltin/LICENSE diff --git a/commands/ash/bltin/Makefile.inc b/minix/commands/ash/bltin/Makefile.inc similarity index 100% rename from commands/ash/bltin/Makefile.inc rename to minix/commands/ash/bltin/Makefile.inc diff --git a/commands/ash/bltin/binary_op b/minix/commands/ash/bltin/binary_op similarity index 100% rename from commands/ash/bltin/binary_op rename to minix/commands/ash/bltin/binary_op diff --git a/commands/ash/bltin/bltin.h b/minix/commands/ash/bltin/bltin.h similarity index 100% rename from commands/ash/bltin/bltin.h rename to minix/commands/ash/bltin/bltin.h diff --git a/commands/ash/bltin/catf.c b/minix/commands/ash/bltin/catf.c similarity index 100% rename from commands/ash/bltin/catf.c rename to minix/commands/ash/bltin/catf.c diff --git a/commands/ash/bltin/echo.c b/minix/commands/ash/bltin/echo.c similarity index 100% rename from commands/ash/bltin/echo.c rename to minix/commands/ash/bltin/echo.c diff --git a/commands/ash/bltin/error.c b/minix/commands/ash/bltin/error.c similarity index 100% rename from commands/ash/bltin/error.c rename to minix/commands/ash/bltin/error.c diff --git a/commands/ash/bltin/expr.c b/minix/commands/ash/bltin/expr.c similarity index 100% rename from commands/ash/bltin/expr.c rename to minix/commands/ash/bltin/expr.c diff --git a/commands/ash/bltin/line.c b/minix/commands/ash/bltin/line.c similarity index 100% rename from commands/ash/bltin/line.c rename to minix/commands/ash/bltin/line.c diff --git a/commands/ash/bltin/makefile.not b/minix/commands/ash/bltin/makefile.not similarity index 100% rename from commands/ash/bltin/makefile.not rename to minix/commands/ash/bltin/makefile.not diff --git a/commands/ash/bltin/mkexpr.sh b/minix/commands/ash/bltin/mkexpr.sh similarity index 100% rename from commands/ash/bltin/mkexpr.sh rename to minix/commands/ash/bltin/mkexpr.sh diff --git a/commands/ash/bltin/myregexp.h b/minix/commands/ash/bltin/myregexp.h similarity index 100% rename from commands/ash/bltin/myregexp.h rename to minix/commands/ash/bltin/myregexp.h diff --git a/commands/ash/bltin/nlecho.c b/minix/commands/ash/bltin/nlecho.c similarity index 100% rename from commands/ash/bltin/nlecho.c rename to minix/commands/ash/bltin/nlecho.c diff --git a/commands/ash/bltin/regexp.c b/minix/commands/ash/bltin/regexp.c similarity index 100% rename from commands/ash/bltin/regexp.c rename to minix/commands/ash/bltin/regexp.c diff --git a/commands/ash/bltin/stalloc.c b/minix/commands/ash/bltin/stalloc.c similarity index 100% rename from commands/ash/bltin/stalloc.c rename to minix/commands/ash/bltin/stalloc.c diff --git a/commands/ash/bltin/umask.c b/minix/commands/ash/bltin/umask.c similarity index 100% rename from commands/ash/bltin/umask.c rename to minix/commands/ash/bltin/umask.c diff --git a/commands/ash/bltin/unary_op b/minix/commands/ash/bltin/unary_op similarity index 100% rename from commands/ash/bltin/unary_op rename to minix/commands/ash/bltin/unary_op diff --git a/commands/ash/builtins b/minix/commands/ash/builtins similarity index 100% rename from commands/ash/builtins rename to minix/commands/ash/builtins diff --git a/commands/ash/builtins.def b/minix/commands/ash/builtins.def similarity index 100% rename from commands/ash/builtins.def rename to minix/commands/ash/builtins.def diff --git a/commands/ash/cd.c b/minix/commands/ash/cd.c similarity index 100% rename from commands/ash/cd.c rename to minix/commands/ash/cd.c diff --git a/commands/ash/cd.h b/minix/commands/ash/cd.h similarity index 100% rename from commands/ash/cd.h rename to minix/commands/ash/cd.h diff --git a/commands/ash/complete.c b/minix/commands/ash/complete.c similarity index 100% rename from commands/ash/complete.c rename to minix/commands/ash/complete.c diff --git a/commands/ash/complete.h b/minix/commands/ash/complete.h similarity index 100% rename from commands/ash/complete.h rename to minix/commands/ash/complete.h diff --git a/commands/ash/errmsg.c b/minix/commands/ash/errmsg.c similarity index 100% rename from commands/ash/errmsg.c rename to minix/commands/ash/errmsg.c diff --git a/commands/ash/errmsg.h b/minix/commands/ash/errmsg.h similarity index 100% rename from commands/ash/errmsg.h rename to minix/commands/ash/errmsg.h diff --git a/commands/ash/error.c b/minix/commands/ash/error.c similarity index 100% rename from commands/ash/error.c rename to minix/commands/ash/error.c diff --git a/commands/ash/error.h b/minix/commands/ash/error.h similarity index 100% rename from commands/ash/error.h rename to minix/commands/ash/error.h diff --git a/commands/ash/eval.c b/minix/commands/ash/eval.c similarity index 100% rename from commands/ash/eval.c rename to minix/commands/ash/eval.c diff --git a/commands/ash/eval.h b/minix/commands/ash/eval.h similarity index 100% rename from commands/ash/eval.h rename to minix/commands/ash/eval.h diff --git a/commands/ash/exec.c b/minix/commands/ash/exec.c similarity index 100% rename from commands/ash/exec.c rename to minix/commands/ash/exec.c diff --git a/commands/ash/exec.h b/minix/commands/ash/exec.h similarity index 100% rename from commands/ash/exec.h rename to minix/commands/ash/exec.h diff --git a/commands/ash/expand.c b/minix/commands/ash/expand.c similarity index 100% rename from commands/ash/expand.c rename to minix/commands/ash/expand.c diff --git a/commands/ash/expand.h b/minix/commands/ash/expand.h similarity index 100% rename from commands/ash/expand.h rename to minix/commands/ash/expand.h diff --git a/commands/ash/funcs/cmv b/minix/commands/ash/funcs/cmv similarity index 100% rename from commands/ash/funcs/cmv rename to minix/commands/ash/funcs/cmv diff --git a/commands/ash/funcs/dirs b/minix/commands/ash/funcs/dirs similarity index 100% rename from commands/ash/funcs/dirs rename to minix/commands/ash/funcs/dirs diff --git a/commands/ash/funcs/kill b/minix/commands/ash/funcs/kill similarity index 100% rename from commands/ash/funcs/kill rename to minix/commands/ash/funcs/kill diff --git a/commands/ash/funcs/login b/minix/commands/ash/funcs/login similarity index 100% rename from commands/ash/funcs/login rename to minix/commands/ash/funcs/login diff --git a/commands/ash/funcs/newgrp b/minix/commands/ash/funcs/newgrp similarity index 100% rename from commands/ash/funcs/newgrp rename to minix/commands/ash/funcs/newgrp diff --git a/commands/ash/funcs/popd b/minix/commands/ash/funcs/popd similarity index 100% rename from commands/ash/funcs/popd rename to minix/commands/ash/funcs/popd diff --git a/commands/ash/funcs/pushd b/minix/commands/ash/funcs/pushd similarity index 100% rename from commands/ash/funcs/pushd rename to minix/commands/ash/funcs/pushd diff --git a/commands/ash/funcs/suspend b/minix/commands/ash/funcs/suspend similarity index 100% rename from commands/ash/funcs/suspend rename to minix/commands/ash/funcs/suspend diff --git a/commands/ash/histedit.c b/minix/commands/ash/histedit.c similarity index 100% rename from commands/ash/histedit.c rename to minix/commands/ash/histedit.c diff --git a/commands/ash/init.h b/minix/commands/ash/init.h similarity index 100% rename from commands/ash/init.h rename to minix/commands/ash/init.h diff --git a/commands/ash/input.c b/minix/commands/ash/input.c similarity index 100% rename from commands/ash/input.c rename to minix/commands/ash/input.c diff --git a/commands/ash/input.h b/minix/commands/ash/input.h similarity index 100% rename from commands/ash/input.h rename to minix/commands/ash/input.h diff --git a/commands/ash/jobs.c b/minix/commands/ash/jobs.c similarity index 100% rename from commands/ash/jobs.c rename to minix/commands/ash/jobs.c diff --git a/commands/ash/jobs.h b/minix/commands/ash/jobs.h similarity index 100% rename from commands/ash/jobs.h rename to minix/commands/ash/jobs.h diff --git a/commands/ash/machdep.h b/minix/commands/ash/machdep.h similarity index 100% rename from commands/ash/machdep.h rename to minix/commands/ash/machdep.h diff --git a/commands/ash/mail.c b/minix/commands/ash/mail.c similarity index 100% rename from commands/ash/mail.c rename to minix/commands/ash/mail.c diff --git a/commands/ash/mail.h b/minix/commands/ash/mail.h similarity index 100% rename from commands/ash/mail.h rename to minix/commands/ash/mail.h diff --git a/commands/ash/main.c b/minix/commands/ash/main.c similarity index 100% rename from commands/ash/main.c rename to minix/commands/ash/main.c diff --git a/commands/ash/main.h b/minix/commands/ash/main.h similarity index 100% rename from commands/ash/main.h rename to minix/commands/ash/main.h diff --git a/commands/ash/memalloc.c b/minix/commands/ash/memalloc.c similarity index 100% rename from commands/ash/memalloc.c rename to minix/commands/ash/memalloc.c diff --git a/commands/ash/memalloc.h b/minix/commands/ash/memalloc.h similarity index 100% rename from commands/ash/memalloc.h rename to minix/commands/ash/memalloc.h diff --git a/commands/ash/miscbltin.c b/minix/commands/ash/miscbltin.c similarity index 100% rename from commands/ash/miscbltin.c rename to minix/commands/ash/miscbltin.c diff --git a/commands/ash/mkbuiltins.sh b/minix/commands/ash/mkbuiltins.sh similarity index 100% rename from commands/ash/mkbuiltins.sh rename to minix/commands/ash/mkbuiltins.sh diff --git a/commands/ash/mkinit.c b/minix/commands/ash/mkinit.c similarity index 100% rename from commands/ash/mkinit.c rename to minix/commands/ash/mkinit.c diff --git a/commands/ash/mknodes.c b/minix/commands/ash/mknodes.c similarity index 100% rename from commands/ash/mknodes.c rename to minix/commands/ash/mknodes.c diff --git a/commands/ash/mksignames.c b/minix/commands/ash/mksignames.c similarity index 100% rename from commands/ash/mksignames.c rename to minix/commands/ash/mksignames.c diff --git a/commands/ash/mksyntax.c b/minix/commands/ash/mksyntax.c similarity index 100% rename from commands/ash/mksyntax.c rename to minix/commands/ash/mksyntax.c diff --git a/commands/ash/mktokens.sh b/minix/commands/ash/mktokens.sh similarity index 100% rename from commands/ash/mktokens.sh rename to minix/commands/ash/mktokens.sh diff --git a/commands/ash/myhistedit.h b/minix/commands/ash/myhistedit.h similarity index 100% rename from commands/ash/myhistedit.h rename to minix/commands/ash/myhistedit.h diff --git a/commands/ash/mystring.c b/minix/commands/ash/mystring.c similarity index 100% rename from commands/ash/mystring.c rename to minix/commands/ash/mystring.c diff --git a/commands/ash/mystring.h b/minix/commands/ash/mystring.h similarity index 100% rename from commands/ash/mystring.h rename to minix/commands/ash/mystring.h diff --git a/commands/ash/nodes.c.pat b/minix/commands/ash/nodes.c.pat similarity index 100% rename from commands/ash/nodes.c.pat rename to minix/commands/ash/nodes.c.pat diff --git a/commands/ash/nodetypes b/minix/commands/ash/nodetypes similarity index 100% rename from commands/ash/nodetypes rename to minix/commands/ash/nodetypes diff --git a/commands/ash/options.c b/minix/commands/ash/options.c similarity index 100% rename from commands/ash/options.c rename to minix/commands/ash/options.c diff --git a/commands/ash/options.h b/minix/commands/ash/options.h similarity index 100% rename from commands/ash/options.h rename to minix/commands/ash/options.h diff --git a/commands/ash/output.c b/minix/commands/ash/output.c similarity index 100% rename from commands/ash/output.c rename to minix/commands/ash/output.c diff --git a/commands/ash/output.h b/minix/commands/ash/output.h similarity index 100% rename from commands/ash/output.h rename to minix/commands/ash/output.h diff --git a/commands/ash/parser.c b/minix/commands/ash/parser.c similarity index 100% rename from commands/ash/parser.c rename to minix/commands/ash/parser.c diff --git a/commands/ash/parser.h b/minix/commands/ash/parser.h similarity index 100% rename from commands/ash/parser.h rename to minix/commands/ash/parser.h diff --git a/commands/ash/redir.c b/minix/commands/ash/redir.c similarity index 100% rename from commands/ash/redir.c rename to minix/commands/ash/redir.c diff --git a/commands/ash/redir.h b/minix/commands/ash/redir.h similarity index 100% rename from commands/ash/redir.h rename to minix/commands/ash/redir.h diff --git a/commands/ash/setmode.c b/minix/commands/ash/setmode.c similarity index 100% rename from commands/ash/setmode.c rename to minix/commands/ash/setmode.c diff --git a/commands/ash/shell.h b/minix/commands/ash/shell.h similarity index 100% rename from commands/ash/shell.h rename to minix/commands/ash/shell.h diff --git a/commands/ash/show.c b/minix/commands/ash/show.c similarity index 100% rename from commands/ash/show.c rename to minix/commands/ash/show.c diff --git a/commands/ash/show.h b/minix/commands/ash/show.h similarity index 100% rename from commands/ash/show.h rename to minix/commands/ash/show.h diff --git a/commands/ash/trap.c b/minix/commands/ash/trap.c similarity index 100% rename from commands/ash/trap.c rename to minix/commands/ash/trap.c diff --git a/commands/ash/trap.h b/minix/commands/ash/trap.h similarity index 100% rename from commands/ash/trap.h rename to minix/commands/ash/trap.h diff --git a/commands/ash/var.c b/minix/commands/ash/var.c similarity index 100% rename from commands/ash/var.c rename to minix/commands/ash/var.c diff --git a/commands/ash/var.h b/minix/commands/ash/var.h similarity index 100% rename from commands/ash/var.h rename to minix/commands/ash/var.h diff --git a/commands/at/Makefile b/minix/commands/at/Makefile similarity index 100% rename from commands/at/Makefile rename to minix/commands/at/Makefile diff --git a/commands/at/at.c b/minix/commands/at/at.c similarity index 100% rename from commands/at/at.c rename to minix/commands/at/at.c diff --git a/commands/atnormalize/Makefile b/minix/commands/atnormalize/Makefile similarity index 100% rename from commands/atnormalize/Makefile rename to minix/commands/atnormalize/Makefile diff --git a/commands/atnormalize/atnormalize.c b/minix/commands/atnormalize/atnormalize.c similarity index 100% rename from commands/atnormalize/atnormalize.c rename to minix/commands/atnormalize/atnormalize.c diff --git a/commands/autopart/Makefile b/minix/commands/autopart/Makefile similarity index 100% rename from commands/autopart/Makefile rename to minix/commands/autopart/Makefile diff --git a/commands/autopart/autopart.c b/minix/commands/autopart/autopart.c similarity index 100% rename from commands/autopart/autopart.c rename to minix/commands/autopart/autopart.c diff --git a/commands/backup/Makefile b/minix/commands/backup/Makefile similarity index 100% rename from commands/backup/Makefile rename to minix/commands/backup/Makefile diff --git a/commands/backup/backup.c b/minix/commands/backup/backup.c similarity index 100% rename from commands/backup/backup.c rename to minix/commands/backup/backup.c diff --git a/commands/btrace/Makefile b/minix/commands/btrace/Makefile similarity index 100% rename from commands/btrace/Makefile rename to minix/commands/btrace/Makefile diff --git a/commands/btrace/btrace.c b/minix/commands/btrace/btrace.c similarity index 100% rename from commands/btrace/btrace.c rename to minix/commands/btrace/btrace.c diff --git a/commands/cawf/Makefile b/minix/commands/cawf/Makefile similarity index 100% rename from commands/cawf/Makefile rename to minix/commands/cawf/Makefile diff --git a/commands/cawf/README b/minix/commands/cawf/README similarity index 100% rename from commands/cawf/README rename to minix/commands/cawf/README diff --git a/commands/cawf/bsfilt.c b/minix/commands/cawf/bsfilt.c similarity index 100% rename from commands/cawf/bsfilt.c rename to minix/commands/cawf/bsfilt.c diff --git a/commands/cawf/cawf.c b/minix/commands/cawf/cawf.c similarity index 100% rename from commands/cawf/cawf.c rename to minix/commands/cawf/cawf.c diff --git a/commands/cawf/cawf.h b/minix/commands/cawf/cawf.h similarity index 100% rename from commands/cawf/cawf.h rename to minix/commands/cawf/cawf.h diff --git a/commands/cawf/cawflib.h b/minix/commands/cawf/cawflib.h similarity index 100% rename from commands/cawf/cawflib.h rename to minix/commands/cawf/cawflib.h diff --git a/commands/cawf/common b/minix/commands/cawf/common similarity index 100% rename from commands/cawf/common rename to minix/commands/cawf/common diff --git a/commands/cawf/device.c b/minix/commands/cawf/device.c similarity index 100% rename from commands/cawf/device.c rename to minix/commands/cawf/device.c diff --git a/commands/cawf/device.cf b/minix/commands/cawf/device.cf similarity index 100% rename from commands/cawf/device.cf rename to minix/commands/cawf/device.cf diff --git a/commands/cawf/diffs b/minix/commands/cawf/diffs similarity index 100% rename from commands/cawf/diffs rename to minix/commands/cawf/diffs diff --git a/commands/cawf/dumb.dev b/minix/commands/cawf/dumb.dev similarity index 100% rename from commands/cawf/dumb.dev rename to minix/commands/cawf/dumb.dev diff --git a/commands/cawf/error.c b/minix/commands/cawf/error.c similarity index 100% rename from commands/cawf/error.c rename to minix/commands/cawf/error.c diff --git a/commands/cawf/expand.c b/minix/commands/cawf/expand.c similarity index 100% rename from commands/cawf/expand.c rename to minix/commands/cawf/expand.c diff --git a/commands/cawf/expr.c b/minix/commands/cawf/expr.c similarity index 100% rename from commands/cawf/expr.c rename to minix/commands/cawf/expr.c diff --git a/commands/cawf/getopt.c b/minix/commands/cawf/getopt.c similarity index 100% rename from commands/cawf/getopt.c rename to minix/commands/cawf/getopt.c diff --git a/commands/cawf/macsup.c b/minix/commands/cawf/macsup.c similarity index 100% rename from commands/cawf/macsup.c rename to minix/commands/cawf/macsup.c diff --git a/commands/cawf/man.mac b/minix/commands/cawf/man.mac similarity index 100% rename from commands/cawf/man.mac rename to minix/commands/cawf/man.mac diff --git a/commands/cawf/me.mac b/minix/commands/cawf/me.mac similarity index 100% rename from commands/cawf/me.mac rename to minix/commands/cawf/me.mac diff --git a/commands/cawf/mnx.mac b/minix/commands/cawf/mnx.mac similarity index 100% rename from commands/cawf/mnx.mac rename to minix/commands/cawf/mnx.mac diff --git a/commands/cawf/ms.mac b/minix/commands/cawf/ms.mac similarity index 100% rename from commands/cawf/ms.mac rename to minix/commands/cawf/ms.mac diff --git a/commands/cawf/nreq.c b/minix/commands/cawf/nreq.c similarity index 100% rename from commands/cawf/nreq.c rename to minix/commands/cawf/nreq.c diff --git a/commands/cawf/output.c b/minix/commands/cawf/output.c similarity index 100% rename from commands/cawf/output.c rename to minix/commands/cawf/output.c diff --git a/commands/cawf/pass2.c b/minix/commands/cawf/pass2.c similarity index 100% rename from commands/cawf/pass2.c rename to minix/commands/cawf/pass2.c diff --git a/commands/cawf/pass3.c b/minix/commands/cawf/pass3.c similarity index 100% rename from commands/cawf/pass3.c rename to minix/commands/cawf/pass3.c diff --git a/commands/cawf/proto.h b/minix/commands/cawf/proto.h similarity index 100% rename from commands/cawf/proto.h rename to minix/commands/cawf/proto.h diff --git a/commands/cawf/regerror.c b/minix/commands/cawf/regerror.c similarity index 100% rename from commands/cawf/regerror.c rename to minix/commands/cawf/regerror.c diff --git a/commands/cawf/regexp.c b/minix/commands/cawf/regexp.c similarity index 100% rename from commands/cawf/regexp.c rename to minix/commands/cawf/regexp.c diff --git a/commands/cawf/regexp.h b/minix/commands/cawf/regexp.h similarity index 100% rename from commands/cawf/regexp.h rename to minix/commands/cawf/regexp.h diff --git a/commands/cawf/regmagic.h b/minix/commands/cawf/regmagic.h similarity index 100% rename from commands/cawf/regmagic.h rename to minix/commands/cawf/regmagic.h diff --git a/commands/cawf/store.c b/minix/commands/cawf/store.c similarity index 100% rename from commands/cawf/store.c rename to minix/commands/cawf/store.c diff --git a/commands/cawf/string.c b/minix/commands/cawf/string.c similarity index 100% rename from commands/cawf/string.c rename to minix/commands/cawf/string.c diff --git a/commands/cd/Makefile b/minix/commands/cd/Makefile similarity index 100% rename from commands/cd/Makefile rename to minix/commands/cd/Makefile diff --git a/commands/cd/cd.sh b/minix/commands/cd/cd.sh similarity index 100% rename from commands/cd/cd.sh rename to minix/commands/cd/cd.sh diff --git a/commands/cdprobe/Makefile b/minix/commands/cdprobe/Makefile similarity index 53% rename from commands/cdprobe/Makefile rename to minix/commands/cdprobe/Makefile index 54ef708cd..238a4c7ee 100644 --- a/commands/cdprobe/Makefile +++ b/minix/commands/cdprobe/Makefile @@ -1,5 +1,5 @@ PROG= cdprobe -CPPFLAGS+= -I${NETBSDSRCDIR}/servers +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/fs MAN= .include diff --git a/commands/cdprobe/cdprobe.c b/minix/commands/cdprobe/cdprobe.c similarity index 100% rename from commands/cdprobe/cdprobe.c rename to minix/commands/cdprobe/cdprobe.c diff --git a/commands/ci/Makefile b/minix/commands/ci/Makefile similarity index 100% rename from commands/ci/Makefile rename to minix/commands/ci/Makefile diff --git a/commands/ci/ci.c b/minix/commands/ci/ci.c similarity index 100% rename from commands/ci/ci.c rename to minix/commands/ci/ci.c diff --git a/commands/cleantmp/Makefile b/minix/commands/cleantmp/Makefile similarity index 100% rename from commands/cleantmp/Makefile rename to minix/commands/cleantmp/Makefile diff --git a/commands/cleantmp/cleantmp.c b/minix/commands/cleantmp/cleantmp.c similarity index 100% rename from commands/cleantmp/cleantmp.c rename to minix/commands/cleantmp/cleantmp.c diff --git a/commands/cmp/Makefile b/minix/commands/cmp/Makefile similarity index 100% rename from commands/cmp/Makefile rename to minix/commands/cmp/Makefile diff --git a/commands/cmp/cmp.c b/minix/commands/cmp/cmp.c similarity index 100% rename from commands/cmp/cmp.c rename to minix/commands/cmp/cmp.c diff --git a/commands/co/Makefile b/minix/commands/co/Makefile similarity index 100% rename from commands/co/Makefile rename to minix/commands/co/Makefile diff --git a/commands/co/co.c b/minix/commands/co/co.c similarity index 100% rename from commands/co/co.c rename to minix/commands/co/co.c diff --git a/commands/command/Makefile b/minix/commands/command/Makefile similarity index 100% rename from commands/command/Makefile rename to minix/commands/command/Makefile diff --git a/commands/command/command.sh b/minix/commands/command/command.sh similarity index 100% rename from commands/command/command.sh rename to minix/commands/command/command.sh diff --git a/commands/compress/Makefile b/minix/commands/compress/Makefile similarity index 100% rename from commands/compress/Makefile rename to minix/commands/compress/Makefile diff --git a/commands/compress/compress.c b/minix/commands/compress/compress.c similarity index 100% rename from commands/compress/compress.c rename to minix/commands/compress/compress.c diff --git a/commands/crc/Makefile b/minix/commands/crc/Makefile similarity index 100% rename from commands/crc/Makefile rename to minix/commands/crc/Makefile diff --git a/commands/crc/crc.c b/minix/commands/crc/crc.c similarity index 100% rename from commands/crc/crc.c rename to minix/commands/crc/crc.c diff --git a/commands/cron/Makefile b/minix/commands/cron/Makefile similarity index 100% rename from commands/cron/Makefile rename to minix/commands/cron/Makefile diff --git a/commands/cron/cron.c b/minix/commands/cron/cron.c similarity index 100% rename from commands/cron/cron.c rename to minix/commands/cron/cron.c diff --git a/commands/cron/misc.c b/minix/commands/cron/misc.c similarity index 100% rename from commands/cron/misc.c rename to minix/commands/cron/misc.c diff --git a/commands/cron/misc.h b/minix/commands/cron/misc.h similarity index 100% rename from commands/cron/misc.h rename to minix/commands/cron/misc.h diff --git a/commands/cron/tab.c b/minix/commands/cron/tab.c similarity index 100% rename from commands/cron/tab.c rename to minix/commands/cron/tab.c diff --git a/commands/cron/tab.h b/minix/commands/cron/tab.h similarity index 100% rename from commands/cron/tab.h rename to minix/commands/cron/tab.h diff --git a/commands/crontab/Makefile b/minix/commands/crontab/Makefile similarity index 61% rename from commands/crontab/Makefile rename to minix/commands/crontab/Makefile index 59092ba18..58551dc0e 100644 --- a/commands/crontab/Makefile +++ b/minix/commands/crontab/Makefile @@ -7,10 +7,10 @@ NOGCCERROR:= yes PROG= crontab SRCS= crontab.c tab.c misc.c -CPPFLAGS+= -I${.CURDIR} -I${NETBSDSRCDIR}/commands/cron +CPPFLAGS+= -I${.CURDIR} -I${NETBSDSRCDIR}/minix/commands/cron BINMODE= 4755 MAN= -.PATH: ${NETBSDSRCDIR}/commands/cron +.PATH: ${NETBSDSRCDIR}/minix/commands/cron .include diff --git a/commands/crontab/crontab.c b/minix/commands/crontab/crontab.c similarity index 100% rename from commands/crontab/crontab.c rename to minix/commands/crontab/crontab.c diff --git a/commands/dd/Makefile b/minix/commands/dd/Makefile similarity index 100% rename from commands/dd/Makefile rename to minix/commands/dd/Makefile diff --git a/commands/dd/dd.c b/minix/commands/dd/dd.c similarity index 100% rename from commands/dd/dd.c rename to minix/commands/dd/dd.c diff --git a/commands/decomp16/Makefile b/minix/commands/decomp16/Makefile similarity index 100% rename from commands/decomp16/Makefile rename to minix/commands/decomp16/Makefile diff --git a/commands/decomp16/decomp16.c b/minix/commands/decomp16/decomp16.c similarity index 100% rename from commands/decomp16/decomp16.c rename to minix/commands/decomp16/decomp16.c diff --git a/commands/devmand/Makefile b/minix/commands/devmand/Makefile similarity index 100% rename from commands/devmand/Makefile rename to minix/commands/devmand/Makefile diff --git a/commands/devmand/devmand.cfg b/minix/commands/devmand/devmand.cfg similarity index 100% rename from commands/devmand/devmand.cfg rename to minix/commands/devmand/devmand.cfg diff --git a/commands/devmand/main.c b/minix/commands/devmand/main.c similarity index 100% rename from commands/devmand/main.c rename to minix/commands/devmand/main.c diff --git a/commands/devmand/proto.h b/minix/commands/devmand/proto.h similarity index 100% rename from commands/devmand/proto.h rename to minix/commands/devmand/proto.h diff --git a/commands/devmand/usb.y b/minix/commands/devmand/usb.y similarity index 100% rename from commands/devmand/usb.y rename to minix/commands/devmand/usb.y diff --git a/commands/devmand/usb_driver.h b/minix/commands/devmand/usb_driver.h similarity index 100% rename from commands/devmand/usb_driver.h rename to minix/commands/devmand/usb_driver.h diff --git a/commands/devmand/usb_scan.l b/minix/commands/devmand/usb_scan.l similarity index 100% rename from commands/devmand/usb_scan.l rename to minix/commands/devmand/usb_scan.l diff --git a/commands/devsize/Makefile b/minix/commands/devsize/Makefile similarity index 100% rename from commands/devsize/Makefile rename to minix/commands/devsize/Makefile diff --git a/commands/devsize/devsize.c b/minix/commands/devsize/devsize.c similarity index 100% rename from commands/devsize/devsize.c rename to minix/commands/devsize/devsize.c diff --git a/commands/dhcpd/Makefile b/minix/commands/dhcpd/Makefile similarity index 100% rename from commands/dhcpd/Makefile rename to minix/commands/dhcpd/Makefile diff --git a/commands/dhcpd/arp.h b/minix/commands/dhcpd/arp.h similarity index 100% rename from commands/dhcpd/arp.h rename to minix/commands/dhcpd/arp.h diff --git a/commands/dhcpd/devices.c b/minix/commands/dhcpd/devices.c similarity index 100% rename from commands/dhcpd/devices.c rename to minix/commands/dhcpd/devices.c diff --git a/commands/dhcpd/dhcpd.c b/minix/commands/dhcpd/dhcpd.c similarity index 100% rename from commands/dhcpd/dhcpd.c rename to minix/commands/dhcpd/dhcpd.c diff --git a/commands/dhcpd/dhcpd.h b/minix/commands/dhcpd/dhcpd.h similarity index 100% rename from commands/dhcpd/dhcpd.h rename to minix/commands/dhcpd/dhcpd.h diff --git a/commands/dhcpd/ether.c b/minix/commands/dhcpd/ether.c similarity index 100% rename from commands/dhcpd/ether.c rename to minix/commands/dhcpd/ether.c diff --git a/commands/dhcpd/tags.c b/minix/commands/dhcpd/tags.c similarity index 100% rename from commands/dhcpd/tags.c rename to minix/commands/dhcpd/tags.c diff --git a/commands/dhrystone/Makefile b/minix/commands/dhrystone/Makefile similarity index 100% rename from commands/dhrystone/Makefile rename to minix/commands/dhrystone/Makefile diff --git a/commands/dhrystone/dhrystone.c b/minix/commands/dhrystone/dhrystone.c similarity index 100% rename from commands/dhrystone/dhrystone.c rename to minix/commands/dhrystone/dhrystone.c diff --git a/commands/diff/Makefile b/minix/commands/diff/Makefile similarity index 100% rename from commands/diff/Makefile rename to minix/commands/diff/Makefile diff --git a/commands/diff/diff.1 b/minix/commands/diff/diff.1 similarity index 100% rename from commands/diff/diff.1 rename to minix/commands/diff/diff.1 diff --git a/commands/diff/diff.c b/minix/commands/diff/diff.c similarity index 100% rename from commands/diff/diff.c rename to minix/commands/diff/diff.c diff --git a/commands/diff/diff.h b/minix/commands/diff/diff.h similarity index 100% rename from commands/diff/diff.h rename to minix/commands/diff/diff.h diff --git a/commands/diff/diffdir.c b/minix/commands/diff/diffdir.c similarity index 100% rename from commands/diff/diffdir.c rename to minix/commands/diff/diffdir.c diff --git a/commands/diff/diffreg.c b/minix/commands/diff/diffreg.c similarity index 100% rename from commands/diff/diffreg.c rename to minix/commands/diff/diffreg.c diff --git a/commands/diff/pathnames.h b/minix/commands/diff/pathnames.h similarity index 100% rename from commands/diff/pathnames.h rename to minix/commands/diff/pathnames.h diff --git a/commands/diff/xmalloc.c b/minix/commands/diff/xmalloc.c similarity index 100% rename from commands/diff/xmalloc.c rename to minix/commands/diff/xmalloc.c diff --git a/commands/diff/xmalloc.h b/minix/commands/diff/xmalloc.h similarity index 100% rename from commands/diff/xmalloc.h rename to minix/commands/diff/xmalloc.h diff --git a/commands/diskctl/Makefile b/minix/commands/diskctl/Makefile similarity index 100% rename from commands/diskctl/Makefile rename to minix/commands/diskctl/Makefile diff --git a/commands/diskctl/diskctl.c b/minix/commands/diskctl/diskctl.c similarity index 100% rename from commands/diskctl/diskctl.c rename to minix/commands/diskctl/diskctl.c diff --git a/commands/dosread/Makefile b/minix/commands/dosread/Makefile similarity index 100% rename from commands/dosread/Makefile rename to minix/commands/dosread/Makefile diff --git a/commands/dosread/dosread.c b/minix/commands/dosread/dosread.c similarity index 100% rename from commands/dosread/dosread.c rename to minix/commands/dosread/dosread.c diff --git a/commands/eject/Makefile b/minix/commands/eject/Makefile similarity index 100% rename from commands/eject/Makefile rename to minix/commands/eject/Makefile diff --git a/commands/eject/eject.c b/minix/commands/eject/eject.c similarity index 100% rename from commands/eject/eject.c rename to minix/commands/eject/eject.c diff --git a/commands/expr/Makefile b/minix/commands/expr/Makefile similarity index 100% rename from commands/expr/Makefile rename to minix/commands/expr/Makefile diff --git a/commands/expr/expr.sh b/minix/commands/expr/expr.sh similarity index 100% rename from commands/expr/expr.sh rename to minix/commands/expr/expr.sh diff --git a/commands/fbdctl/Makefile b/minix/commands/fbdctl/Makefile similarity index 100% rename from commands/fbdctl/Makefile rename to minix/commands/fbdctl/Makefile diff --git a/commands/fbdctl/fbdctl.c b/minix/commands/fbdctl/fbdctl.c similarity index 100% rename from commands/fbdctl/fbdctl.c rename to minix/commands/fbdctl/fbdctl.c diff --git a/commands/fdisk/Makefile b/minix/commands/fdisk/Makefile similarity index 100% rename from commands/fdisk/Makefile rename to minix/commands/fdisk/Makefile diff --git a/commands/fdisk/fdisk.c b/minix/commands/fdisk/fdisk.c similarity index 100% rename from commands/fdisk/fdisk.c rename to minix/commands/fdisk/fdisk.c diff --git a/commands/fetch/Makefile b/minix/commands/fetch/Makefile similarity index 100% rename from commands/fetch/Makefile rename to minix/commands/fetch/Makefile diff --git a/commands/fetch/fetch.1 b/minix/commands/fetch/fetch.1 similarity index 100% rename from commands/fetch/fetch.1 rename to minix/commands/fetch/fetch.1 diff --git a/commands/fetch/fetch.c b/minix/commands/fetch/fetch.c similarity index 100% rename from commands/fetch/fetch.c rename to minix/commands/fetch/fetch.c diff --git a/commands/find/Makefile b/minix/commands/find/Makefile similarity index 100% rename from commands/find/Makefile rename to minix/commands/find/Makefile diff --git a/commands/find/extern.h b/minix/commands/find/extern.h similarity index 100% rename from commands/find/extern.h rename to minix/commands/find/extern.h diff --git a/commands/find/find.1 b/minix/commands/find/find.1 similarity index 100% rename from commands/find/find.1 rename to minix/commands/find/find.1 diff --git a/commands/find/find.c b/minix/commands/find/find.c similarity index 100% rename from commands/find/find.c rename to minix/commands/find/find.c diff --git a/commands/find/find.h b/minix/commands/find/find.h similarity index 100% rename from commands/find/find.h rename to minix/commands/find/find.h diff --git a/commands/find/function.c b/minix/commands/find/function.c similarity index 100% rename from commands/find/function.c rename to minix/commands/find/function.c diff --git a/commands/find/ls.c b/minix/commands/find/ls.c similarity index 100% rename from commands/find/ls.c rename to minix/commands/find/ls.c diff --git a/commands/find/main.c b/minix/commands/find/main.c similarity index 100% rename from commands/find/main.c rename to minix/commands/find/main.c diff --git a/commands/find/misc.c b/minix/commands/find/misc.c similarity index 100% rename from commands/find/misc.c rename to minix/commands/find/misc.c diff --git a/commands/find/operator.c b/minix/commands/find/operator.c similarity index 100% rename from commands/find/operator.c rename to minix/commands/find/operator.c diff --git a/commands/find/option.c b/minix/commands/find/option.c similarity index 100% rename from commands/find/option.c rename to minix/commands/find/option.c diff --git a/commands/fix/Makefile b/minix/commands/fix/Makefile similarity index 100% rename from commands/fix/Makefile rename to minix/commands/fix/Makefile diff --git a/commands/fix/fix.c b/minix/commands/fix/fix.c similarity index 100% rename from commands/fix/fix.c rename to minix/commands/fix/fix.c diff --git a/commands/format/Makefile b/minix/commands/format/Makefile similarity index 100% rename from commands/format/Makefile rename to minix/commands/format/Makefile diff --git a/commands/format/format.c b/minix/commands/format/format.c similarity index 100% rename from commands/format/format.c rename to minix/commands/format/format.c diff --git a/commands/fsck.mfs/Makefile b/minix/commands/fsck.mfs/Makefile similarity index 68% rename from commands/fsck.mfs/Makefile rename to minix/commands/fsck.mfs/Makefile index 62a468f6e..adb971a93 100644 --- a/commands/fsck.mfs/Makefile +++ b/minix/commands/fsck.mfs/Makefile @@ -1,7 +1,7 @@ FSCK= ${NETBSDSRCDIR}/sbin/fsck PROG= fsck_mfs SRCS= fsck.c -CPPFLAGS+= -I${NETBSDSRCDIR}/servers -I${FSCK} +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/fs -I${FSCK} BINDIR= /sbin MAN= diff --git a/commands/fsck.mfs/fsck.c b/minix/commands/fsck.mfs/fsck.c similarity index 100% rename from commands/fsck.mfs/fsck.c rename to minix/commands/fsck.mfs/fsck.c diff --git a/commands/gcov-pull/Makefile b/minix/commands/gcov-pull/Makefile similarity index 100% rename from commands/gcov-pull/Makefile rename to minix/commands/gcov-pull/Makefile diff --git a/commands/gcov-pull/gcov-pull.c b/minix/commands/gcov-pull/gcov-pull.c similarity index 100% rename from commands/gcov-pull/gcov-pull.c rename to minix/commands/gcov-pull/gcov-pull.c diff --git a/commands/getopts/Makefile b/minix/commands/getopts/Makefile similarity index 100% rename from commands/getopts/Makefile rename to minix/commands/getopts/Makefile diff --git a/commands/getopts/getopts.sh b/minix/commands/getopts/getopts.sh similarity index 100% rename from commands/getopts/getopts.sh rename to minix/commands/getopts/getopts.sh diff --git a/commands/grep/Makefile b/minix/commands/grep/Makefile similarity index 100% rename from commands/grep/Makefile rename to minix/commands/grep/Makefile diff --git a/commands/grep/binary.c b/minix/commands/grep/binary.c similarity index 100% rename from commands/grep/binary.c rename to minix/commands/grep/binary.c diff --git a/commands/grep/file.c b/minix/commands/grep/file.c similarity index 100% rename from commands/grep/file.c rename to minix/commands/grep/file.c diff --git a/commands/grep/grep.1 b/minix/commands/grep/grep.1 similarity index 100% rename from commands/grep/grep.1 rename to minix/commands/grep/grep.1 diff --git a/commands/grep/grep.c b/minix/commands/grep/grep.c similarity index 100% rename from commands/grep/grep.c rename to minix/commands/grep/grep.c diff --git a/commands/grep/grep.h b/minix/commands/grep/grep.h similarity index 100% rename from commands/grep/grep.h rename to minix/commands/grep/grep.h diff --git a/commands/grep/mmfile.c b/minix/commands/grep/mmfile.c similarity index 100% rename from commands/grep/mmfile.c rename to minix/commands/grep/mmfile.c diff --git a/commands/grep/queue.c b/minix/commands/grep/queue.c similarity index 100% rename from commands/grep/queue.c rename to minix/commands/grep/queue.c diff --git a/commands/grep/readme.md b/minix/commands/grep/readme.md similarity index 100% rename from commands/grep/readme.md rename to minix/commands/grep/readme.md diff --git a/commands/grep/util.c b/minix/commands/grep/util.c similarity index 100% rename from commands/grep/util.c rename to minix/commands/grep/util.c diff --git a/commands/host/Makefile b/minix/commands/host/Makefile similarity index 100% rename from commands/host/Makefile rename to minix/commands/host/Makefile diff --git a/commands/host/host.c b/minix/commands/host/host.c similarity index 100% rename from commands/host/host.c rename to minix/commands/host/host.c diff --git a/commands/hostaddr/Makefile b/minix/commands/hostaddr/Makefile similarity index 100% rename from commands/hostaddr/Makefile rename to minix/commands/hostaddr/Makefile diff --git a/commands/hostaddr/hostaddr.c b/minix/commands/hostaddr/hostaddr.c similarity index 100% rename from commands/hostaddr/hostaddr.c rename to minix/commands/hostaddr/hostaddr.c diff --git a/commands/ifconfig/Makefile b/minix/commands/ifconfig/Makefile similarity index 100% rename from commands/ifconfig/Makefile rename to minix/commands/ifconfig/Makefile diff --git a/commands/ifconfig/ifconfig.c b/minix/commands/ifconfig/ifconfig.c similarity index 100% rename from commands/ifconfig/ifconfig.c rename to minix/commands/ifconfig/ifconfig.c diff --git a/commands/ifdef/Makefile b/minix/commands/ifdef/Makefile similarity index 100% rename from commands/ifdef/Makefile rename to minix/commands/ifdef/Makefile diff --git a/commands/ifdef/ifdef.c b/minix/commands/ifdef/ifdef.c similarity index 100% rename from commands/ifdef/ifdef.c rename to minix/commands/ifdef/ifdef.c diff --git a/commands/intr/Makefile b/minix/commands/intr/Makefile similarity index 100% rename from commands/intr/Makefile rename to minix/commands/intr/Makefile diff --git a/commands/intr/intr.c b/minix/commands/intr/intr.c similarity index 100% rename from commands/intr/intr.c rename to minix/commands/intr/intr.c diff --git a/commands/ipcrm/Makefile b/minix/commands/ipcrm/Makefile similarity index 100% rename from commands/ipcrm/Makefile rename to minix/commands/ipcrm/Makefile diff --git a/commands/ipcrm/ipcrm.c b/minix/commands/ipcrm/ipcrm.c similarity index 100% rename from commands/ipcrm/ipcrm.c rename to minix/commands/ipcrm/ipcrm.c diff --git a/commands/ipcs/Makefile b/minix/commands/ipcs/Makefile similarity index 100% rename from commands/ipcs/Makefile rename to minix/commands/ipcs/Makefile diff --git a/commands/ipcs/ipcs.c b/minix/commands/ipcs/ipcs.c similarity index 100% rename from commands/ipcs/ipcs.c rename to minix/commands/ipcs/ipcs.c diff --git a/commands/irdpd/Makefile b/minix/commands/irdpd/Makefile similarity index 100% rename from commands/irdpd/Makefile rename to minix/commands/irdpd/Makefile diff --git a/commands/irdpd/irdpd.c b/minix/commands/irdpd/irdpd.c similarity index 100% rename from commands/irdpd/irdpd.c rename to minix/commands/irdpd/irdpd.c diff --git a/commands/isoread/Makefile b/minix/commands/isoread/Makefile similarity index 100% rename from commands/isoread/Makefile rename to minix/commands/isoread/Makefile diff --git a/commands/isoread/isoread.c b/minix/commands/isoread/isoread.c similarity index 100% rename from commands/isoread/isoread.c rename to minix/commands/isoread/isoread.c diff --git a/commands/loadfont/Makefile b/minix/commands/loadfont/Makefile similarity index 100% rename from commands/loadfont/Makefile rename to minix/commands/loadfont/Makefile diff --git a/commands/loadfont/loadfont.c b/minix/commands/loadfont/loadfont.c similarity index 100% rename from commands/loadfont/loadfont.c rename to minix/commands/loadfont/loadfont.c diff --git a/commands/loadkeys/Makefile b/minix/commands/loadkeys/Makefile similarity index 100% rename from commands/loadkeys/Makefile rename to minix/commands/loadkeys/Makefile diff --git a/commands/loadkeys/loadkeys.c b/minix/commands/loadkeys/loadkeys.c similarity index 100% rename from commands/loadkeys/loadkeys.c rename to minix/commands/loadkeys/loadkeys.c diff --git a/commands/loadramdisk/Makefile b/minix/commands/loadramdisk/Makefile similarity index 100% rename from commands/loadramdisk/Makefile rename to minix/commands/loadramdisk/Makefile diff --git a/commands/loadramdisk/loadramdisk.c b/minix/commands/loadramdisk/loadramdisk.c similarity index 100% rename from commands/loadramdisk/loadramdisk.c rename to minix/commands/loadramdisk/loadramdisk.c diff --git a/commands/logger/Makefile b/minix/commands/logger/Makefile similarity index 100% rename from commands/logger/Makefile rename to minix/commands/logger/Makefile diff --git a/commands/logger/logger.c b/minix/commands/logger/logger.c similarity index 100% rename from commands/logger/logger.c rename to minix/commands/logger/logger.c diff --git a/commands/look/Makefile b/minix/commands/look/Makefile similarity index 100% rename from commands/look/Makefile rename to minix/commands/look/Makefile diff --git a/commands/look/look.c b/minix/commands/look/look.c similarity index 100% rename from commands/look/look.c rename to minix/commands/look/look.c diff --git a/commands/lp/Makefile b/minix/commands/lp/Makefile similarity index 100% rename from commands/lp/Makefile rename to minix/commands/lp/Makefile diff --git a/commands/lp/lp.c b/minix/commands/lp/lp.c similarity index 100% rename from commands/lp/lp.c rename to minix/commands/lp/lp.c diff --git a/commands/lpd/Makefile b/minix/commands/lpd/Makefile similarity index 100% rename from commands/lpd/Makefile rename to minix/commands/lpd/Makefile diff --git a/commands/lpd/lpd.c b/minix/commands/lpd/lpd.c similarity index 100% rename from commands/lpd/lpd.c rename to minix/commands/lpd/lpd.c diff --git a/commands/lspci/Makefile b/minix/commands/lspci/Makefile similarity index 100% rename from commands/lspci/Makefile rename to minix/commands/lspci/Makefile diff --git a/commands/lspci/lspci.sh b/minix/commands/lspci/lspci.sh similarity index 100% rename from commands/lspci/lspci.sh rename to minix/commands/lspci/lspci.sh diff --git a/commands/mail/Makefile b/minix/commands/mail/Makefile similarity index 100% rename from commands/mail/Makefile rename to minix/commands/mail/Makefile diff --git a/commands/mail/mail.c b/minix/commands/mail/mail.c similarity index 100% rename from commands/mail/mail.c rename to minix/commands/mail/mail.c diff --git a/commands/mined/Makefile b/minix/commands/mined/Makefile similarity index 100% rename from commands/mined/Makefile rename to minix/commands/mined/Makefile diff --git a/commands/mined/mined.h b/minix/commands/mined/mined.h similarity index 100% rename from commands/mined/mined.h rename to minix/commands/mined/mined.h diff --git a/commands/mined/mined1.c b/minix/commands/mined/mined1.c similarity index 100% rename from commands/mined/mined1.c rename to minix/commands/mined/mined1.c diff --git a/commands/mined/mined2.c b/minix/commands/mined/mined2.c similarity index 100% rename from commands/mined/mined2.c rename to minix/commands/mined/mined2.c diff --git a/commands/mount/Makefile b/minix/commands/mount/Makefile similarity index 100% rename from commands/mount/Makefile rename to minix/commands/mount/Makefile diff --git a/commands/mount/mount.c b/minix/commands/mount/mount.c similarity index 100% rename from commands/mount/mount.c rename to minix/commands/mount/mount.c diff --git a/commands/mt/Makefile b/minix/commands/mt/Makefile similarity index 100% rename from commands/mt/Makefile rename to minix/commands/mt/Makefile diff --git a/commands/mt/mt.c b/minix/commands/mt/mt.c similarity index 100% rename from commands/mt/mt.c rename to minix/commands/mt/mt.c diff --git a/commands/netconf/Makefile b/minix/commands/netconf/Makefile similarity index 100% rename from commands/netconf/Makefile rename to minix/commands/netconf/Makefile diff --git a/commands/netconf/netconf.sh b/minix/commands/netconf/netconf.sh similarity index 100% rename from commands/netconf/netconf.sh rename to minix/commands/netconf/netconf.sh diff --git a/commands/nonamed/Makefile b/minix/commands/nonamed/Makefile similarity index 100% rename from commands/nonamed/Makefile rename to minix/commands/nonamed/Makefile diff --git a/commands/nonamed/nonamed.c b/minix/commands/nonamed/nonamed.c similarity index 100% rename from commands/nonamed/nonamed.c rename to minix/commands/nonamed/nonamed.c diff --git a/commands/part/Makefile b/minix/commands/part/Makefile similarity index 100% rename from commands/part/Makefile rename to minix/commands/part/Makefile diff --git a/commands/part/part.c b/minix/commands/part/part.c similarity index 100% rename from commands/part/part.c rename to minix/commands/part/part.c diff --git a/commands/partition/Makefile b/minix/commands/partition/Makefile similarity index 63% rename from commands/partition/Makefile rename to minix/commands/partition/Makefile index 73d9322bc..4d7418456 100644 --- a/commands/partition/Makefile +++ b/minix/commands/partition/Makefile @@ -3,6 +3,6 @@ MAN= # We need this to find our partition.h while compiling natively # on non-Minix. -CPPFLAGS+= -I${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/include/arch/${MACHINE_ARCH}/include .include diff --git a/commands/partition/partition.c b/minix/commands/partition/partition.c similarity index 100% rename from commands/partition/partition.c rename to minix/commands/partition/partition.c diff --git a/commands/ping/Makefile b/minix/commands/ping/Makefile similarity index 100% rename from commands/ping/Makefile rename to minix/commands/ping/Makefile diff --git a/commands/ping/ping.c b/minix/commands/ping/ping.c similarity index 100% rename from commands/ping/ping.c rename to minix/commands/ping/ping.c diff --git a/commands/pkgin_all/Makefile b/minix/commands/pkgin_all/Makefile similarity index 100% rename from commands/pkgin_all/Makefile rename to minix/commands/pkgin_all/Makefile diff --git a/commands/pkgin_all/pkgin_all.sh b/minix/commands/pkgin_all/pkgin_all.sh similarity index 100% rename from commands/pkgin_all/pkgin_all.sh rename to minix/commands/pkgin_all/pkgin_all.sh diff --git a/commands/pkgin_cd/Makefile b/minix/commands/pkgin_cd/Makefile similarity index 100% rename from commands/pkgin_cd/Makefile rename to minix/commands/pkgin_cd/Makefile diff --git a/commands/pkgin_cd/pkgin_cd.sh b/minix/commands/pkgin_cd/pkgin_cd.sh similarity index 100% rename from commands/pkgin_cd/pkgin_cd.sh rename to minix/commands/pkgin_cd/pkgin_cd.sh diff --git a/commands/playwave/Makefile b/minix/commands/playwave/Makefile similarity index 100% rename from commands/playwave/Makefile rename to minix/commands/playwave/Makefile diff --git a/commands/playwave/playwave.c b/minix/commands/playwave/playwave.c similarity index 100% rename from commands/playwave/playwave.c rename to minix/commands/playwave/playwave.c diff --git a/commands/postinstall/Makefile b/minix/commands/postinstall/Makefile similarity index 100% rename from commands/postinstall/Makefile rename to minix/commands/postinstall/Makefile diff --git a/commands/postinstall/postinstall.sh b/minix/commands/postinstall/postinstall.sh similarity index 100% rename from commands/postinstall/postinstall.sh rename to minix/commands/postinstall/postinstall.sh diff --git a/commands/pr_routes/Makefile b/minix/commands/pr_routes/Makefile similarity index 100% rename from commands/pr_routes/Makefile rename to minix/commands/pr_routes/Makefile diff --git a/commands/pr_routes/pr_routes.c b/minix/commands/pr_routes/pr_routes.c similarity index 100% rename from commands/pr_routes/pr_routes.c rename to minix/commands/pr_routes/pr_routes.c diff --git a/commands/prep/Makefile b/minix/commands/prep/Makefile similarity index 100% rename from commands/prep/Makefile rename to minix/commands/prep/Makefile diff --git a/commands/prep/prep.c b/minix/commands/prep/prep.c similarity index 100% rename from commands/prep/prep.c rename to minix/commands/prep/prep.c diff --git a/commands/printroot/Makefile b/minix/commands/printroot/Makefile similarity index 100% rename from commands/printroot/Makefile rename to minix/commands/printroot/Makefile diff --git a/commands/printroot/printroot.c b/minix/commands/printroot/printroot.c similarity index 100% rename from commands/printroot/printroot.c rename to minix/commands/printroot/printroot.c diff --git a/commands/profile/Makefile b/minix/commands/profile/Makefile similarity index 100% rename from commands/profile/Makefile rename to minix/commands/profile/Makefile diff --git a/commands/profile/cprofalyze.pl b/minix/commands/profile/cprofalyze.pl similarity index 100% rename from commands/profile/cprofalyze.pl rename to minix/commands/profile/cprofalyze.pl diff --git a/commands/profile/profile.c b/minix/commands/profile/profile.c similarity index 100% rename from commands/profile/profile.c rename to minix/commands/profile/profile.c diff --git a/commands/profile/tools/profextr.pl b/minix/commands/profile/tools/profextr.pl similarity index 100% rename from commands/profile/tools/profextr.pl rename to minix/commands/profile/tools/profextr.pl diff --git a/commands/profile/tools/proftsc.pl b/minix/commands/profile/tools/proftsc.pl similarity index 100% rename from commands/profile/tools/proftsc.pl rename to minix/commands/profile/tools/proftsc.pl diff --git a/commands/progressbar/Makefile b/minix/commands/progressbar/Makefile similarity index 100% rename from commands/progressbar/Makefile rename to minix/commands/progressbar/Makefile diff --git a/commands/progressbar/progressbar.c b/minix/commands/progressbar/progressbar.c similarity index 100% rename from commands/progressbar/progressbar.c rename to minix/commands/progressbar/progressbar.c diff --git a/commands/ps/Makefile b/minix/commands/ps/Makefile similarity index 100% rename from commands/ps/Makefile rename to minix/commands/ps/Makefile diff --git a/commands/ps/ps.c b/minix/commands/ps/ps.c similarity index 100% rename from commands/ps/ps.c rename to minix/commands/ps/ps.c diff --git a/commands/pwdauth/Makefile b/minix/commands/pwdauth/Makefile similarity index 100% rename from commands/pwdauth/Makefile rename to minix/commands/pwdauth/Makefile diff --git a/commands/pwdauth/pwdauth.c b/minix/commands/pwdauth/pwdauth.c similarity index 100% rename from commands/pwdauth/pwdauth.c rename to minix/commands/pwdauth/pwdauth.c diff --git a/commands/ramdisk/Makefile b/minix/commands/ramdisk/Makefile similarity index 100% rename from commands/ramdisk/Makefile rename to minix/commands/ramdisk/Makefile diff --git a/commands/ramdisk/ramdisk.c b/minix/commands/ramdisk/ramdisk.c similarity index 100% rename from commands/ramdisk/ramdisk.c rename to minix/commands/ramdisk/ramdisk.c diff --git a/commands/rarpd/Makefile b/minix/commands/rarpd/Makefile similarity index 100% rename from commands/rarpd/Makefile rename to minix/commands/rarpd/Makefile diff --git a/commands/rarpd/rarpd.c b/minix/commands/rarpd/rarpd.c similarity index 100% rename from commands/rarpd/rarpd.c rename to minix/commands/rarpd/rarpd.c diff --git a/commands/rawspeed/Makefile b/minix/commands/rawspeed/Makefile similarity index 100% rename from commands/rawspeed/Makefile rename to minix/commands/rawspeed/Makefile diff --git a/commands/rawspeed/rawspeed.c b/minix/commands/rawspeed/rawspeed.c similarity index 100% rename from commands/rawspeed/rawspeed.c rename to minix/commands/rawspeed/rawspeed.c diff --git a/commands/rcp/Makefile b/minix/commands/rcp/Makefile similarity index 100% rename from commands/rcp/Makefile rename to minix/commands/rcp/Makefile diff --git a/commands/rcp/rcp.c b/minix/commands/rcp/rcp.c similarity index 100% rename from commands/rcp/rcp.c rename to minix/commands/rcp/rcp.c diff --git a/commands/read/Makefile b/minix/commands/read/Makefile similarity index 100% rename from commands/read/Makefile rename to minix/commands/read/Makefile diff --git a/commands/read/read.sh b/minix/commands/read/read.sh similarity index 100% rename from commands/read/read.sh rename to minix/commands/read/read.sh diff --git a/commands/readclock/Makefile b/minix/commands/readclock/Makefile similarity index 100% rename from commands/readclock/Makefile rename to minix/commands/readclock/Makefile diff --git a/commands/readclock/readclock.c b/minix/commands/readclock/readclock.c similarity index 100% rename from commands/readclock/readclock.c rename to minix/commands/readclock/readclock.c diff --git a/commands/recwave/Makefile b/minix/commands/recwave/Makefile similarity index 100% rename from commands/recwave/Makefile rename to minix/commands/recwave/Makefile diff --git a/commands/recwave/recwave.c b/minix/commands/recwave/recwave.c similarity index 100% rename from commands/recwave/recwave.c rename to minix/commands/recwave/recwave.c diff --git a/commands/remsync/Makefile b/minix/commands/remsync/Makefile similarity index 100% rename from commands/remsync/Makefile rename to minix/commands/remsync/Makefile diff --git a/commands/remsync/remsync.c b/minix/commands/remsync/remsync.c similarity index 100% rename from commands/remsync/remsync.c rename to minix/commands/remsync/remsync.c diff --git a/commands/repartition/Makefile b/minix/commands/repartition/Makefile similarity index 100% rename from commands/repartition/Makefile rename to minix/commands/repartition/Makefile diff --git a/commands/repartition/repartition.c b/minix/commands/repartition/repartition.c similarity index 100% rename from commands/repartition/repartition.c rename to minix/commands/repartition/repartition.c diff --git a/commands/rget/Makefile b/minix/commands/rget/Makefile similarity index 100% rename from commands/rget/Makefile rename to minix/commands/rget/Makefile diff --git a/commands/rget/rget.c b/minix/commands/rget/rget.c similarity index 100% rename from commands/rget/rget.c rename to minix/commands/rget/rget.c diff --git a/commands/rlogin/Makefile b/minix/commands/rlogin/Makefile similarity index 100% rename from commands/rlogin/Makefile rename to minix/commands/rlogin/Makefile diff --git a/commands/rlogin/rlogin.c b/minix/commands/rlogin/rlogin.c similarity index 100% rename from commands/rlogin/rlogin.c rename to minix/commands/rlogin/rlogin.c diff --git a/commands/rotate/Makefile b/minix/commands/rotate/Makefile similarity index 100% rename from commands/rotate/Makefile rename to minix/commands/rotate/Makefile diff --git a/commands/rotate/rotate.sh b/minix/commands/rotate/rotate.sh similarity index 100% rename from commands/rotate/rotate.sh rename to minix/commands/rotate/rotate.sh diff --git a/commands/rsh/Makefile b/minix/commands/rsh/Makefile similarity index 100% rename from commands/rsh/Makefile rename to minix/commands/rsh/Makefile diff --git a/commands/rsh/rsh.c b/minix/commands/rsh/rsh.c similarity index 100% rename from commands/rsh/rsh.c rename to minix/commands/rsh/rsh.c diff --git a/commands/rshd/Makefile b/minix/commands/rshd/Makefile similarity index 100% rename from commands/rshd/Makefile rename to minix/commands/rshd/Makefile diff --git a/commands/rshd/rshd.c b/minix/commands/rshd/rshd.c similarity index 100% rename from commands/rshd/rshd.c rename to minix/commands/rshd/rshd.c diff --git a/commands/screendump/Makefile b/minix/commands/screendump/Makefile similarity index 100% rename from commands/screendump/Makefile rename to minix/commands/screendump/Makefile diff --git a/commands/screendump/screendump.c b/minix/commands/screendump/screendump.c similarity index 100% rename from commands/screendump/screendump.c rename to minix/commands/screendump/screendump.c diff --git a/commands/service/Makefile b/minix/commands/service/Makefile similarity index 85% rename from commands/service/Makefile rename to minix/commands/service/Makefile index dc406fb33..fb17429b2 100644 --- a/commands/service/Makefile +++ b/minix/commands/service/Makefile @@ -7,6 +7,6 @@ BINDIR= /bin MAN.service= service.8 MAN.printconfig= -CPPFLAGS+= -I${NETBSDSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR}/minix .include diff --git a/commands/service/config.h b/minix/commands/service/config.h similarity index 100% rename from commands/service/config.h rename to minix/commands/service/config.h diff --git a/commands/service/parse.c b/minix/commands/service/parse.c similarity index 100% rename from commands/service/parse.c rename to minix/commands/service/parse.c diff --git a/commands/service/parse.h b/minix/commands/service/parse.h similarity index 100% rename from commands/service/parse.h rename to minix/commands/service/parse.h diff --git a/commands/service/print.c b/minix/commands/service/print.c similarity index 100% rename from commands/service/print.c rename to minix/commands/service/print.c diff --git a/commands/service/proto.h b/minix/commands/service/proto.h similarity index 100% rename from commands/service/proto.h rename to minix/commands/service/proto.h diff --git a/commands/service/service.8 b/minix/commands/service/service.8 similarity index 100% rename from commands/service/service.8 rename to minix/commands/service/service.8 diff --git a/commands/service/service.c b/minix/commands/service/service.c similarity index 100% rename from commands/service/service.c rename to minix/commands/service/service.c diff --git a/commands/service/util.c b/minix/commands/service/util.c similarity index 100% rename from commands/service/util.c rename to minix/commands/service/util.c diff --git a/commands/setup/Makefile b/minix/commands/setup/Makefile similarity index 100% rename from commands/setup/Makefile rename to minix/commands/setup/Makefile diff --git a/commands/setup/setup.sh b/minix/commands/setup/setup.sh similarity index 100% rename from commands/setup/setup.sh rename to minix/commands/setup/setup.sh diff --git a/commands/shared/README b/minix/commands/shared/README similarity index 100% rename from commands/shared/README rename to minix/commands/shared/README diff --git a/commands/shared/builtin.sh b/minix/commands/shared/builtin.sh similarity index 100% rename from commands/shared/builtin.sh rename to minix/commands/shared/builtin.sh diff --git a/commands/slip/Makefile b/minix/commands/slip/Makefile similarity index 100% rename from commands/slip/Makefile rename to minix/commands/slip/Makefile diff --git a/commands/slip/slip.c b/minix/commands/slip/slip.c similarity index 100% rename from commands/slip/slip.c rename to minix/commands/slip/slip.c diff --git a/commands/spell/Makefile b/minix/commands/spell/Makefile similarity index 100% rename from commands/spell/Makefile rename to minix/commands/spell/Makefile diff --git a/commands/spell/spell.sh b/minix/commands/spell/spell.sh similarity index 100% rename from commands/spell/spell.sh rename to minix/commands/spell/spell.sh diff --git a/commands/sprofalyze/Makefile b/minix/commands/sprofalyze/Makefile similarity index 100% rename from commands/sprofalyze/Makefile rename to minix/commands/sprofalyze/Makefile diff --git a/commands/sprofalyze/sprofalyze.c b/minix/commands/sprofalyze/sprofalyze.c similarity index 100% rename from commands/sprofalyze/sprofalyze.c rename to minix/commands/sprofalyze/sprofalyze.c diff --git a/commands/sprofdiff/Makefile b/minix/commands/sprofdiff/Makefile similarity index 100% rename from commands/sprofdiff/Makefile rename to minix/commands/sprofdiff/Makefile diff --git a/commands/sprofdiff/sprofdiff.c b/minix/commands/sprofdiff/sprofdiff.c similarity index 100% rename from commands/sprofdiff/sprofdiff.c rename to minix/commands/sprofdiff/sprofdiff.c diff --git a/commands/sprofdiff/tdist.c b/minix/commands/sprofdiff/tdist.c similarity index 100% rename from commands/sprofdiff/tdist.c rename to minix/commands/sprofdiff/tdist.c diff --git a/commands/sprofdiff/tdist.h b/minix/commands/sprofdiff/tdist.h similarity index 100% rename from commands/sprofdiff/tdist.h rename to minix/commands/sprofdiff/tdist.h diff --git a/commands/srccrc/Makefile b/minix/commands/srccrc/Makefile similarity index 100% rename from commands/srccrc/Makefile rename to minix/commands/srccrc/Makefile diff --git a/commands/srccrc/srccrc.sh b/minix/commands/srccrc/srccrc.sh similarity index 100% rename from commands/srccrc/srccrc.sh rename to minix/commands/srccrc/srccrc.sh diff --git a/commands/svclog/Makefile b/minix/commands/svclog/Makefile similarity index 100% rename from commands/svclog/Makefile rename to minix/commands/svclog/Makefile diff --git a/commands/svclog/svclog.sh b/minix/commands/svclog/svclog.sh similarity index 100% rename from commands/svclog/svclog.sh rename to minix/commands/svclog/svclog.sh diff --git a/commands/svrctl/Makefile b/minix/commands/svrctl/Makefile similarity index 100% rename from commands/svrctl/Makefile rename to minix/commands/svrctl/Makefile diff --git a/commands/svrctl/svrctl.c b/minix/commands/svrctl/svrctl.c similarity index 100% rename from commands/svrctl/svrctl.c rename to minix/commands/svrctl/svrctl.c diff --git a/commands/swifi/Makefile b/minix/commands/swifi/Makefile similarity index 100% rename from commands/swifi/Makefile rename to minix/commands/swifi/Makefile diff --git a/commands/swifi/db_access.c b/minix/commands/swifi/db_access.c similarity index 100% rename from commands/swifi/db_access.c rename to minix/commands/swifi/db_access.c diff --git a/commands/swifi/db_access.h b/minix/commands/swifi/db_access.h similarity index 100% rename from commands/swifi/db_access.h rename to minix/commands/swifi/db_access.h diff --git a/commands/swifi/db_disasm.c b/minix/commands/swifi/db_disasm.c similarity index 100% rename from commands/swifi/db_disasm.c rename to minix/commands/swifi/db_disasm.c diff --git a/commands/swifi/db_machdep.h b/minix/commands/swifi/db_machdep.h similarity index 100% rename from commands/swifi/db_machdep.h rename to minix/commands/swifi/db_machdep.h diff --git a/commands/swifi/db_sym.c b/minix/commands/swifi/db_sym.c similarity index 100% rename from commands/swifi/db_sym.c rename to minix/commands/swifi/db_sym.c diff --git a/commands/swifi/db_sym.h b/minix/commands/swifi/db_sym.h similarity index 100% rename from commands/swifi/db_sym.h rename to minix/commands/swifi/db_sym.h diff --git a/commands/swifi/ddb.h b/minix/commands/swifi/ddb.h similarity index 100% rename from commands/swifi/ddb.h rename to minix/commands/swifi/ddb.h diff --git a/commands/swifi/do_swifi b/minix/commands/swifi/do_swifi similarity index 100% rename from commands/swifi/do_swifi rename to minix/commands/swifi/do_swifi diff --git a/commands/swifi/do_swifi_bug1 b/minix/commands/swifi/do_swifi_bug1 similarity index 100% rename from commands/swifi/do_swifi_bug1 rename to minix/commands/swifi/do_swifi_bug1 diff --git a/commands/swifi/extra.c b/minix/commands/swifi/extra.c similarity index 100% rename from commands/swifi/extra.c rename to minix/commands/swifi/extra.c diff --git a/commands/swifi/extra.h b/minix/commands/swifi/extra.h similarity index 100% rename from commands/swifi/extra.h rename to minix/commands/swifi/extra.h diff --git a/commands/swifi/fault_model.c b/minix/commands/swifi/fault_model.c similarity index 100% rename from commands/swifi/fault_model.c rename to minix/commands/swifi/fault_model.c diff --git a/commands/swifi/random.c b/minix/commands/swifi/random.c similarity index 100% rename from commands/swifi/random.c rename to minix/commands/swifi/random.c diff --git a/commands/swifi/read_nlist.c b/minix/commands/swifi/read_nlist.c similarity index 100% rename from commands/swifi/read_nlist.c rename to minix/commands/swifi/read_nlist.c diff --git a/commands/swifi/rnd.c b/minix/commands/swifi/rnd.c similarity index 100% rename from commands/swifi/rnd.c rename to minix/commands/swifi/rnd.c diff --git a/commands/swifi/rs.restart_imm b/minix/commands/swifi/rs.restart_imm similarity index 100% rename from commands/swifi/rs.restart_imm rename to minix/commands/swifi/rs.restart_imm diff --git a/commands/swifi/run_swifi b/minix/commands/swifi/run_swifi similarity index 100% rename from commands/swifi/run_swifi rename to minix/commands/swifi/run_swifi diff --git a/commands/swifi/run_swifi-x b/minix/commands/swifi/run_swifi-x similarity index 100% rename from commands/swifi/run_swifi-x rename to minix/commands/swifi/run_swifi-x diff --git a/commands/swifi/run_t1 b/minix/commands/swifi/run_t1 similarity index 100% rename from commands/swifi/run_t1 rename to minix/commands/swifi/run_t1 diff --git a/commands/swifi/run_t1a b/minix/commands/swifi/run_t1a similarity index 100% rename from commands/swifi/run_t1a rename to minix/commands/swifi/run_t1a diff --git a/commands/swifi/run_t1b b/minix/commands/swifi/run_t1b similarity index 100% rename from commands/swifi/run_t1b rename to minix/commands/swifi/run_t1b diff --git a/commands/swifi/run_t2 b/minix/commands/swifi/run_t2 similarity index 100% rename from commands/swifi/run_t2 rename to minix/commands/swifi/run_t2 diff --git a/commands/swifi/run_t2a b/minix/commands/swifi/run_t2a similarity index 100% rename from commands/swifi/run_t2a rename to minix/commands/swifi/run_t2a diff --git a/commands/swifi/run_t2b b/minix/commands/swifi/run_t2b similarity index 100% rename from commands/swifi/run_t2b rename to minix/commands/swifi/run_t2b diff --git a/commands/swifi/socket.c b/minix/commands/swifi/socket.c similarity index 100% rename from commands/swifi/socket.c rename to minix/commands/swifi/socket.c diff --git a/commands/swifi/swifi-2.4.18-a-patch b/minix/commands/swifi/swifi-2.4.18-a-patch similarity index 100% rename from commands/swifi/swifi-2.4.18-a-patch rename to minix/commands/swifi/swifi-2.4.18-a-patch diff --git a/commands/swifi/swifi-ksyms.c b/minix/commands/swifi/swifi-ksyms.c similarity index 100% rename from commands/swifi/swifi-ksyms.c rename to minix/commands/swifi/swifi-ksyms.c diff --git a/commands/swifi/swifi-user.h b/minix/commands/swifi/swifi-user.h similarity index 100% rename from commands/swifi/swifi-user.h rename to minix/commands/swifi/swifi-user.h diff --git a/commands/swifi/swifi.h b/minix/commands/swifi/swifi.h similarity index 100% rename from commands/swifi/swifi.h rename to minix/commands/swifi/swifi.h diff --git a/commands/swifi/systest.c b/minix/commands/swifi/systest.c similarity index 100% rename from commands/swifi/systest.c rename to minix/commands/swifi/systest.c diff --git a/commands/synctree/Makefile b/minix/commands/synctree/Makefile similarity index 100% rename from commands/synctree/Makefile rename to minix/commands/synctree/Makefile diff --git a/commands/synctree/synctree.c b/minix/commands/synctree/synctree.c similarity index 100% rename from commands/synctree/synctree.c rename to minix/commands/synctree/synctree.c diff --git a/commands/sysenv/Makefile b/minix/commands/sysenv/Makefile similarity index 100% rename from commands/sysenv/Makefile rename to minix/commands/sysenv/Makefile diff --git a/commands/sysenv/sysenv.c b/minix/commands/sysenv/sysenv.c similarity index 100% rename from commands/sysenv/sysenv.c rename to minix/commands/sysenv/sysenv.c diff --git a/commands/syslogd/CHANGELOG b/minix/commands/syslogd/CHANGELOG similarity index 100% rename from commands/syslogd/CHANGELOG rename to minix/commands/syslogd/CHANGELOG diff --git a/commands/syslogd/Makefile b/minix/commands/syslogd/Makefile similarity index 100% rename from commands/syslogd/Makefile rename to minix/commands/syslogd/Makefile diff --git a/commands/syslogd/README b/minix/commands/syslogd/README similarity index 100% rename from commands/syslogd/README rename to minix/commands/syslogd/README diff --git a/commands/syslogd/README.minix b/minix/commands/syslogd/README.minix similarity index 100% rename from commands/syslogd/README.minix rename to minix/commands/syslogd/README.minix diff --git a/commands/syslogd/syslogd.c b/minix/commands/syslogd/syslogd.c similarity index 100% rename from commands/syslogd/syslogd.c rename to minix/commands/syslogd/syslogd.c diff --git a/commands/tcpd/Makefile b/minix/commands/tcpd/Makefile similarity index 100% rename from commands/tcpd/Makefile rename to minix/commands/tcpd/Makefile diff --git a/commands/tcpd/tcpd.c b/minix/commands/tcpd/tcpd.c similarity index 100% rename from commands/tcpd/tcpd.c rename to minix/commands/tcpd/tcpd.c diff --git a/commands/tcpdp/Makefile b/minix/commands/tcpdp/Makefile similarity index 100% rename from commands/tcpdp/Makefile rename to minix/commands/tcpdp/Makefile diff --git a/commands/tcpdp/tcpd.c b/minix/commands/tcpdp/tcpd.c similarity index 100% rename from commands/tcpdp/tcpd.c rename to minix/commands/tcpdp/tcpd.c diff --git a/minix/commands/tcpstat/Makefile b/minix/commands/tcpstat/Makefile new file mode 100644 index 000000000..64643aa4e --- /dev/null +++ b/minix/commands/tcpstat/Makefile @@ -0,0 +1,6 @@ +PROG= tcpstat +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/net -D'ARGS(a)=a' + +MAN= + +.include diff --git a/commands/tcpstat/tcpstat.c b/minix/commands/tcpstat/tcpstat.c similarity index 100% rename from commands/tcpstat/tcpstat.c rename to minix/commands/tcpstat/tcpstat.c diff --git a/commands/telnet/Makefile b/minix/commands/telnet/Makefile similarity index 100% rename from commands/telnet/Makefile rename to minix/commands/telnet/Makefile diff --git a/commands/telnet/ttn.c b/minix/commands/telnet/ttn.c similarity index 100% rename from commands/telnet/ttn.c rename to minix/commands/telnet/ttn.c diff --git a/commands/telnet/ttn.h b/minix/commands/telnet/ttn.h similarity index 100% rename from commands/telnet/ttn.h rename to minix/commands/telnet/ttn.h diff --git a/commands/telnet/ttn_conf.c b/minix/commands/telnet/ttn_conf.c similarity index 100% rename from commands/telnet/ttn_conf.c rename to minix/commands/telnet/ttn_conf.c diff --git a/commands/telnetd/Makefile b/minix/commands/telnetd/Makefile similarity index 100% rename from commands/telnetd/Makefile rename to minix/commands/telnetd/Makefile diff --git a/commands/telnetd/main.c b/minix/commands/telnetd/main.c similarity index 100% rename from commands/telnetd/main.c rename to minix/commands/telnetd/main.c diff --git a/commands/telnetd/pty.c b/minix/commands/telnetd/pty.c similarity index 100% rename from commands/telnetd/pty.c rename to minix/commands/telnetd/pty.c diff --git a/commands/telnetd/telnet.c b/minix/commands/telnetd/telnet.c similarity index 100% rename from commands/telnetd/telnet.c rename to minix/commands/telnetd/telnet.c diff --git a/commands/telnetd/telnet.h b/minix/commands/telnetd/telnet.h similarity index 100% rename from commands/telnetd/telnet.h rename to minix/commands/telnetd/telnet.h diff --git a/commands/telnetd/telnetd.h b/minix/commands/telnetd/telnetd.h similarity index 100% rename from commands/telnetd/telnetd.h rename to minix/commands/telnetd/telnetd.h diff --git a/commands/telnetd/term.c b/minix/commands/telnetd/term.c similarity index 100% rename from commands/telnetd/term.c rename to minix/commands/telnetd/term.c diff --git a/commands/term/Makefile b/minix/commands/term/Makefile similarity index 100% rename from commands/term/Makefile rename to minix/commands/term/Makefile diff --git a/commands/term/term.c b/minix/commands/term/term.c similarity index 100% rename from commands/term/term.c rename to minix/commands/term/term.c diff --git a/commands/termcap/Makefile b/minix/commands/termcap/Makefile similarity index 100% rename from commands/termcap/Makefile rename to minix/commands/termcap/Makefile diff --git a/commands/termcap/termcap.c b/minix/commands/termcap/termcap.c similarity index 100% rename from commands/termcap/termcap.c rename to minix/commands/termcap/termcap.c diff --git a/commands/test/Makefile b/minix/commands/test/Makefile similarity index 100% rename from commands/test/Makefile rename to minix/commands/test/Makefile diff --git a/commands/test/test.sh b/minix/commands/test/test.sh similarity index 100% rename from commands/test/test.sh rename to minix/commands/test/test.sh diff --git a/commands/tget/Makefile b/minix/commands/tget/Makefile similarity index 100% rename from commands/tget/Makefile rename to minix/commands/tget/Makefile diff --git a/commands/tget/tget.c b/minix/commands/tget/tget.c similarity index 100% rename from commands/tget/tget.c rename to minix/commands/tget/tget.c diff --git a/commands/time/Makefile b/minix/commands/time/Makefile similarity index 100% rename from commands/time/Makefile rename to minix/commands/time/Makefile diff --git a/commands/time/time.c b/minix/commands/time/time.c similarity index 100% rename from commands/time/time.c rename to minix/commands/time/time.c diff --git a/commands/truncate/Makefile b/minix/commands/truncate/Makefile similarity index 100% rename from commands/truncate/Makefile rename to minix/commands/truncate/Makefile diff --git a/commands/truncate/truncate.c b/minix/commands/truncate/truncate.c similarity index 100% rename from commands/truncate/truncate.c rename to minix/commands/truncate/truncate.c diff --git a/minix/commands/udpstat/Makefile b/minix/commands/udpstat/Makefile new file mode 100644 index 000000000..ebae6578a --- /dev/null +++ b/minix/commands/udpstat/Makefile @@ -0,0 +1,5 @@ +PROG= udpstat +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/net -D'ARGS(a)=a' +MAN= + +.include diff --git a/commands/udpstat/udpstat.c b/minix/commands/udpstat/udpstat.c similarity index 100% rename from commands/udpstat/udpstat.c rename to minix/commands/udpstat/udpstat.c diff --git a/commands/umask/Makefile b/minix/commands/umask/Makefile similarity index 100% rename from commands/umask/Makefile rename to minix/commands/umask/Makefile diff --git a/commands/umask/umask.sh b/minix/commands/umask/umask.sh similarity index 100% rename from commands/umask/umask.sh rename to minix/commands/umask/umask.sh diff --git a/commands/umount/Makefile b/minix/commands/umount/Makefile similarity index 100% rename from commands/umount/Makefile rename to minix/commands/umount/Makefile diff --git a/commands/umount/umount.c b/minix/commands/umount/umount.c similarity index 100% rename from commands/umount/umount.c rename to minix/commands/umount/umount.c diff --git a/commands/unstack/Makefile b/minix/commands/unstack/Makefile similarity index 100% rename from commands/unstack/Makefile rename to minix/commands/unstack/Makefile diff --git a/commands/unstack/unstack.sh b/minix/commands/unstack/unstack.sh similarity index 100% rename from commands/unstack/unstack.sh rename to minix/commands/unstack/unstack.sh diff --git a/commands/update/Makefile b/minix/commands/update/Makefile similarity index 100% rename from commands/update/Makefile rename to minix/commands/update/Makefile diff --git a/commands/update/update.c b/minix/commands/update/update.c similarity index 100% rename from commands/update/update.c rename to minix/commands/update/update.c diff --git a/commands/update_bootcfg/Makefile b/minix/commands/update_bootcfg/Makefile similarity index 100% rename from commands/update_bootcfg/Makefile rename to minix/commands/update_bootcfg/Makefile diff --git a/commands/update_bootcfg/update_bootcfg.sh b/minix/commands/update_bootcfg/update_bootcfg.sh similarity index 100% rename from commands/update_bootcfg/update_bootcfg.sh rename to minix/commands/update_bootcfg/update_bootcfg.sh diff --git a/commands/updateboot/Makefile b/minix/commands/updateboot/Makefile similarity index 100% rename from commands/updateboot/Makefile rename to minix/commands/updateboot/Makefile diff --git a/commands/updateboot/updateboot.sh b/minix/commands/updateboot/updateboot.sh similarity index 100% rename from commands/updateboot/updateboot.sh rename to minix/commands/updateboot/updateboot.sh diff --git a/commands/uud/Makefile b/minix/commands/uud/Makefile similarity index 100% rename from commands/uud/Makefile rename to minix/commands/uud/Makefile diff --git a/commands/uud/uud.c b/minix/commands/uud/uud.c similarity index 100% rename from commands/uud/uud.c rename to minix/commands/uud/uud.c diff --git a/commands/uue/Makefile b/minix/commands/uue/Makefile similarity index 100% rename from commands/uue/Makefile rename to minix/commands/uue/Makefile diff --git a/commands/uue/uue.c b/minix/commands/uue/uue.c similarity index 100% rename from commands/uue/uue.c rename to minix/commands/uue/uue.c diff --git a/commands/version/Makefile b/minix/commands/version/Makefile similarity index 100% rename from commands/version/Makefile rename to minix/commands/version/Makefile diff --git a/commands/version/version.sh b/minix/commands/version/version.sh similarity index 100% rename from commands/version/version.sh rename to minix/commands/version/version.sh diff --git a/commands/vol/Makefile b/minix/commands/vol/Makefile similarity index 100% rename from commands/vol/Makefile rename to minix/commands/vol/Makefile diff --git a/commands/vol/vol.c b/minix/commands/vol/vol.c similarity index 100% rename from commands/vol/vol.c rename to minix/commands/vol/vol.c diff --git a/commands/wait/Makefile b/minix/commands/wait/Makefile similarity index 100% rename from commands/wait/Makefile rename to minix/commands/wait/Makefile diff --git a/commands/wait/wait.sh b/minix/commands/wait/wait.sh similarity index 100% rename from commands/wait/wait.sh rename to minix/commands/wait/wait.sh diff --git a/commands/worldstone/Makefile b/minix/commands/worldstone/Makefile similarity index 100% rename from commands/worldstone/Makefile rename to minix/commands/worldstone/Makefile diff --git a/commands/worldstone/worldstone.1 b/minix/commands/worldstone/worldstone.1 similarity index 100% rename from commands/worldstone/worldstone.1 rename to minix/commands/worldstone/worldstone.1 diff --git a/commands/worldstone/worldstone.sh b/minix/commands/worldstone/worldstone.sh similarity index 100% rename from commands/worldstone/worldstone.sh rename to minix/commands/worldstone/worldstone.sh diff --git a/minix/commands/writeisofs/Makefile b/minix/commands/writeisofs/Makefile new file mode 100644 index 000000000..bb88f5852 --- /dev/null +++ b/minix/commands/writeisofs/Makefile @@ -0,0 +1,6 @@ +PROG= writeisofs +MAN= + +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/include/arch/${MACHINE_ARCH}/include + +.include diff --git a/commands/writeisofs/writeisofs.c b/minix/commands/writeisofs/writeisofs.c similarity index 100% rename from commands/writeisofs/writeisofs.c rename to minix/commands/writeisofs/writeisofs.c diff --git a/commands/zdump/Makefile b/minix/commands/zdump/Makefile similarity index 100% rename from commands/zdump/Makefile rename to minix/commands/zdump/Makefile diff --git a/commands/zmodem/Makefile b/minix/commands/zmodem/Makefile similarity index 100% rename from commands/zmodem/Makefile rename to minix/commands/zmodem/Makefile diff --git a/commands/zmodem/crctab.c b/minix/commands/zmodem/crctab.c similarity index 100% rename from commands/zmodem/crctab.c rename to minix/commands/zmodem/crctab.c diff --git a/commands/zmodem/rbsb.c b/minix/commands/zmodem/rbsb.c similarity index 100% rename from commands/zmodem/rbsb.c rename to minix/commands/zmodem/rbsb.c diff --git a/commands/zmodem/rz.c b/minix/commands/zmodem/rz.c similarity index 100% rename from commands/zmodem/rz.c rename to minix/commands/zmodem/rz.c diff --git a/commands/zmodem/sz.c b/minix/commands/zmodem/sz.c similarity index 100% rename from commands/zmodem/sz.c rename to minix/commands/zmodem/sz.c diff --git a/commands/zmodem/zm.c b/minix/commands/zmodem/zm.c similarity index 100% rename from commands/zmodem/zm.c rename to minix/commands/zmodem/zm.c diff --git a/commands/zmodem/zmodem.h b/minix/commands/zmodem/zmodem.h similarity index 100% rename from commands/zmodem/zmodem.h rename to minix/commands/zmodem/zmodem.h diff --git a/minix/drivers/Makefile b/minix/drivers/Makefile new file mode 100644 index 000000000..748559813 --- /dev/null +++ b/minix/drivers/Makefile @@ -0,0 +1,25 @@ +.include + +.if ${MKIMAGEONLY} == "no" +SUBDIR+= audio +SUBDIR+= clock +SUBDIR+= eeprom +SUBDIR+= examples +SUBDIR+= iommu +SUBDIR+= net +SUBDIR+= power +SUBDIR+= printer +SUBDIR+= sensors +SUBDIR+= system +SUBDIR+= usb +SUBDIR+= video +SUBDIR+= vmm_guest +.endif # ${MKIMAGEONLY} == "no" + +# The following folders contain drivers which are always required +SUBDIR+= bus +SUBDIR+= tty +SUBDIR+= hid +SUBDIR+= storage + +.include diff --git a/servers/Makefile.inc b/minix/drivers/Makefile.inc similarity index 72% rename from servers/Makefile.inc rename to minix/drivers/Makefile.inc index b423a45c8..5c329c729 100644 --- a/servers/Makefile.inc +++ b/minix/drivers/Makefile.inc @@ -1,3 +1,7 @@ +BINDIR?=/usr/sbin +MAN?= + LDADD+= -lminlib -lcompat_minix DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} -BINDIR?=/usr/sbin + +.include "../Makefile.inc" diff --git a/minix/drivers/audio/Makefile b/minix/drivers/audio/Makefile new file mode 100644 index 000000000..c2f78f1e3 --- /dev/null +++ b/minix/drivers/audio/Makefile @@ -0,0 +1,9 @@ +.include + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= es1370 +SUBDIR+= es1371 +SUBDIR+= sb16 +.endif # ${MACHINE_ARCH} == "i386" + +.include diff --git a/minix/drivers/audio/Makefile.inc b/minix/drivers/audio/Makefile.inc new file mode 100644 index 000000000..cc8cc2a9d --- /dev/null +++ b/minix/drivers/audio/Makefile.inc @@ -0,0 +1,7 @@ +BINDIR?=/usr/sbin +MAN?= + +DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBMINLIB} +LDADD+= -laudiodriver -lchardriver -lsys -lminlib + +.include "../Makefile.inc" diff --git a/drivers/audio/README b/minix/drivers/audio/README similarity index 100% rename from drivers/audio/README rename to minix/drivers/audio/README diff --git a/drivers/audio/es1370/AC97.h b/minix/drivers/audio/es1370/AC97.h similarity index 100% rename from drivers/audio/es1370/AC97.h rename to minix/drivers/audio/es1370/AC97.h diff --git a/drivers/audio/es1370/Makefile b/minix/drivers/audio/es1370/Makefile similarity index 82% rename from drivers/audio/es1370/Makefile rename to minix/drivers/audio/es1370/Makefile index 922a0f2a5..0fe5b1338 100644 --- a/drivers/audio/es1370/Makefile +++ b/minix/drivers/audio/es1370/Makefile @@ -2,8 +2,4 @@ PROG= es1370 SRCS= es1370.c ak4531.c pci_helper.c -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/audio/es1370/ak4531.c b/minix/drivers/audio/es1370/ak4531.c similarity index 100% rename from drivers/audio/es1370/ak4531.c rename to minix/drivers/audio/es1370/ak4531.c diff --git a/drivers/audio/es1370/ak4531.h b/minix/drivers/audio/es1370/ak4531.h similarity index 100% rename from drivers/audio/es1370/ak4531.h rename to minix/drivers/audio/es1370/ak4531.h diff --git a/drivers/audio/es1370/es1370.c b/minix/drivers/audio/es1370/es1370.c similarity index 100% rename from drivers/audio/es1370/es1370.c rename to minix/drivers/audio/es1370/es1370.c diff --git a/drivers/audio/es1370/es1370.h b/minix/drivers/audio/es1370/es1370.h similarity index 100% rename from drivers/audio/es1370/es1370.h rename to minix/drivers/audio/es1370/es1370.h diff --git a/drivers/audio/es1370/pci_helper.c b/minix/drivers/audio/es1370/pci_helper.c similarity index 100% rename from drivers/audio/es1370/pci_helper.c rename to minix/drivers/audio/es1370/pci_helper.c diff --git a/drivers/audio/es1370/pci_helper.h b/minix/drivers/audio/es1370/pci_helper.h similarity index 100% rename from drivers/audio/es1370/pci_helper.h rename to minix/drivers/audio/es1370/pci_helper.h diff --git a/drivers/audio/es1371/AC97.c b/minix/drivers/audio/es1371/AC97.c similarity index 100% rename from drivers/audio/es1371/AC97.c rename to minix/drivers/audio/es1371/AC97.c diff --git a/drivers/audio/es1371/AC97.h b/minix/drivers/audio/es1371/AC97.h similarity index 100% rename from drivers/audio/es1371/AC97.h rename to minix/drivers/audio/es1371/AC97.h diff --git a/drivers/audio/es1371/Makefile b/minix/drivers/audio/es1371/Makefile similarity index 85% rename from drivers/audio/es1371/Makefile rename to minix/drivers/audio/es1371/Makefile index 4c9371676..c8b56e605 100644 --- a/drivers/audio/es1371/Makefile +++ b/minix/drivers/audio/es1371/Makefile @@ -2,8 +2,4 @@ PROG= es1371 SRCS= es1371.c AC97.c pci_helper.c wait.c sample_rate_converter.c -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/audio/es1371/SRC.c b/minix/drivers/audio/es1371/SRC.c similarity index 100% rename from drivers/audio/es1371/SRC.c rename to minix/drivers/audio/es1371/SRC.c diff --git a/drivers/audio/es1371/SRC.h b/minix/drivers/audio/es1371/SRC.h similarity index 100% rename from drivers/audio/es1371/SRC.h rename to minix/drivers/audio/es1371/SRC.h diff --git a/drivers/audio/es1371/codec.c b/minix/drivers/audio/es1371/codec.c similarity index 100% rename from drivers/audio/es1371/codec.c rename to minix/drivers/audio/es1371/codec.c diff --git a/drivers/audio/es1371/codec.h b/minix/drivers/audio/es1371/codec.h similarity index 100% rename from drivers/audio/es1371/codec.h rename to minix/drivers/audio/es1371/codec.h diff --git a/drivers/audio/es1371/es1371.c b/minix/drivers/audio/es1371/es1371.c similarity index 100% rename from drivers/audio/es1371/es1371.c rename to minix/drivers/audio/es1371/es1371.c diff --git a/drivers/audio/es1371/es1371.h b/minix/drivers/audio/es1371/es1371.h similarity index 100% rename from drivers/audio/es1371/es1371.h rename to minix/drivers/audio/es1371/es1371.h diff --git a/drivers/audio/es1371/pci_helper.c b/minix/drivers/audio/es1371/pci_helper.c similarity index 100% rename from drivers/audio/es1371/pci_helper.c rename to minix/drivers/audio/es1371/pci_helper.c diff --git a/drivers/audio/es1371/pci_helper.h b/minix/drivers/audio/es1371/pci_helper.h similarity index 100% rename from drivers/audio/es1371/pci_helper.h rename to minix/drivers/audio/es1371/pci_helper.h diff --git a/drivers/audio/es1371/sample_rate_converter.c b/minix/drivers/audio/es1371/sample_rate_converter.c similarity index 100% rename from drivers/audio/es1371/sample_rate_converter.c rename to minix/drivers/audio/es1371/sample_rate_converter.c diff --git a/drivers/audio/es1371/sample_rate_converter.h b/minix/drivers/audio/es1371/sample_rate_converter.h similarity index 100% rename from drivers/audio/es1371/sample_rate_converter.h rename to minix/drivers/audio/es1371/sample_rate_converter.h diff --git a/drivers/audio/es1371/wait.c b/minix/drivers/audio/es1371/wait.c similarity index 100% rename from drivers/audio/es1371/wait.c rename to minix/drivers/audio/es1371/wait.c diff --git a/drivers/audio/es1371/wait.h b/minix/drivers/audio/es1371/wait.h similarity index 100% rename from drivers/audio/es1371/wait.h rename to minix/drivers/audio/es1371/wait.h diff --git a/drivers/audio/sb16/Makefile b/minix/drivers/audio/sb16/Makefile similarity index 81% rename from drivers/audio/sb16/Makefile rename to minix/drivers/audio/sb16/Makefile index 348bdb7a2..8e3b89d02 100644 --- a/drivers/audio/sb16/Makefile +++ b/minix/drivers/audio/sb16/Makefile @@ -2,8 +2,4 @@ PROG= sb16 SRCS= sb16.c mixer.c -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/audio/sb16/README b/minix/drivers/audio/sb16/README similarity index 100% rename from drivers/audio/sb16/README rename to minix/drivers/audio/sb16/README diff --git a/drivers/audio/sb16/mixer.c b/minix/drivers/audio/sb16/mixer.c similarity index 100% rename from drivers/audio/sb16/mixer.c rename to minix/drivers/audio/sb16/mixer.c diff --git a/drivers/audio/sb16/mixer.h b/minix/drivers/audio/sb16/mixer.h similarity index 100% rename from drivers/audio/sb16/mixer.h rename to minix/drivers/audio/sb16/mixer.h diff --git a/drivers/audio/sb16/sb16.c b/minix/drivers/audio/sb16/sb16.c similarity index 100% rename from drivers/audio/sb16/sb16.c rename to minix/drivers/audio/sb16/sb16.c diff --git a/drivers/audio/sb16/sb16.h b/minix/drivers/audio/sb16/sb16.h similarity index 100% rename from drivers/audio/sb16/sb16.h rename to minix/drivers/audio/sb16/sb16.h diff --git a/minix/drivers/bus/Makefile b/minix/drivers/bus/Makefile new file mode 100644 index 000000000..e7c956d53 --- /dev/null +++ b/minix/drivers/bus/Makefile @@ -0,0 +1,17 @@ +.include + +.if ${MKIMAGEONLY} == "no" +. if ${MACHINE_ARCH} == "i386" +SUBDIR+= ti1225 +. endif # ${MACHINE_ARCH} == "i386" + +. if ${MACHINE_ARCH} == "earm" +SUBDIR+= i2c +. endif # ${MACHINE_ARCH} == "earm" +.endif # ${MKIMAGEONLY} == "no" + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= pci +.endif # ${MACHINE_ARCH} == "i386" + +.include diff --git a/minix/drivers/bus/Makefile.inc b/minix/drivers/bus/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/bus/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/i2c/Makefile b/minix/drivers/bus/i2c/Makefile similarity index 84% rename from drivers/i2c/Makefile rename to minix/drivers/bus/i2c/Makefile index 801f98155..4bda6f01b 100644 --- a/drivers/i2c/Makefile +++ b/minix/drivers/bus/i2c/Makefile @@ -1,5 +1,4 @@ # Makefile for I2C support - PROG= i2c .include "arch/${MACHINE_ARCH}/Makefile.inc" @@ -9,12 +8,6 @@ SRCS+= i2c.c DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBCLKCONF} LDADD+= -lchardriver -lsys -ltimers -lclkconf -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} .include -.include - diff --git a/drivers/i2c/README.txt b/minix/drivers/bus/i2c/README.txt similarity index 100% rename from drivers/i2c/README.txt rename to minix/drivers/bus/i2c/README.txt diff --git a/drivers/i2c/arch/earm/Makefile.inc b/minix/drivers/bus/i2c/arch/earm/Makefile.inc similarity index 100% rename from drivers/i2c/arch/earm/Makefile.inc rename to minix/drivers/bus/i2c/arch/earm/Makefile.inc diff --git a/drivers/i2c/arch/earm/omap_i2c.c b/minix/drivers/bus/i2c/arch/earm/omap_i2c.c similarity index 100% rename from drivers/i2c/arch/earm/omap_i2c.c rename to minix/drivers/bus/i2c/arch/earm/omap_i2c.c diff --git a/drivers/i2c/arch/earm/omap_i2c.h b/minix/drivers/bus/i2c/arch/earm/omap_i2c.h similarity index 100% rename from drivers/i2c/arch/earm/omap_i2c.h rename to minix/drivers/bus/i2c/arch/earm/omap_i2c.h diff --git a/drivers/i2c/arch/earm/omap_i2c_registers.h b/minix/drivers/bus/i2c/arch/earm/omap_i2c_registers.h similarity index 100% rename from drivers/i2c/arch/earm/omap_i2c_registers.h rename to minix/drivers/bus/i2c/arch/earm/omap_i2c_registers.h diff --git a/drivers/i2c/i2c.c b/minix/drivers/bus/i2c/i2c.c similarity index 100% rename from drivers/i2c/i2c.c rename to minix/drivers/bus/i2c/i2c.c diff --git a/drivers/pci/Makefile b/minix/drivers/bus/pci/Makefile similarity index 85% rename from drivers/pci/Makefile rename to minix/drivers/bus/pci/Makefile index 5b4e30396..50af8a580 100644 --- a/drivers/pci/Makefile +++ b/minix/drivers/bus/pci/Makefile @@ -5,8 +5,4 @@ SRCS= main.c pci.c pci_table.c DPADD+= ${LIBSYS} ${LIBTIMERS} LDADD+= -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/pci/main.c b/minix/drivers/bus/pci/main.c similarity index 100% rename from drivers/pci/main.c rename to minix/drivers/bus/pci/main.c diff --git a/drivers/pci/pci.c b/minix/drivers/bus/pci/pci.c similarity index 100% rename from drivers/pci/pci.c rename to minix/drivers/bus/pci/pci.c diff --git a/drivers/pci/pci.h b/minix/drivers/bus/pci/pci.h similarity index 100% rename from drivers/pci/pci.h rename to minix/drivers/bus/pci/pci.h diff --git a/drivers/pci/pci_table.c b/minix/drivers/bus/pci/pci_table.c similarity index 100% rename from drivers/pci/pci_table.c rename to minix/drivers/bus/pci/pci_table.c diff --git a/drivers/ti1225/Makefile b/minix/drivers/bus/ti1225/Makefile similarity index 86% rename from drivers/ti1225/Makefile rename to minix/drivers/bus/ti1225/Makefile index 319488ed0..e1c1a11d0 100644 --- a/drivers/ti1225/Makefile +++ b/minix/drivers/bus/ti1225/Makefile @@ -5,8 +5,4 @@ SRCS= ti1225.c DPADD+= ${LIBSYS} LDADD+= -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/ti1225/i82365.h b/minix/drivers/bus/ti1225/i82365.h similarity index 100% rename from drivers/ti1225/i82365.h rename to minix/drivers/bus/ti1225/i82365.h diff --git a/drivers/ti1225/ti1225.c b/minix/drivers/bus/ti1225/ti1225.c similarity index 100% rename from drivers/ti1225/ti1225.c rename to minix/drivers/bus/ti1225/ti1225.c diff --git a/drivers/ti1225/ti1225.h b/minix/drivers/bus/ti1225/ti1225.h similarity index 100% rename from drivers/ti1225/ti1225.h rename to minix/drivers/bus/ti1225/ti1225.h diff --git a/minix/drivers/clock/Makefile b/minix/drivers/clock/Makefile new file mode 100644 index 000000000..3c27d76e8 --- /dev/null +++ b/minix/drivers/clock/Makefile @@ -0,0 +1,5 @@ +.include + +SUBDIR+= readclock + +.include diff --git a/minix/drivers/clock/Makefile.inc b/minix/drivers/clock/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/clock/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/readclock/Makefile b/minix/drivers/clock/readclock/Makefile similarity index 100% rename from drivers/readclock/Makefile rename to minix/drivers/clock/readclock/Makefile diff --git a/drivers/readclock/arch/earm/Makefile.inc b/minix/drivers/clock/readclock/arch/earm/Makefile.inc similarity index 100% rename from drivers/readclock/arch/earm/Makefile.inc rename to minix/drivers/clock/readclock/arch/earm/Makefile.inc diff --git a/drivers/readclock/arch/earm/arch_readclock.c b/minix/drivers/clock/readclock/arch/earm/arch_readclock.c similarity index 100% rename from drivers/readclock/arch/earm/arch_readclock.c rename to minix/drivers/clock/readclock/arch/earm/arch_readclock.c diff --git a/drivers/readclock/arch/earm/omap_rtc.c b/minix/drivers/clock/readclock/arch/earm/omap_rtc.c similarity index 100% rename from drivers/readclock/arch/earm/omap_rtc.c rename to minix/drivers/clock/readclock/arch/earm/omap_rtc.c diff --git a/drivers/readclock/arch/earm/omap_rtc.h b/minix/drivers/clock/readclock/arch/earm/omap_rtc.h similarity index 100% rename from drivers/readclock/arch/earm/omap_rtc.h rename to minix/drivers/clock/readclock/arch/earm/omap_rtc.h diff --git a/drivers/readclock/arch/i386/Makefile.inc b/minix/drivers/clock/readclock/arch/i386/Makefile.inc similarity index 100% rename from drivers/readclock/arch/i386/Makefile.inc rename to minix/drivers/clock/readclock/arch/i386/Makefile.inc diff --git a/drivers/readclock/arch/i386/arch_readclock.c b/minix/drivers/clock/readclock/arch/i386/arch_readclock.c similarity index 100% rename from drivers/readclock/arch/i386/arch_readclock.c rename to minix/drivers/clock/readclock/arch/i386/arch_readclock.c diff --git a/drivers/readclock/forward.c b/minix/drivers/clock/readclock/forward.c similarity index 100% rename from drivers/readclock/forward.c rename to minix/drivers/clock/readclock/forward.c diff --git a/drivers/readclock/forward.h b/minix/drivers/clock/readclock/forward.h similarity index 100% rename from drivers/readclock/forward.h rename to minix/drivers/clock/readclock/forward.h diff --git a/drivers/readclock/readclock.c b/minix/drivers/clock/readclock/readclock.c similarity index 100% rename from drivers/readclock/readclock.c rename to minix/drivers/clock/readclock/readclock.c diff --git a/drivers/readclock/readclock.h b/minix/drivers/clock/readclock/readclock.h similarity index 100% rename from drivers/readclock/readclock.h rename to minix/drivers/clock/readclock/readclock.h diff --git a/minix/drivers/eeprom/Makefile b/minix/drivers/eeprom/Makefile new file mode 100644 index 000000000..40ab6c53c --- /dev/null +++ b/minix/drivers/eeprom/Makefile @@ -0,0 +1,7 @@ +.include + +.if ${MACHINE_ARCH} == "earm" +SUBDIR+= cat24c256 +.endif # ${MACHINE_ARCH} == "earm" + +.include diff --git a/minix/drivers/eeprom/Makefile.inc b/minix/drivers/eeprom/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/eeprom/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/cat24c256/Makefile b/minix/drivers/eeprom/cat24c256/Makefile similarity index 91% rename from drivers/cat24c256/Makefile rename to minix/drivers/eeprom/cat24c256/Makefile index 5c7866352..457d33961 100644 --- a/drivers/cat24c256/Makefile +++ b/minix/drivers/eeprom/cat24c256/Makefile @@ -5,10 +5,6 @@ SRCS= cat24c256.c DPADD+= ${LIBI2CDRIVER} ${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lblockdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/drivers/cat24c256/README.txt b/minix/drivers/eeprom/cat24c256/README.txt similarity index 100% rename from drivers/cat24c256/README.txt rename to minix/drivers/eeprom/cat24c256/README.txt diff --git a/drivers/cat24c256/cat24c256.c b/minix/drivers/eeprom/cat24c256/cat24c256.c similarity index 100% rename from drivers/cat24c256/cat24c256.c rename to minix/drivers/eeprom/cat24c256/cat24c256.c diff --git a/minix/drivers/examples/Makefile b/minix/drivers/examples/Makefile new file mode 100644 index 000000000..31c61bf0c --- /dev/null +++ b/minix/drivers/examples/Makefile @@ -0,0 +1,5 @@ +.include + +SUBDIR+= hello + +.include diff --git a/minix/drivers/examples/Makefile.inc b/minix/drivers/examples/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/examples/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/hello/Makefile b/minix/drivers/examples/hello/Makefile similarity index 85% rename from drivers/hello/Makefile rename to minix/drivers/examples/hello/Makefile index 1a730e294..e22a2a5d7 100644 --- a/drivers/hello/Makefile +++ b/minix/drivers/examples/hello/Makefile @@ -5,8 +5,4 @@ SRCS= hello.c DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/hello/hello.c b/minix/drivers/examples/hello/hello.c similarity index 100% rename from drivers/hello/hello.c rename to minix/drivers/examples/hello/hello.c diff --git a/drivers/hello/hello.h b/minix/drivers/examples/hello/hello.h similarity index 100% rename from drivers/hello/hello.h rename to minix/drivers/examples/hello/hello.h diff --git a/minix/drivers/hid/Makefile b/minix/drivers/hid/Makefile new file mode 100644 index 000000000..ba43b6ad5 --- /dev/null +++ b/minix/drivers/hid/Makefile @@ -0,0 +1,7 @@ +.include + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= pckbd +.endif # ${MACHINE_ARCH} == "i386" + +.include diff --git a/minix/drivers/hid/Makefile.inc b/minix/drivers/hid/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/hid/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/pckbd/Makefile b/minix/drivers/hid/pckbd/Makefile similarity index 100% rename from drivers/pckbd/Makefile rename to minix/drivers/hid/pckbd/Makefile diff --git a/drivers/pckbd/pckbd.c b/minix/drivers/hid/pckbd/pckbd.c similarity index 100% rename from drivers/pckbd/pckbd.c rename to minix/drivers/hid/pckbd/pckbd.c diff --git a/drivers/pckbd/pckbd.h b/minix/drivers/hid/pckbd/pckbd.h similarity index 100% rename from drivers/pckbd/pckbd.h rename to minix/drivers/hid/pckbd/pckbd.h diff --git a/drivers/pckbd/table.c b/minix/drivers/hid/pckbd/table.c similarity index 100% rename from drivers/pckbd/table.c rename to minix/drivers/hid/pckbd/table.c diff --git a/minix/drivers/iommu/Makefile b/minix/drivers/iommu/Makefile new file mode 100644 index 000000000..7377a0d8e --- /dev/null +++ b/minix/drivers/iommu/Makefile @@ -0,0 +1,7 @@ +.include + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= amddev +.endif # ${MACHINE_ARCH} == "i386" + +.include diff --git a/minix/drivers/iommu/Makefile.inc b/minix/drivers/iommu/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/iommu/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/amddev/Makefile b/minix/drivers/iommu/amddev/Makefile similarity index 81% rename from drivers/amddev/Makefile rename to minix/drivers/iommu/amddev/Makefile index c5ab636ed..f40e80e22 100644 --- a/drivers/amddev/Makefile +++ b/minix/drivers/iommu/amddev/Makefile @@ -5,8 +5,4 @@ SRCS= amddev.c DPADD+= ${LIBSYS} LDADD+= -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/amddev/amddev.c b/minix/drivers/iommu/amddev/amddev.c similarity index 100% rename from drivers/amddev/amddev.c rename to minix/drivers/iommu/amddev/amddev.c diff --git a/minix/drivers/net/Makefile b/minix/drivers/net/Makefile new file mode 100644 index 000000000..069ab5c19 --- /dev/null +++ b/minix/drivers/net/Makefile @@ -0,0 +1,23 @@ +.include + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= atl2 +SUBDIR+= dec21140A +SUBDIR+= dp8390 +SUBDIR+= dpeth +SUBDIR+= e1000 +SUBDIR+= fxp +SUBDIR+= lance +SUBDIR+= orinoco +SUBDIR+= rtl8139 +SUBDIR+= rtl8169 +SUBDIR+= virtio_net +.endif # ${MACHINE_ARCH} == "i386" + +.if ${MACHINE_ARCH} == "earm" +SUBDIR+= lan8710a +.endif # ${MACHINE_ARCH} == "earm" + +SUBDIR+= uds + +.include diff --git a/minix/drivers/net/Makefile.inc b/minix/drivers/net/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/net/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/atl2/Makefile b/minix/drivers/net/atl2/Makefile similarity index 90% rename from drivers/atl2/Makefile rename to minix/drivers/net/atl2/Makefile index 22d8d492f..c28b97ebb 100644 --- a/drivers/atl2/Makefile +++ b/minix/drivers/net/atl2/Makefile @@ -9,8 +9,4 @@ FILESDIR= /etc/system.conf.d DPADD+= ${LIBNETDRIVER} ${LIBSYS} LDADD+= -lnetdriver -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/atl2/atl2.c b/minix/drivers/net/atl2/atl2.c similarity index 100% rename from drivers/atl2/atl2.c rename to minix/drivers/net/atl2/atl2.c diff --git a/drivers/atl2/atl2.conf b/minix/drivers/net/atl2/atl2.conf similarity index 100% rename from drivers/atl2/atl2.conf rename to minix/drivers/net/atl2/atl2.conf diff --git a/drivers/atl2/atl2.h b/minix/drivers/net/atl2/atl2.h similarity index 100% rename from drivers/atl2/atl2.h rename to minix/drivers/net/atl2/atl2.h diff --git a/drivers/dec21140A/Makefile b/minix/drivers/net/dec21140A/Makefile similarity index 61% rename from drivers/dec21140A/Makefile rename to minix/drivers/net/dec21140A/Makefile index eb7997f45..c78d80fe3 100644 --- a/drivers/dec21140A/Makefile +++ b/minix/drivers/net/dec21140A/Makefile @@ -1,6 +1,4 @@ -## -## Makefile for Dec21140A ethernet board driver -## +# Makefile for Dec21140A ethernet board driver PROG= dec21140A SRCS= dec21140A.c @@ -11,11 +9,6 @@ FILESDIR= /etc/system.conf.d DPADD+= ${LIBNETDRIVER} ${LIBSYS} LDADD+= -lnetdriver -lsys -MAN= - -BINDIR?= /usr/sbin - -debug= 0 -CPPFLAGS+= -Ddebug=${debug} +CPPFLAGS+= -Ddebug=0 .include diff --git a/drivers/dec21140A/README.txt b/minix/drivers/net/dec21140A/README.txt similarity index 100% rename from drivers/dec21140A/README.txt rename to minix/drivers/net/dec21140A/README.txt diff --git a/drivers/dec21140A/dec21140A.c b/minix/drivers/net/dec21140A/dec21140A.c similarity index 100% rename from drivers/dec21140A/dec21140A.c rename to minix/drivers/net/dec21140A/dec21140A.c diff --git a/drivers/dec21140A/dec21140A.conf b/minix/drivers/net/dec21140A/dec21140A.conf similarity index 100% rename from drivers/dec21140A/dec21140A.conf rename to minix/drivers/net/dec21140A/dec21140A.conf diff --git a/drivers/dec21140A/dec21140A.h b/minix/drivers/net/dec21140A/dec21140A.h similarity index 100% rename from drivers/dec21140A/dec21140A.h rename to minix/drivers/net/dec21140A/dec21140A.h diff --git a/drivers/dp8390/3c503.c b/minix/drivers/net/dp8390/3c503.c similarity index 100% rename from drivers/dp8390/3c503.c rename to minix/drivers/net/dp8390/3c503.c diff --git a/drivers/dp8390/3c503.h b/minix/drivers/net/dp8390/3c503.h similarity index 100% rename from drivers/dp8390/3c503.h rename to minix/drivers/net/dp8390/3c503.h diff --git a/drivers/dp8390/Makefile b/minix/drivers/net/dp8390/Makefile similarity index 88% rename from drivers/dp8390/Makefile rename to minix/drivers/net/dp8390/Makefile index 81be544de..0fcbcc86d 100644 --- a/drivers/dp8390/Makefile +++ b/minix/drivers/net/dp8390/Makefile @@ -5,8 +5,4 @@ SRCS= 3c503.c dp8390.c ne2000.c rtl8029.c wdeth.c DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lnetdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/dp8390/dp8390.c b/minix/drivers/net/dp8390/dp8390.c similarity index 100% rename from drivers/dp8390/dp8390.c rename to minix/drivers/net/dp8390/dp8390.c diff --git a/drivers/dp8390/dp8390.h b/minix/drivers/net/dp8390/dp8390.h similarity index 100% rename from drivers/dp8390/dp8390.h rename to minix/drivers/net/dp8390/dp8390.h diff --git a/drivers/dp8390/local.h b/minix/drivers/net/dp8390/local.h similarity index 100% rename from drivers/dp8390/local.h rename to minix/drivers/net/dp8390/local.h diff --git a/drivers/dp8390/ne2000.c b/minix/drivers/net/dp8390/ne2000.c similarity index 100% rename from drivers/dp8390/ne2000.c rename to minix/drivers/net/dp8390/ne2000.c diff --git a/drivers/dp8390/ne2000.h b/minix/drivers/net/dp8390/ne2000.h similarity index 100% rename from drivers/dp8390/ne2000.h rename to minix/drivers/net/dp8390/ne2000.h diff --git a/drivers/dp8390/rtl8029.c b/minix/drivers/net/dp8390/rtl8029.c similarity index 100% rename from drivers/dp8390/rtl8029.c rename to minix/drivers/net/dp8390/rtl8029.c diff --git a/drivers/dp8390/rtl8029.h b/minix/drivers/net/dp8390/rtl8029.h similarity index 100% rename from drivers/dp8390/rtl8029.h rename to minix/drivers/net/dp8390/rtl8029.h diff --git a/drivers/dp8390/wdeth.c b/minix/drivers/net/dp8390/wdeth.c similarity index 100% rename from drivers/dp8390/wdeth.c rename to minix/drivers/net/dp8390/wdeth.c diff --git a/drivers/dp8390/wdeth.h b/minix/drivers/net/dp8390/wdeth.h similarity index 100% rename from drivers/dp8390/wdeth.h rename to minix/drivers/net/dp8390/wdeth.h diff --git a/drivers/dpeth/3c501.c b/minix/drivers/net/dpeth/3c501.c similarity index 100% rename from drivers/dpeth/3c501.c rename to minix/drivers/net/dpeth/3c501.c diff --git a/drivers/dpeth/3c501.h b/minix/drivers/net/dpeth/3c501.h similarity index 100% rename from drivers/dpeth/3c501.h rename to minix/drivers/net/dpeth/3c501.h diff --git a/drivers/dpeth/3c503.c b/minix/drivers/net/dpeth/3c503.c similarity index 100% rename from drivers/dpeth/3c503.c rename to minix/drivers/net/dpeth/3c503.c diff --git a/drivers/dpeth/3c503.h b/minix/drivers/net/dpeth/3c503.h similarity index 100% rename from drivers/dpeth/3c503.h rename to minix/drivers/net/dpeth/3c503.h diff --git a/drivers/dpeth/3c509.c b/minix/drivers/net/dpeth/3c509.c similarity index 100% rename from drivers/dpeth/3c509.c rename to minix/drivers/net/dpeth/3c509.c diff --git a/drivers/dpeth/3c509.h b/minix/drivers/net/dpeth/3c509.h similarity index 100% rename from drivers/dpeth/3c509.h rename to minix/drivers/net/dpeth/3c509.h diff --git a/drivers/dpeth/8390.c b/minix/drivers/net/dpeth/8390.c similarity index 100% rename from drivers/dpeth/8390.c rename to minix/drivers/net/dpeth/8390.c diff --git a/drivers/dpeth/8390.h b/minix/drivers/net/dpeth/8390.h similarity index 100% rename from drivers/dpeth/8390.h rename to minix/drivers/net/dpeth/8390.h diff --git a/drivers/dpeth/Makefile b/minix/drivers/net/dpeth/Makefile similarity index 58% rename from drivers/dpeth/Makefile rename to minix/drivers/net/dpeth/Makefile index fe1c3127f..9c3d2ed15 100644 --- a/drivers/dpeth/Makefile +++ b/minix/drivers/net/dpeth/Makefile @@ -1,17 +1,10 @@ -## -## Makefile for ISA ethernet drivers May 02, 2000 -## +# Makefile for ISA ethernet drivers May 02, 2000 PROG= dpeth SRCS= 3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c DPADD+= ${LIBNETDRIVER} ${LIBSYS} LDADD+= -lnetdriver -lsys -MAN= - -BINDIR?= /usr/sbin - -debug= 0 -CPPFLAGS+= -Ddebug=$(debug) +CPPFLAGS+= -Ddebug=0 .include diff --git a/drivers/dpeth/README b/minix/drivers/net/dpeth/README similarity index 100% rename from drivers/dpeth/README rename to minix/drivers/net/dpeth/README diff --git a/drivers/dpeth/devio.c b/minix/drivers/net/dpeth/devio.c similarity index 100% rename from drivers/dpeth/devio.c rename to minix/drivers/net/dpeth/devio.c diff --git a/drivers/dpeth/dp.c b/minix/drivers/net/dpeth/dp.c similarity index 100% rename from drivers/dpeth/dp.c rename to minix/drivers/net/dpeth/dp.c diff --git a/drivers/dpeth/dp.h b/minix/drivers/net/dpeth/dp.h similarity index 100% rename from drivers/dpeth/dp.h rename to minix/drivers/net/dpeth/dp.h diff --git a/drivers/dpeth/ne.c b/minix/drivers/net/dpeth/ne.c similarity index 100% rename from drivers/dpeth/ne.c rename to minix/drivers/net/dpeth/ne.c diff --git a/drivers/dpeth/ne.h b/minix/drivers/net/dpeth/ne.h similarity index 100% rename from drivers/dpeth/ne.h rename to minix/drivers/net/dpeth/ne.h diff --git a/drivers/dpeth/netbuff.c b/minix/drivers/net/dpeth/netbuff.c similarity index 100% rename from drivers/dpeth/netbuff.c rename to minix/drivers/net/dpeth/netbuff.c diff --git a/drivers/dpeth/wd.c b/minix/drivers/net/dpeth/wd.c similarity index 100% rename from drivers/dpeth/wd.c rename to minix/drivers/net/dpeth/wd.c diff --git a/drivers/dpeth/wd.h b/minix/drivers/net/dpeth/wd.h similarity index 100% rename from drivers/dpeth/wd.h rename to minix/drivers/net/dpeth/wd.h diff --git a/drivers/e1000/Makefile b/minix/drivers/net/e1000/Makefile similarity index 89% rename from drivers/e1000/Makefile rename to minix/drivers/net/e1000/Makefile index aff128209..a21331d34 100644 --- a/drivers/e1000/Makefile +++ b/minix/drivers/net/e1000/Makefile @@ -1,6 +1,4 @@ -# # Makefile for the Intel Pro/1000 driver. -# PROG= e1000 SRCS= e1000.c @@ -11,8 +9,4 @@ FILESDIR= /etc/system.conf.d DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lnetdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/e1000/e1000.c b/minix/drivers/net/e1000/e1000.c similarity index 100% rename from drivers/e1000/e1000.c rename to minix/drivers/net/e1000/e1000.c diff --git a/drivers/e1000/e1000.conf b/minix/drivers/net/e1000/e1000.conf similarity index 100% rename from drivers/e1000/e1000.conf rename to minix/drivers/net/e1000/e1000.conf diff --git a/drivers/e1000/e1000.h b/minix/drivers/net/e1000/e1000.h similarity index 100% rename from drivers/e1000/e1000.h rename to minix/drivers/net/e1000/e1000.h diff --git a/drivers/e1000/e1000_hw.h b/minix/drivers/net/e1000/e1000_hw.h similarity index 100% rename from drivers/e1000/e1000_hw.h rename to minix/drivers/net/e1000/e1000_hw.h diff --git a/drivers/e1000/e1000_pci.h b/minix/drivers/net/e1000/e1000_pci.h similarity index 100% rename from drivers/e1000/e1000_pci.h rename to minix/drivers/net/e1000/e1000_pci.h diff --git a/drivers/e1000/e1000_reg.h b/minix/drivers/net/e1000/e1000_reg.h similarity index 100% rename from drivers/e1000/e1000_reg.h rename to minix/drivers/net/e1000/e1000_reg.h diff --git a/drivers/fxp/Makefile b/minix/drivers/net/fxp/Makefile similarity index 90% rename from drivers/fxp/Makefile rename to minix/drivers/net/fxp/Makefile index 643c79390..48cd2a49e 100644 --- a/drivers/fxp/Makefile +++ b/minix/drivers/net/fxp/Makefile @@ -9,8 +9,4 @@ FILESDIR= /etc/system.conf.d DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lnetdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/fxp/fxp.c b/minix/drivers/net/fxp/fxp.c similarity index 100% rename from drivers/fxp/fxp.c rename to minix/drivers/net/fxp/fxp.c diff --git a/drivers/fxp/fxp.conf b/minix/drivers/net/fxp/fxp.conf similarity index 100% rename from drivers/fxp/fxp.conf rename to minix/drivers/net/fxp/fxp.conf diff --git a/drivers/fxp/fxp.h b/minix/drivers/net/fxp/fxp.h similarity index 100% rename from drivers/fxp/fxp.h rename to minix/drivers/net/fxp/fxp.h diff --git a/drivers/fxp/mii.c b/minix/drivers/net/fxp/mii.c similarity index 100% rename from drivers/fxp/mii.c rename to minix/drivers/net/fxp/mii.c diff --git a/drivers/fxp/mii.h b/minix/drivers/net/fxp/mii.h similarity index 100% rename from drivers/fxp/mii.h rename to minix/drivers/net/fxp/mii.h diff --git a/drivers/lan8710a/Makefile b/minix/drivers/net/lan8710a/Makefile similarity index 81% rename from drivers/lan8710a/Makefile rename to minix/drivers/net/lan8710a/Makefile index 8e5a932cf..79d790d5e 100644 --- a/drivers/lan8710a/Makefile +++ b/minix/drivers/net/lan8710a/Makefile @@ -9,8 +9,4 @@ FILESDIR= /etc/system.conf.d DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lnetdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - -.include \ No newline at end of file +.include diff --git a/drivers/lan8710a/README.txt b/minix/drivers/net/lan8710a/README.txt similarity index 100% rename from drivers/lan8710a/README.txt rename to minix/drivers/net/lan8710a/README.txt diff --git a/drivers/lan8710a/lan8710a.c b/minix/drivers/net/lan8710a/lan8710a.c similarity index 100% rename from drivers/lan8710a/lan8710a.c rename to minix/drivers/net/lan8710a/lan8710a.c diff --git a/drivers/lan8710a/lan8710a.conf b/minix/drivers/net/lan8710a/lan8710a.conf similarity index 100% rename from drivers/lan8710a/lan8710a.conf rename to minix/drivers/net/lan8710a/lan8710a.conf diff --git a/drivers/lan8710a/lan8710a.h b/minix/drivers/net/lan8710a/lan8710a.h similarity index 100% rename from drivers/lan8710a/lan8710a.h rename to minix/drivers/net/lan8710a/lan8710a.h diff --git a/drivers/lan8710a/lan8710a_reg.h b/minix/drivers/net/lan8710a/lan8710a_reg.h similarity index 100% rename from drivers/lan8710a/lan8710a_reg.h rename to minix/drivers/net/lan8710a/lan8710a_reg.h diff --git a/drivers/lance/Makefile b/minix/drivers/net/lance/Makefile similarity index 89% rename from drivers/lance/Makefile rename to minix/drivers/net/lance/Makefile index 46f8e2ac1..b8e9deaf0 100644 --- a/drivers/lance/Makefile +++ b/minix/drivers/net/lance/Makefile @@ -9,8 +9,4 @@ FILESDIR= /etc/system.conf.d DPADD+= ${LIBNETDRIVER} ${LIBSYS} LDADD+= -lnetdriver -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/lance/lance.c b/minix/drivers/net/lance/lance.c similarity index 100% rename from drivers/lance/lance.c rename to minix/drivers/net/lance/lance.c diff --git a/drivers/lance/lance.conf b/minix/drivers/net/lance/lance.conf similarity index 100% rename from drivers/lance/lance.conf rename to minix/drivers/net/lance/lance.conf diff --git a/drivers/lance/lance.h b/minix/drivers/net/lance/lance.h similarity index 100% rename from drivers/lance/lance.h rename to minix/drivers/net/lance/lance.h diff --git a/drivers/orinoco/INSTALL.txt b/minix/drivers/net/orinoco/INSTALL.txt similarity index 100% rename from drivers/orinoco/INSTALL.txt rename to minix/drivers/net/orinoco/INSTALL.txt diff --git a/drivers/orinoco/Makefile b/minix/drivers/net/orinoco/Makefile similarity index 76% rename from drivers/orinoco/Makefile rename to minix/drivers/net/orinoco/Makefile index fbd4da616..172e7d319 100644 --- a/drivers/orinoco/Makefile +++ b/minix/drivers/net/orinoco/Makefile @@ -5,10 +5,6 @@ SRCS= orinoco.c hermes.c DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lnetdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - -CPPFLAGS.orinoco.c+= -I${NETBSDSRCDIR} +CPPFLAGS.orinoco.c+= -I${NETBSDSRCDIR}/minix .include diff --git a/drivers/orinoco/hermes.c b/minix/drivers/net/orinoco/hermes.c similarity index 100% rename from drivers/orinoco/hermes.c rename to minix/drivers/net/orinoco/hermes.c diff --git a/drivers/orinoco/hermes.h b/minix/drivers/net/orinoco/hermes.h similarity index 100% rename from drivers/orinoco/hermes.h rename to minix/drivers/net/orinoco/hermes.h diff --git a/drivers/orinoco/hermes_rid.h b/minix/drivers/net/orinoco/hermes_rid.h similarity index 100% rename from drivers/orinoco/hermes_rid.h rename to minix/drivers/net/orinoco/hermes_rid.h diff --git a/drivers/orinoco/orinoco.c b/minix/drivers/net/orinoco/orinoco.c similarity index 100% rename from drivers/orinoco/orinoco.c rename to minix/drivers/net/orinoco/orinoco.c diff --git a/drivers/orinoco/orinoco.h b/minix/drivers/net/orinoco/orinoco.h similarity index 100% rename from drivers/orinoco/orinoco.h rename to minix/drivers/net/orinoco/orinoco.h diff --git a/drivers/rtl8139/Makefile b/minix/drivers/net/rtl8139/Makefile similarity index 83% rename from drivers/rtl8139/Makefile rename to minix/drivers/net/rtl8139/Makefile index e7d38ec7a..0cb21b28a 100644 --- a/drivers/rtl8139/Makefile +++ b/minix/drivers/net/rtl8139/Makefile @@ -9,10 +9,6 @@ FILESDIR= /etc/system.conf.d DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lnetdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - -CPPFLAGS+= -I${NETBSDSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR}/minix .include diff --git a/drivers/rtl8139/liveupdate.c b/minix/drivers/net/rtl8139/liveupdate.c similarity index 100% rename from drivers/rtl8139/liveupdate.c rename to minix/drivers/net/rtl8139/liveupdate.c diff --git a/drivers/rtl8139/rtl8139.c b/minix/drivers/net/rtl8139/rtl8139.c similarity index 100% rename from drivers/rtl8139/rtl8139.c rename to minix/drivers/net/rtl8139/rtl8139.c diff --git a/drivers/rtl8139/rtl8139.conf b/minix/drivers/net/rtl8139/rtl8139.conf similarity index 100% rename from drivers/rtl8139/rtl8139.conf rename to minix/drivers/net/rtl8139/rtl8139.conf diff --git a/drivers/rtl8139/rtl8139.h b/minix/drivers/net/rtl8139/rtl8139.h similarity index 100% rename from drivers/rtl8139/rtl8139.h rename to minix/drivers/net/rtl8139/rtl8139.h diff --git a/drivers/rtl8169/Makefile b/minix/drivers/net/rtl8169/Makefile similarity index 83% rename from drivers/rtl8169/Makefile rename to minix/drivers/net/rtl8169/Makefile index 81729b4b4..e45e7843f 100644 --- a/drivers/rtl8169/Makefile +++ b/minix/drivers/net/rtl8169/Makefile @@ -9,10 +9,6 @@ FILESDIR= /etc/system.conf.d DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lnetdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - -CPPFLAGS+= -I${NETBSDSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR}/minix .include diff --git a/drivers/rtl8169/rtl8169.c b/minix/drivers/net/rtl8169/rtl8169.c similarity index 100% rename from drivers/rtl8169/rtl8169.c rename to minix/drivers/net/rtl8169/rtl8169.c diff --git a/drivers/rtl8169/rtl8169.conf b/minix/drivers/net/rtl8169/rtl8169.conf similarity index 100% rename from drivers/rtl8169/rtl8169.conf rename to minix/drivers/net/rtl8169/rtl8169.conf diff --git a/drivers/rtl8169/rtl8169.h b/minix/drivers/net/rtl8169/rtl8169.h similarity index 100% rename from drivers/rtl8169/rtl8169.h rename to minix/drivers/net/rtl8169/rtl8169.h diff --git a/drivers/uds/Makefile b/minix/drivers/net/uds/Makefile similarity index 87% rename from drivers/uds/Makefile rename to minix/drivers/net/uds/Makefile index 8f339297d..5588b7de6 100644 --- a/drivers/uds/Makefile +++ b/minix/drivers/net/uds/Makefile @@ -5,8 +5,4 @@ SRCS= uds.c ioc_uds.c DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/uds/ioc_uds.c b/minix/drivers/net/uds/ioc_uds.c similarity index 100% rename from drivers/uds/ioc_uds.c rename to minix/drivers/net/uds/ioc_uds.c diff --git a/drivers/uds/uds.c b/minix/drivers/net/uds/uds.c similarity index 100% rename from drivers/uds/uds.c rename to minix/drivers/net/uds/uds.c diff --git a/drivers/uds/uds.h b/minix/drivers/net/uds/uds.h similarity index 100% rename from drivers/uds/uds.h rename to minix/drivers/net/uds/uds.h diff --git a/drivers/virtio_net/Makefile b/minix/drivers/net/virtio_net/Makefile similarity index 88% rename from drivers/virtio_net/Makefile rename to minix/drivers/net/virtio_net/Makefile index bc2f15017..9896e5822 100644 --- a/drivers/virtio_net/Makefile +++ b/minix/drivers/net/virtio_net/Makefile @@ -1,6 +1,4 @@ -# # Makefile for virtio_net -# PROG= virtio_net SRCS= virtio_net.c @@ -11,8 +9,4 @@ FILESDIR= /etc/system.conf.d DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBVIRTIO} LDADD+= -lnetdriver -lsys -lvirtio -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/virtio_net/virtio_net.c b/minix/drivers/net/virtio_net/virtio_net.c similarity index 100% rename from drivers/virtio_net/virtio_net.c rename to minix/drivers/net/virtio_net/virtio_net.c diff --git a/drivers/virtio_net/virtio_net.conf b/minix/drivers/net/virtio_net/virtio_net.conf similarity index 100% rename from drivers/virtio_net/virtio_net.conf rename to minix/drivers/net/virtio_net/virtio_net.conf diff --git a/drivers/virtio_net/virtio_net.h b/minix/drivers/net/virtio_net/virtio_net.h similarity index 100% rename from drivers/virtio_net/virtio_net.h rename to minix/drivers/net/virtio_net/virtio_net.h diff --git a/minix/drivers/power/Makefile b/minix/drivers/power/Makefile new file mode 100644 index 000000000..f33853130 --- /dev/null +++ b/minix/drivers/power/Makefile @@ -0,0 +1,12 @@ +.include + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= acpi +.endif # ${MACHINE_ARCH} == "i386" + +.if ${MACHINE_ARCH} == "earm" +SUBDIR+= tps65217 +SUBDIR+= tps65950 +.endif # ${MACHINE_ARCH} == "earm" + +.include diff --git a/minix/drivers/power/Makefile.inc b/minix/drivers/power/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/power/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/acpi/Makefile b/minix/drivers/power/acpi/Makefile similarity index 98% rename from drivers/acpi/Makefile rename to minix/drivers/power/acpi/Makefile index 912265e34..cd6990d7e 100644 --- a/drivers/acpi/Makefile +++ b/minix/drivers/power/acpi/Makefile @@ -140,8 +140,4 @@ CPPFLAGS += -I${.CURDIR}/include CFLAGS += -DACPI_LIBRARY CFLAGS += -std=c99 -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/acpi/acpi.c b/minix/drivers/power/acpi/acpi.c similarity index 100% rename from drivers/acpi/acpi.c rename to minix/drivers/power/acpi/acpi.c diff --git a/drivers/acpi/acpi_globals.h b/minix/drivers/power/acpi/acpi_globals.h similarity index 100% rename from drivers/acpi/acpi_globals.h rename to minix/drivers/power/acpi/acpi_globals.h diff --git a/drivers/acpi/dispatcher/dsfield.c b/minix/drivers/power/acpi/dispatcher/dsfield.c similarity index 100% rename from drivers/acpi/dispatcher/dsfield.c rename to minix/drivers/power/acpi/dispatcher/dsfield.c diff --git a/drivers/acpi/dispatcher/dsinit.c b/minix/drivers/power/acpi/dispatcher/dsinit.c similarity index 100% rename from drivers/acpi/dispatcher/dsinit.c rename to minix/drivers/power/acpi/dispatcher/dsinit.c diff --git a/drivers/acpi/dispatcher/dsmethod.c b/minix/drivers/power/acpi/dispatcher/dsmethod.c similarity index 100% rename from drivers/acpi/dispatcher/dsmethod.c rename to minix/drivers/power/acpi/dispatcher/dsmethod.c diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/minix/drivers/power/acpi/dispatcher/dsmthdat.c similarity index 100% rename from drivers/acpi/dispatcher/dsmthdat.c rename to minix/drivers/power/acpi/dispatcher/dsmthdat.c diff --git a/drivers/acpi/dispatcher/dsobject.c b/minix/drivers/power/acpi/dispatcher/dsobject.c similarity index 100% rename from drivers/acpi/dispatcher/dsobject.c rename to minix/drivers/power/acpi/dispatcher/dsobject.c diff --git a/drivers/acpi/dispatcher/dsopcode.c b/minix/drivers/power/acpi/dispatcher/dsopcode.c similarity index 100% rename from drivers/acpi/dispatcher/dsopcode.c rename to minix/drivers/power/acpi/dispatcher/dsopcode.c diff --git a/drivers/acpi/dispatcher/dsutils.c b/minix/drivers/power/acpi/dispatcher/dsutils.c similarity index 100% rename from drivers/acpi/dispatcher/dsutils.c rename to minix/drivers/power/acpi/dispatcher/dsutils.c diff --git a/drivers/acpi/dispatcher/dswexec.c b/minix/drivers/power/acpi/dispatcher/dswexec.c similarity index 100% rename from drivers/acpi/dispatcher/dswexec.c rename to minix/drivers/power/acpi/dispatcher/dswexec.c diff --git a/drivers/acpi/dispatcher/dswload.c b/minix/drivers/power/acpi/dispatcher/dswload.c similarity index 100% rename from drivers/acpi/dispatcher/dswload.c rename to minix/drivers/power/acpi/dispatcher/dswload.c diff --git a/drivers/acpi/dispatcher/dswscope.c b/minix/drivers/power/acpi/dispatcher/dswscope.c similarity index 100% rename from drivers/acpi/dispatcher/dswscope.c rename to minix/drivers/power/acpi/dispatcher/dswscope.c diff --git a/drivers/acpi/dispatcher/dswstate.c b/minix/drivers/power/acpi/dispatcher/dswstate.c similarity index 100% rename from drivers/acpi/dispatcher/dswstate.c rename to minix/drivers/power/acpi/dispatcher/dswstate.c diff --git a/drivers/acpi/events/evevent.c b/minix/drivers/power/acpi/events/evevent.c similarity index 100% rename from drivers/acpi/events/evevent.c rename to minix/drivers/power/acpi/events/evevent.c diff --git a/drivers/acpi/events/evgpe.c b/minix/drivers/power/acpi/events/evgpe.c similarity index 100% rename from drivers/acpi/events/evgpe.c rename to minix/drivers/power/acpi/events/evgpe.c diff --git a/drivers/acpi/events/evgpeblk.c b/minix/drivers/power/acpi/events/evgpeblk.c similarity index 100% rename from drivers/acpi/events/evgpeblk.c rename to minix/drivers/power/acpi/events/evgpeblk.c diff --git a/drivers/acpi/events/evgpeinit.c b/minix/drivers/power/acpi/events/evgpeinit.c similarity index 100% rename from drivers/acpi/events/evgpeinit.c rename to minix/drivers/power/acpi/events/evgpeinit.c diff --git a/drivers/acpi/events/evgpeutil.c b/minix/drivers/power/acpi/events/evgpeutil.c similarity index 100% rename from drivers/acpi/events/evgpeutil.c rename to minix/drivers/power/acpi/events/evgpeutil.c diff --git a/drivers/acpi/events/evmisc.c b/minix/drivers/power/acpi/events/evmisc.c similarity index 100% rename from drivers/acpi/events/evmisc.c rename to minix/drivers/power/acpi/events/evmisc.c diff --git a/drivers/acpi/events/evregion.c b/minix/drivers/power/acpi/events/evregion.c similarity index 100% rename from drivers/acpi/events/evregion.c rename to minix/drivers/power/acpi/events/evregion.c diff --git a/drivers/acpi/events/evrgnini.c b/minix/drivers/power/acpi/events/evrgnini.c similarity index 100% rename from drivers/acpi/events/evrgnini.c rename to minix/drivers/power/acpi/events/evrgnini.c diff --git a/drivers/acpi/events/evsci.c b/minix/drivers/power/acpi/events/evsci.c similarity index 100% rename from drivers/acpi/events/evsci.c rename to minix/drivers/power/acpi/events/evsci.c diff --git a/drivers/acpi/events/evxface.c b/minix/drivers/power/acpi/events/evxface.c similarity index 100% rename from drivers/acpi/events/evxface.c rename to minix/drivers/power/acpi/events/evxface.c diff --git a/drivers/acpi/events/evxfevnt.c b/minix/drivers/power/acpi/events/evxfevnt.c similarity index 100% rename from drivers/acpi/events/evxfevnt.c rename to minix/drivers/power/acpi/events/evxfevnt.c diff --git a/drivers/acpi/events/evxfregn.c b/minix/drivers/power/acpi/events/evxfregn.c similarity index 100% rename from drivers/acpi/events/evxfregn.c rename to minix/drivers/power/acpi/events/evxfregn.c diff --git a/drivers/acpi/executer/exconfig.c b/minix/drivers/power/acpi/executer/exconfig.c similarity index 100% rename from drivers/acpi/executer/exconfig.c rename to minix/drivers/power/acpi/executer/exconfig.c diff --git a/drivers/acpi/executer/exconvrt.c b/minix/drivers/power/acpi/executer/exconvrt.c similarity index 100% rename from drivers/acpi/executer/exconvrt.c rename to minix/drivers/power/acpi/executer/exconvrt.c diff --git a/drivers/acpi/executer/excreate.c b/minix/drivers/power/acpi/executer/excreate.c similarity index 100% rename from drivers/acpi/executer/excreate.c rename to minix/drivers/power/acpi/executer/excreate.c diff --git a/drivers/acpi/executer/exdebug.c b/minix/drivers/power/acpi/executer/exdebug.c similarity index 100% rename from drivers/acpi/executer/exdebug.c rename to minix/drivers/power/acpi/executer/exdebug.c diff --git a/drivers/acpi/executer/exdump.c b/minix/drivers/power/acpi/executer/exdump.c similarity index 100% rename from drivers/acpi/executer/exdump.c rename to minix/drivers/power/acpi/executer/exdump.c diff --git a/drivers/acpi/executer/exfield.c b/minix/drivers/power/acpi/executer/exfield.c similarity index 100% rename from drivers/acpi/executer/exfield.c rename to minix/drivers/power/acpi/executer/exfield.c diff --git a/drivers/acpi/executer/exfldio.c b/minix/drivers/power/acpi/executer/exfldio.c similarity index 100% rename from drivers/acpi/executer/exfldio.c rename to minix/drivers/power/acpi/executer/exfldio.c diff --git a/drivers/acpi/executer/exmisc.c b/minix/drivers/power/acpi/executer/exmisc.c similarity index 100% rename from drivers/acpi/executer/exmisc.c rename to minix/drivers/power/acpi/executer/exmisc.c diff --git a/drivers/acpi/executer/exmutex.c b/minix/drivers/power/acpi/executer/exmutex.c similarity index 100% rename from drivers/acpi/executer/exmutex.c rename to minix/drivers/power/acpi/executer/exmutex.c diff --git a/drivers/acpi/executer/exnames.c b/minix/drivers/power/acpi/executer/exnames.c similarity index 100% rename from drivers/acpi/executer/exnames.c rename to minix/drivers/power/acpi/executer/exnames.c diff --git a/drivers/acpi/executer/exoparg1.c b/minix/drivers/power/acpi/executer/exoparg1.c similarity index 100% rename from drivers/acpi/executer/exoparg1.c rename to minix/drivers/power/acpi/executer/exoparg1.c diff --git a/drivers/acpi/executer/exoparg2.c b/minix/drivers/power/acpi/executer/exoparg2.c similarity index 100% rename from drivers/acpi/executer/exoparg2.c rename to minix/drivers/power/acpi/executer/exoparg2.c diff --git a/drivers/acpi/executer/exoparg3.c b/minix/drivers/power/acpi/executer/exoparg3.c similarity index 100% rename from drivers/acpi/executer/exoparg3.c rename to minix/drivers/power/acpi/executer/exoparg3.c diff --git a/drivers/acpi/executer/exoparg6.c b/minix/drivers/power/acpi/executer/exoparg6.c similarity index 100% rename from drivers/acpi/executer/exoparg6.c rename to minix/drivers/power/acpi/executer/exoparg6.c diff --git a/drivers/acpi/executer/exprep.c b/minix/drivers/power/acpi/executer/exprep.c similarity index 100% rename from drivers/acpi/executer/exprep.c rename to minix/drivers/power/acpi/executer/exprep.c diff --git a/drivers/acpi/executer/exregion.c b/minix/drivers/power/acpi/executer/exregion.c similarity index 100% rename from drivers/acpi/executer/exregion.c rename to minix/drivers/power/acpi/executer/exregion.c diff --git a/drivers/acpi/executer/exresnte.c b/minix/drivers/power/acpi/executer/exresnte.c similarity index 100% rename from drivers/acpi/executer/exresnte.c rename to minix/drivers/power/acpi/executer/exresnte.c diff --git a/drivers/acpi/executer/exresolv.c b/minix/drivers/power/acpi/executer/exresolv.c similarity index 100% rename from drivers/acpi/executer/exresolv.c rename to minix/drivers/power/acpi/executer/exresolv.c diff --git a/drivers/acpi/executer/exresop.c b/minix/drivers/power/acpi/executer/exresop.c similarity index 100% rename from drivers/acpi/executer/exresop.c rename to minix/drivers/power/acpi/executer/exresop.c diff --git a/drivers/acpi/executer/exstore.c b/minix/drivers/power/acpi/executer/exstore.c similarity index 100% rename from drivers/acpi/executer/exstore.c rename to minix/drivers/power/acpi/executer/exstore.c diff --git a/drivers/acpi/executer/exstoren.c b/minix/drivers/power/acpi/executer/exstoren.c similarity index 100% rename from drivers/acpi/executer/exstoren.c rename to minix/drivers/power/acpi/executer/exstoren.c diff --git a/drivers/acpi/executer/exstorob.c b/minix/drivers/power/acpi/executer/exstorob.c similarity index 100% rename from drivers/acpi/executer/exstorob.c rename to minix/drivers/power/acpi/executer/exstorob.c diff --git a/drivers/acpi/executer/exsystem.c b/minix/drivers/power/acpi/executer/exsystem.c similarity index 100% rename from drivers/acpi/executer/exsystem.c rename to minix/drivers/power/acpi/executer/exsystem.c diff --git a/drivers/acpi/executer/exutils.c b/minix/drivers/power/acpi/executer/exutils.c similarity index 100% rename from drivers/acpi/executer/exutils.c rename to minix/drivers/power/acpi/executer/exutils.c diff --git a/drivers/acpi/hardware/hwacpi.c b/minix/drivers/power/acpi/hardware/hwacpi.c similarity index 100% rename from drivers/acpi/hardware/hwacpi.c rename to minix/drivers/power/acpi/hardware/hwacpi.c diff --git a/drivers/acpi/hardware/hwgpe.c b/minix/drivers/power/acpi/hardware/hwgpe.c similarity index 100% rename from drivers/acpi/hardware/hwgpe.c rename to minix/drivers/power/acpi/hardware/hwgpe.c diff --git a/drivers/acpi/hardware/hwregs.c b/minix/drivers/power/acpi/hardware/hwregs.c similarity index 100% rename from drivers/acpi/hardware/hwregs.c rename to minix/drivers/power/acpi/hardware/hwregs.c diff --git a/drivers/acpi/hardware/hwsleep.c b/minix/drivers/power/acpi/hardware/hwsleep.c similarity index 100% rename from drivers/acpi/hardware/hwsleep.c rename to minix/drivers/power/acpi/hardware/hwsleep.c diff --git a/drivers/acpi/hardware/hwtimer.c b/minix/drivers/power/acpi/hardware/hwtimer.c similarity index 100% rename from drivers/acpi/hardware/hwtimer.c rename to minix/drivers/power/acpi/hardware/hwtimer.c diff --git a/drivers/acpi/hardware/hwvalid.c b/minix/drivers/power/acpi/hardware/hwvalid.c similarity index 100% rename from drivers/acpi/hardware/hwvalid.c rename to minix/drivers/power/acpi/hardware/hwvalid.c diff --git a/drivers/acpi/hardware/hwxface.c b/minix/drivers/power/acpi/hardware/hwxface.c similarity index 100% rename from drivers/acpi/hardware/hwxface.c rename to minix/drivers/power/acpi/hardware/hwxface.c diff --git a/drivers/acpi/include/acapps.h b/minix/drivers/power/acpi/include/acapps.h similarity index 100% rename from drivers/acpi/include/acapps.h rename to minix/drivers/power/acpi/include/acapps.h diff --git a/drivers/acpi/include/accommon.h b/minix/drivers/power/acpi/include/accommon.h similarity index 100% rename from drivers/acpi/include/accommon.h rename to minix/drivers/power/acpi/include/accommon.h diff --git a/drivers/acpi/include/acconfig.h b/minix/drivers/power/acpi/include/acconfig.h similarity index 100% rename from drivers/acpi/include/acconfig.h rename to minix/drivers/power/acpi/include/acconfig.h diff --git a/drivers/acpi/include/acdebug.h b/minix/drivers/power/acpi/include/acdebug.h similarity index 100% rename from drivers/acpi/include/acdebug.h rename to minix/drivers/power/acpi/include/acdebug.h diff --git a/drivers/acpi/include/acdisasm.h b/minix/drivers/power/acpi/include/acdisasm.h similarity index 100% rename from drivers/acpi/include/acdisasm.h rename to minix/drivers/power/acpi/include/acdisasm.h diff --git a/drivers/acpi/include/acdispat.h b/minix/drivers/power/acpi/include/acdispat.h similarity index 100% rename from drivers/acpi/include/acdispat.h rename to minix/drivers/power/acpi/include/acdispat.h diff --git a/drivers/acpi/include/acevents.h b/minix/drivers/power/acpi/include/acevents.h similarity index 100% rename from drivers/acpi/include/acevents.h rename to minix/drivers/power/acpi/include/acevents.h diff --git a/drivers/acpi/include/acexcep.h b/minix/drivers/power/acpi/include/acexcep.h similarity index 100% rename from drivers/acpi/include/acexcep.h rename to minix/drivers/power/acpi/include/acexcep.h diff --git a/drivers/acpi/include/acglobal.h b/minix/drivers/power/acpi/include/acglobal.h similarity index 100% rename from drivers/acpi/include/acglobal.h rename to minix/drivers/power/acpi/include/acglobal.h diff --git a/drivers/acpi/include/achware.h b/minix/drivers/power/acpi/include/achware.h similarity index 100% rename from drivers/acpi/include/achware.h rename to minix/drivers/power/acpi/include/achware.h diff --git a/drivers/acpi/include/acinterp.h b/minix/drivers/power/acpi/include/acinterp.h similarity index 100% rename from drivers/acpi/include/acinterp.h rename to minix/drivers/power/acpi/include/acinterp.h diff --git a/drivers/acpi/include/aclocal.h b/minix/drivers/power/acpi/include/aclocal.h similarity index 100% rename from drivers/acpi/include/aclocal.h rename to minix/drivers/power/acpi/include/aclocal.h diff --git a/drivers/acpi/include/acmacros.h b/minix/drivers/power/acpi/include/acmacros.h similarity index 100% rename from drivers/acpi/include/acmacros.h rename to minix/drivers/power/acpi/include/acmacros.h diff --git a/drivers/acpi/include/acnames.h b/minix/drivers/power/acpi/include/acnames.h similarity index 100% rename from drivers/acpi/include/acnames.h rename to minix/drivers/power/acpi/include/acnames.h diff --git a/drivers/acpi/include/acnamesp.h b/minix/drivers/power/acpi/include/acnamesp.h similarity index 100% rename from drivers/acpi/include/acnamesp.h rename to minix/drivers/power/acpi/include/acnamesp.h diff --git a/drivers/acpi/include/acobject.h b/minix/drivers/power/acpi/include/acobject.h similarity index 100% rename from drivers/acpi/include/acobject.h rename to minix/drivers/power/acpi/include/acobject.h diff --git a/drivers/acpi/include/acopcode.h b/minix/drivers/power/acpi/include/acopcode.h similarity index 100% rename from drivers/acpi/include/acopcode.h rename to minix/drivers/power/acpi/include/acopcode.h diff --git a/drivers/acpi/include/acoutput.h b/minix/drivers/power/acpi/include/acoutput.h similarity index 100% rename from drivers/acpi/include/acoutput.h rename to minix/drivers/power/acpi/include/acoutput.h diff --git a/drivers/acpi/include/acparser.h b/minix/drivers/power/acpi/include/acparser.h similarity index 100% rename from drivers/acpi/include/acparser.h rename to minix/drivers/power/acpi/include/acparser.h diff --git a/drivers/acpi/include/acpi.h b/minix/drivers/power/acpi/include/acpi.h similarity index 100% rename from drivers/acpi/include/acpi.h rename to minix/drivers/power/acpi/include/acpi.h diff --git a/drivers/acpi/include/acpiosxf.h b/minix/drivers/power/acpi/include/acpiosxf.h similarity index 100% rename from drivers/acpi/include/acpiosxf.h rename to minix/drivers/power/acpi/include/acpiosxf.h diff --git a/drivers/acpi/include/acpixf.h b/minix/drivers/power/acpi/include/acpixf.h similarity index 100% rename from drivers/acpi/include/acpixf.h rename to minix/drivers/power/acpi/include/acpixf.h diff --git a/drivers/acpi/include/acpredef.h b/minix/drivers/power/acpi/include/acpredef.h similarity index 100% rename from drivers/acpi/include/acpredef.h rename to minix/drivers/power/acpi/include/acpredef.h diff --git a/drivers/acpi/include/acresrc.h b/minix/drivers/power/acpi/include/acresrc.h similarity index 100% rename from drivers/acpi/include/acresrc.h rename to minix/drivers/power/acpi/include/acresrc.h diff --git a/drivers/acpi/include/acrestyp.h b/minix/drivers/power/acpi/include/acrestyp.h similarity index 100% rename from drivers/acpi/include/acrestyp.h rename to minix/drivers/power/acpi/include/acrestyp.h diff --git a/drivers/acpi/include/acstruct.h b/minix/drivers/power/acpi/include/acstruct.h similarity index 100% rename from drivers/acpi/include/acstruct.h rename to minix/drivers/power/acpi/include/acstruct.h diff --git a/drivers/acpi/include/actables.h b/minix/drivers/power/acpi/include/actables.h similarity index 100% rename from drivers/acpi/include/actables.h rename to minix/drivers/power/acpi/include/actables.h diff --git a/drivers/acpi/include/actbl.h b/minix/drivers/power/acpi/include/actbl.h similarity index 100% rename from drivers/acpi/include/actbl.h rename to minix/drivers/power/acpi/include/actbl.h diff --git a/drivers/acpi/include/actbl1.h b/minix/drivers/power/acpi/include/actbl1.h similarity index 100% rename from drivers/acpi/include/actbl1.h rename to minix/drivers/power/acpi/include/actbl1.h diff --git a/drivers/acpi/include/actbl2.h b/minix/drivers/power/acpi/include/actbl2.h similarity index 100% rename from drivers/acpi/include/actbl2.h rename to minix/drivers/power/acpi/include/actbl2.h diff --git a/drivers/acpi/include/actypes.h b/minix/drivers/power/acpi/include/actypes.h similarity index 100% rename from drivers/acpi/include/actypes.h rename to minix/drivers/power/acpi/include/actypes.h diff --git a/drivers/acpi/include/acutils.h b/minix/drivers/power/acpi/include/acutils.h similarity index 100% rename from drivers/acpi/include/acutils.h rename to minix/drivers/power/acpi/include/acutils.h diff --git a/drivers/acpi/include/amlcode.h b/minix/drivers/power/acpi/include/amlcode.h similarity index 100% rename from drivers/acpi/include/amlcode.h rename to minix/drivers/power/acpi/include/amlcode.h diff --git a/drivers/acpi/include/amlresrc.h b/minix/drivers/power/acpi/include/amlresrc.h similarity index 100% rename from drivers/acpi/include/amlresrc.h rename to minix/drivers/power/acpi/include/amlresrc.h diff --git a/drivers/acpi/include/platform/accygwin.h b/minix/drivers/power/acpi/include/platform/accygwin.h similarity index 100% rename from drivers/acpi/include/platform/accygwin.h rename to minix/drivers/power/acpi/include/platform/accygwin.h diff --git a/drivers/acpi/include/platform/acefi.h b/minix/drivers/power/acpi/include/platform/acefi.h similarity index 100% rename from drivers/acpi/include/platform/acefi.h rename to minix/drivers/power/acpi/include/platform/acefi.h diff --git a/drivers/acpi/include/platform/acenv.h b/minix/drivers/power/acpi/include/platform/acenv.h similarity index 100% rename from drivers/acpi/include/platform/acenv.h rename to minix/drivers/power/acpi/include/platform/acenv.h diff --git a/drivers/acpi/include/platform/acfreebsd.h b/minix/drivers/power/acpi/include/platform/acfreebsd.h similarity index 100% rename from drivers/acpi/include/platform/acfreebsd.h rename to minix/drivers/power/acpi/include/platform/acfreebsd.h diff --git a/drivers/acpi/include/platform/acgcc.h b/minix/drivers/power/acpi/include/platform/acgcc.h similarity index 100% rename from drivers/acpi/include/platform/acgcc.h rename to minix/drivers/power/acpi/include/platform/acgcc.h diff --git a/drivers/acpi/include/platform/acintel.h b/minix/drivers/power/acpi/include/platform/acintel.h similarity index 100% rename from drivers/acpi/include/platform/acintel.h rename to minix/drivers/power/acpi/include/platform/acintel.h diff --git a/drivers/acpi/include/platform/aclinux.h b/minix/drivers/power/acpi/include/platform/aclinux.h similarity index 100% rename from drivers/acpi/include/platform/aclinux.h rename to minix/drivers/power/acpi/include/platform/aclinux.h diff --git a/drivers/acpi/include/platform/acminix.h b/minix/drivers/power/acpi/include/platform/acminix.h similarity index 100% rename from drivers/acpi/include/platform/acminix.h rename to minix/drivers/power/acpi/include/platform/acminix.h diff --git a/drivers/acpi/include/platform/acmsvc.h b/minix/drivers/power/acpi/include/platform/acmsvc.h similarity index 100% rename from drivers/acpi/include/platform/acmsvc.h rename to minix/drivers/power/acpi/include/platform/acmsvc.h diff --git a/drivers/acpi/include/platform/acnetbsd.h b/minix/drivers/power/acpi/include/platform/acnetbsd.h similarity index 100% rename from drivers/acpi/include/platform/acnetbsd.h rename to minix/drivers/power/acpi/include/platform/acnetbsd.h diff --git a/drivers/acpi/include/platform/acos2.h b/minix/drivers/power/acpi/include/platform/acos2.h similarity index 100% rename from drivers/acpi/include/platform/acos2.h rename to minix/drivers/power/acpi/include/platform/acos2.h diff --git a/drivers/acpi/include/platform/acwin.h b/minix/drivers/power/acpi/include/platform/acwin.h similarity index 100% rename from drivers/acpi/include/platform/acwin.h rename to minix/drivers/power/acpi/include/platform/acwin.h diff --git a/drivers/acpi/include/platform/acwin64.h b/minix/drivers/power/acpi/include/platform/acwin64.h similarity index 100% rename from drivers/acpi/include/platform/acwin64.h rename to minix/drivers/power/acpi/include/platform/acwin64.h diff --git a/drivers/acpi/namespace/nsaccess.c b/minix/drivers/power/acpi/namespace/nsaccess.c similarity index 100% rename from drivers/acpi/namespace/nsaccess.c rename to minix/drivers/power/acpi/namespace/nsaccess.c diff --git a/drivers/acpi/namespace/nsalloc.c b/minix/drivers/power/acpi/namespace/nsalloc.c similarity index 100% rename from drivers/acpi/namespace/nsalloc.c rename to minix/drivers/power/acpi/namespace/nsalloc.c diff --git a/drivers/acpi/namespace/nsdump.c b/minix/drivers/power/acpi/namespace/nsdump.c similarity index 100% rename from drivers/acpi/namespace/nsdump.c rename to minix/drivers/power/acpi/namespace/nsdump.c diff --git a/drivers/acpi/namespace/nsdumpdv.c b/minix/drivers/power/acpi/namespace/nsdumpdv.c similarity index 100% rename from drivers/acpi/namespace/nsdumpdv.c rename to minix/drivers/power/acpi/namespace/nsdumpdv.c diff --git a/drivers/acpi/namespace/nseval.c b/minix/drivers/power/acpi/namespace/nseval.c similarity index 100% rename from drivers/acpi/namespace/nseval.c rename to minix/drivers/power/acpi/namespace/nseval.c diff --git a/drivers/acpi/namespace/nsinit.c b/minix/drivers/power/acpi/namespace/nsinit.c similarity index 100% rename from drivers/acpi/namespace/nsinit.c rename to minix/drivers/power/acpi/namespace/nsinit.c diff --git a/drivers/acpi/namespace/nsload.c b/minix/drivers/power/acpi/namespace/nsload.c similarity index 100% rename from drivers/acpi/namespace/nsload.c rename to minix/drivers/power/acpi/namespace/nsload.c diff --git a/drivers/acpi/namespace/nsnames.c b/minix/drivers/power/acpi/namespace/nsnames.c similarity index 100% rename from drivers/acpi/namespace/nsnames.c rename to minix/drivers/power/acpi/namespace/nsnames.c diff --git a/drivers/acpi/namespace/nsobject.c b/minix/drivers/power/acpi/namespace/nsobject.c similarity index 100% rename from drivers/acpi/namespace/nsobject.c rename to minix/drivers/power/acpi/namespace/nsobject.c diff --git a/drivers/acpi/namespace/nsparse.c b/minix/drivers/power/acpi/namespace/nsparse.c similarity index 100% rename from drivers/acpi/namespace/nsparse.c rename to minix/drivers/power/acpi/namespace/nsparse.c diff --git a/drivers/acpi/namespace/nspredef.c b/minix/drivers/power/acpi/namespace/nspredef.c similarity index 100% rename from drivers/acpi/namespace/nspredef.c rename to minix/drivers/power/acpi/namespace/nspredef.c diff --git a/drivers/acpi/namespace/nsrepair.c b/minix/drivers/power/acpi/namespace/nsrepair.c similarity index 100% rename from drivers/acpi/namespace/nsrepair.c rename to minix/drivers/power/acpi/namespace/nsrepair.c diff --git a/drivers/acpi/namespace/nsrepair2.c b/minix/drivers/power/acpi/namespace/nsrepair2.c similarity index 100% rename from drivers/acpi/namespace/nsrepair2.c rename to minix/drivers/power/acpi/namespace/nsrepair2.c diff --git a/drivers/acpi/namespace/nssearch.c b/minix/drivers/power/acpi/namespace/nssearch.c similarity index 100% rename from drivers/acpi/namespace/nssearch.c rename to minix/drivers/power/acpi/namespace/nssearch.c diff --git a/drivers/acpi/namespace/nsutils.c b/minix/drivers/power/acpi/namespace/nsutils.c similarity index 100% rename from drivers/acpi/namespace/nsutils.c rename to minix/drivers/power/acpi/namespace/nsutils.c diff --git a/drivers/acpi/namespace/nswalk.c b/minix/drivers/power/acpi/namespace/nswalk.c similarity index 100% rename from drivers/acpi/namespace/nswalk.c rename to minix/drivers/power/acpi/namespace/nswalk.c diff --git a/drivers/acpi/namespace/nsxfeval.c b/minix/drivers/power/acpi/namespace/nsxfeval.c similarity index 100% rename from drivers/acpi/namespace/nsxfeval.c rename to minix/drivers/power/acpi/namespace/nsxfeval.c diff --git a/drivers/acpi/namespace/nsxfname.c b/minix/drivers/power/acpi/namespace/nsxfname.c similarity index 100% rename from drivers/acpi/namespace/nsxfname.c rename to minix/drivers/power/acpi/namespace/nsxfname.c diff --git a/drivers/acpi/namespace/nsxfobj.c b/minix/drivers/power/acpi/namespace/nsxfobj.c similarity index 100% rename from drivers/acpi/namespace/nsxfobj.c rename to minix/drivers/power/acpi/namespace/nsxfobj.c diff --git a/drivers/acpi/osminixxf.c b/minix/drivers/power/acpi/osminixxf.c similarity index 100% rename from drivers/acpi/osminixxf.c rename to minix/drivers/power/acpi/osminixxf.c diff --git a/drivers/acpi/parser/psargs.c b/minix/drivers/power/acpi/parser/psargs.c similarity index 100% rename from drivers/acpi/parser/psargs.c rename to minix/drivers/power/acpi/parser/psargs.c diff --git a/drivers/acpi/parser/psloop.c b/minix/drivers/power/acpi/parser/psloop.c similarity index 100% rename from drivers/acpi/parser/psloop.c rename to minix/drivers/power/acpi/parser/psloop.c diff --git a/drivers/acpi/parser/psopcode.c b/minix/drivers/power/acpi/parser/psopcode.c similarity index 100% rename from drivers/acpi/parser/psopcode.c rename to minix/drivers/power/acpi/parser/psopcode.c diff --git a/drivers/acpi/parser/psparse.c b/minix/drivers/power/acpi/parser/psparse.c similarity index 100% rename from drivers/acpi/parser/psparse.c rename to minix/drivers/power/acpi/parser/psparse.c diff --git a/drivers/acpi/parser/psscope.c b/minix/drivers/power/acpi/parser/psscope.c similarity index 100% rename from drivers/acpi/parser/psscope.c rename to minix/drivers/power/acpi/parser/psscope.c diff --git a/drivers/acpi/parser/pstree.c b/minix/drivers/power/acpi/parser/pstree.c similarity index 100% rename from drivers/acpi/parser/pstree.c rename to minix/drivers/power/acpi/parser/pstree.c diff --git a/drivers/acpi/parser/psutils.c b/minix/drivers/power/acpi/parser/psutils.c similarity index 100% rename from drivers/acpi/parser/psutils.c rename to minix/drivers/power/acpi/parser/psutils.c diff --git a/drivers/acpi/parser/pswalk.c b/minix/drivers/power/acpi/parser/pswalk.c similarity index 100% rename from drivers/acpi/parser/pswalk.c rename to minix/drivers/power/acpi/parser/pswalk.c diff --git a/drivers/acpi/parser/psxface.c b/minix/drivers/power/acpi/parser/psxface.c similarity index 100% rename from drivers/acpi/parser/psxface.c rename to minix/drivers/power/acpi/parser/psxface.c diff --git a/drivers/acpi/pci.c b/minix/drivers/power/acpi/pci.c similarity index 100% rename from drivers/acpi/pci.c rename to minix/drivers/power/acpi/pci.c diff --git a/drivers/acpi/pci.h b/minix/drivers/power/acpi/pci.h similarity index 100% rename from drivers/acpi/pci.h rename to minix/drivers/power/acpi/pci.h diff --git a/drivers/acpi/resources/rsaddr.c b/minix/drivers/power/acpi/resources/rsaddr.c similarity index 100% rename from drivers/acpi/resources/rsaddr.c rename to minix/drivers/power/acpi/resources/rsaddr.c diff --git a/drivers/acpi/resources/rscalc.c b/minix/drivers/power/acpi/resources/rscalc.c similarity index 100% rename from drivers/acpi/resources/rscalc.c rename to minix/drivers/power/acpi/resources/rscalc.c diff --git a/drivers/acpi/resources/rscreate.c b/minix/drivers/power/acpi/resources/rscreate.c similarity index 100% rename from drivers/acpi/resources/rscreate.c rename to minix/drivers/power/acpi/resources/rscreate.c diff --git a/drivers/acpi/resources/rsdump.c b/minix/drivers/power/acpi/resources/rsdump.c similarity index 100% rename from drivers/acpi/resources/rsdump.c rename to minix/drivers/power/acpi/resources/rsdump.c diff --git a/drivers/acpi/resources/rsinfo.c b/minix/drivers/power/acpi/resources/rsinfo.c similarity index 100% rename from drivers/acpi/resources/rsinfo.c rename to minix/drivers/power/acpi/resources/rsinfo.c diff --git a/drivers/acpi/resources/rsio.c b/minix/drivers/power/acpi/resources/rsio.c similarity index 100% rename from drivers/acpi/resources/rsio.c rename to minix/drivers/power/acpi/resources/rsio.c diff --git a/drivers/acpi/resources/rsirq.c b/minix/drivers/power/acpi/resources/rsirq.c similarity index 100% rename from drivers/acpi/resources/rsirq.c rename to minix/drivers/power/acpi/resources/rsirq.c diff --git a/drivers/acpi/resources/rslist.c b/minix/drivers/power/acpi/resources/rslist.c similarity index 100% rename from drivers/acpi/resources/rslist.c rename to minix/drivers/power/acpi/resources/rslist.c diff --git a/drivers/acpi/resources/rsmemory.c b/minix/drivers/power/acpi/resources/rsmemory.c similarity index 100% rename from drivers/acpi/resources/rsmemory.c rename to minix/drivers/power/acpi/resources/rsmemory.c diff --git a/drivers/acpi/resources/rsmisc.c b/minix/drivers/power/acpi/resources/rsmisc.c similarity index 100% rename from drivers/acpi/resources/rsmisc.c rename to minix/drivers/power/acpi/resources/rsmisc.c diff --git a/drivers/acpi/resources/rsutils.c b/minix/drivers/power/acpi/resources/rsutils.c similarity index 100% rename from drivers/acpi/resources/rsutils.c rename to minix/drivers/power/acpi/resources/rsutils.c diff --git a/drivers/acpi/resources/rsxface.c b/minix/drivers/power/acpi/resources/rsxface.c similarity index 100% rename from drivers/acpi/resources/rsxface.c rename to minix/drivers/power/acpi/resources/rsxface.c diff --git a/drivers/acpi/tables/tbfadt.c b/minix/drivers/power/acpi/tables/tbfadt.c similarity index 100% rename from drivers/acpi/tables/tbfadt.c rename to minix/drivers/power/acpi/tables/tbfadt.c diff --git a/drivers/acpi/tables/tbfind.c b/minix/drivers/power/acpi/tables/tbfind.c similarity index 100% rename from drivers/acpi/tables/tbfind.c rename to minix/drivers/power/acpi/tables/tbfind.c diff --git a/drivers/acpi/tables/tbinstal.c b/minix/drivers/power/acpi/tables/tbinstal.c similarity index 100% rename from drivers/acpi/tables/tbinstal.c rename to minix/drivers/power/acpi/tables/tbinstal.c diff --git a/drivers/acpi/tables/tbutils.c b/minix/drivers/power/acpi/tables/tbutils.c similarity index 100% rename from drivers/acpi/tables/tbutils.c rename to minix/drivers/power/acpi/tables/tbutils.c diff --git a/drivers/acpi/tables/tbxface.c b/minix/drivers/power/acpi/tables/tbxface.c similarity index 100% rename from drivers/acpi/tables/tbxface.c rename to minix/drivers/power/acpi/tables/tbxface.c diff --git a/drivers/acpi/tables/tbxfroot.c b/minix/drivers/power/acpi/tables/tbxfroot.c similarity index 100% rename from drivers/acpi/tables/tbxfroot.c rename to minix/drivers/power/acpi/tables/tbxfroot.c diff --git a/drivers/acpi/utilities/utalloc.c b/minix/drivers/power/acpi/utilities/utalloc.c similarity index 100% rename from drivers/acpi/utilities/utalloc.c rename to minix/drivers/power/acpi/utilities/utalloc.c diff --git a/drivers/acpi/utilities/utcache.c b/minix/drivers/power/acpi/utilities/utcache.c similarity index 100% rename from drivers/acpi/utilities/utcache.c rename to minix/drivers/power/acpi/utilities/utcache.c diff --git a/drivers/acpi/utilities/utclib.c b/minix/drivers/power/acpi/utilities/utclib.c similarity index 100% rename from drivers/acpi/utilities/utclib.c rename to minix/drivers/power/acpi/utilities/utclib.c diff --git a/drivers/acpi/utilities/utcopy.c b/minix/drivers/power/acpi/utilities/utcopy.c similarity index 100% rename from drivers/acpi/utilities/utcopy.c rename to minix/drivers/power/acpi/utilities/utcopy.c diff --git a/drivers/acpi/utilities/utdebug.c b/minix/drivers/power/acpi/utilities/utdebug.c similarity index 100% rename from drivers/acpi/utilities/utdebug.c rename to minix/drivers/power/acpi/utilities/utdebug.c diff --git a/drivers/acpi/utilities/utdelete.c b/minix/drivers/power/acpi/utilities/utdelete.c similarity index 100% rename from drivers/acpi/utilities/utdelete.c rename to minix/drivers/power/acpi/utilities/utdelete.c diff --git a/drivers/acpi/utilities/uteval.c b/minix/drivers/power/acpi/utilities/uteval.c similarity index 100% rename from drivers/acpi/utilities/uteval.c rename to minix/drivers/power/acpi/utilities/uteval.c diff --git a/drivers/acpi/utilities/utglobal.c b/minix/drivers/power/acpi/utilities/utglobal.c similarity index 100% rename from drivers/acpi/utilities/utglobal.c rename to minix/drivers/power/acpi/utilities/utglobal.c diff --git a/drivers/acpi/utilities/utids.c b/minix/drivers/power/acpi/utilities/utids.c similarity index 100% rename from drivers/acpi/utilities/utids.c rename to minix/drivers/power/acpi/utilities/utids.c diff --git a/drivers/acpi/utilities/utinit.c b/minix/drivers/power/acpi/utilities/utinit.c similarity index 100% rename from drivers/acpi/utilities/utinit.c rename to minix/drivers/power/acpi/utilities/utinit.c diff --git a/drivers/acpi/utilities/utlock.c b/minix/drivers/power/acpi/utilities/utlock.c similarity index 100% rename from drivers/acpi/utilities/utlock.c rename to minix/drivers/power/acpi/utilities/utlock.c diff --git a/drivers/acpi/utilities/utmath.c b/minix/drivers/power/acpi/utilities/utmath.c similarity index 100% rename from drivers/acpi/utilities/utmath.c rename to minix/drivers/power/acpi/utilities/utmath.c diff --git a/drivers/acpi/utilities/utmisc.c b/minix/drivers/power/acpi/utilities/utmisc.c similarity index 100% rename from drivers/acpi/utilities/utmisc.c rename to minix/drivers/power/acpi/utilities/utmisc.c diff --git a/drivers/acpi/utilities/utmutex.c b/minix/drivers/power/acpi/utilities/utmutex.c similarity index 100% rename from drivers/acpi/utilities/utmutex.c rename to minix/drivers/power/acpi/utilities/utmutex.c diff --git a/drivers/acpi/utilities/utobject.c b/minix/drivers/power/acpi/utilities/utobject.c similarity index 100% rename from drivers/acpi/utilities/utobject.c rename to minix/drivers/power/acpi/utilities/utobject.c diff --git a/drivers/acpi/utilities/utresrc.c b/minix/drivers/power/acpi/utilities/utresrc.c similarity index 100% rename from drivers/acpi/utilities/utresrc.c rename to minix/drivers/power/acpi/utilities/utresrc.c diff --git a/drivers/acpi/utilities/utstate.c b/minix/drivers/power/acpi/utilities/utstate.c similarity index 100% rename from drivers/acpi/utilities/utstate.c rename to minix/drivers/power/acpi/utilities/utstate.c diff --git a/drivers/acpi/utilities/uttrack.c b/minix/drivers/power/acpi/utilities/uttrack.c similarity index 100% rename from drivers/acpi/utilities/uttrack.c rename to minix/drivers/power/acpi/utilities/uttrack.c diff --git a/drivers/acpi/utilities/utxface.c b/minix/drivers/power/acpi/utilities/utxface.c similarity index 100% rename from drivers/acpi/utilities/utxface.c rename to minix/drivers/power/acpi/utilities/utxface.c diff --git a/drivers/tps65217/Makefile b/minix/drivers/power/tps65217/Makefile similarity index 91% rename from drivers/tps65217/Makefile rename to minix/drivers/power/tps65217/Makefile index fea029de5..d79636b86 100644 --- a/drivers/tps65217/Makefile +++ b/minix/drivers/power/tps65217/Makefile @@ -5,10 +5,6 @@ SRCS= tps65217.c DPADD+= ${LIBI2CDRIVER} ${LIBCLKCONF} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lclkconf -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/drivers/tps65217/README.txt b/minix/drivers/power/tps65217/README.txt similarity index 100% rename from drivers/tps65217/README.txt rename to minix/drivers/power/tps65217/README.txt diff --git a/drivers/tps65217/tps65217.c b/minix/drivers/power/tps65217/tps65217.c similarity index 100% rename from drivers/tps65217/tps65217.c rename to minix/drivers/power/tps65217/tps65217.c diff --git a/drivers/tps65950/Makefile b/minix/drivers/power/tps65950/Makefile similarity index 91% rename from drivers/tps65950/Makefile rename to minix/drivers/power/tps65950/Makefile index bb95536e8..027aa8b36 100644 --- a/drivers/tps65950/Makefile +++ b/minix/drivers/power/tps65950/Makefile @@ -5,10 +5,6 @@ SRCS= tps65950.c tps65950.h rtc.c rtc.h DPADD+= ${LIBI2CDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/drivers/tps65950/README.txt b/minix/drivers/power/tps65950/README.txt similarity index 100% rename from drivers/tps65950/README.txt rename to minix/drivers/power/tps65950/README.txt diff --git a/drivers/tps65950/rtc.c b/minix/drivers/power/tps65950/rtc.c similarity index 100% rename from drivers/tps65950/rtc.c rename to minix/drivers/power/tps65950/rtc.c diff --git a/drivers/tps65950/rtc.h b/minix/drivers/power/tps65950/rtc.h similarity index 100% rename from drivers/tps65950/rtc.h rename to minix/drivers/power/tps65950/rtc.h diff --git a/drivers/tps65950/tps65950.c b/minix/drivers/power/tps65950/tps65950.c similarity index 100% rename from drivers/tps65950/tps65950.c rename to minix/drivers/power/tps65950/tps65950.c diff --git a/drivers/tps65950/tps65950.h b/minix/drivers/power/tps65950/tps65950.h similarity index 100% rename from drivers/tps65950/tps65950.h rename to minix/drivers/power/tps65950/tps65950.h diff --git a/minix/drivers/printer/Makefile b/minix/drivers/printer/Makefile new file mode 100644 index 000000000..8cd5a3a26 --- /dev/null +++ b/minix/drivers/printer/Makefile @@ -0,0 +1,7 @@ +.include + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= printer +.endif # ${MACHINE_ARCH} == "i386" + +.include diff --git a/minix/drivers/printer/Makefile.inc b/minix/drivers/printer/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/printer/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/printer/Makefile b/minix/drivers/printer/printer/Makefile similarity index 87% rename from drivers/printer/Makefile rename to minix/drivers/printer/printer/Makefile index beec640fa..e1b045b3c 100644 --- a/drivers/printer/Makefile +++ b/minix/drivers/printer/printer/Makefile @@ -5,8 +5,4 @@ SRCS= printer.c liveupdate.c DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/printer/liveupdate.c b/minix/drivers/printer/printer/liveupdate.c similarity index 100% rename from drivers/printer/liveupdate.c rename to minix/drivers/printer/printer/liveupdate.c diff --git a/drivers/printer/printer.c b/minix/drivers/printer/printer/printer.c similarity index 100% rename from drivers/printer/printer.c rename to minix/drivers/printer/printer/printer.c diff --git a/minix/drivers/sensors/Makefile b/minix/drivers/sensors/Makefile new file mode 100644 index 000000000..071d48cb9 --- /dev/null +++ b/minix/drivers/sensors/Makefile @@ -0,0 +1,9 @@ +.include + +.if ${MACHINE_ARCH} == "earm" +SUBDIR+= bmp085 +SUBDIR+= sht21 +SUBDIR+= tsl2550 +.endif # ${MACHINE_ARCH} == "earm" + +.include diff --git a/minix/drivers/sensors/Makefile.inc b/minix/drivers/sensors/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/sensors/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/bmp085/Makefile b/minix/drivers/sensors/bmp085/Makefile similarity index 91% rename from drivers/bmp085/Makefile rename to minix/drivers/sensors/bmp085/Makefile index e087328dc..1b2ceacc4 100644 --- a/drivers/bmp085/Makefile +++ b/minix/drivers/sensors/bmp085/Makefile @@ -5,10 +5,6 @@ SRCS= bmp085.c DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lchardriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/drivers/bmp085/README.txt b/minix/drivers/sensors/bmp085/README.txt similarity index 100% rename from drivers/bmp085/README.txt rename to minix/drivers/sensors/bmp085/README.txt diff --git a/drivers/bmp085/bmp085.c b/minix/drivers/sensors/bmp085/bmp085.c similarity index 100% rename from drivers/bmp085/bmp085.c rename to minix/drivers/sensors/bmp085/bmp085.c diff --git a/drivers/sht21/Makefile b/minix/drivers/sensors/sht21/Makefile similarity index 91% rename from drivers/sht21/Makefile rename to minix/drivers/sensors/sht21/Makefile index 03d248d4b..cbc417c45 100644 --- a/drivers/sht21/Makefile +++ b/minix/drivers/sensors/sht21/Makefile @@ -5,10 +5,6 @@ SRCS= sht21.c DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lchardriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/drivers/sht21/README.txt b/minix/drivers/sensors/sht21/README.txt similarity index 100% rename from drivers/sht21/README.txt rename to minix/drivers/sensors/sht21/README.txt diff --git a/drivers/sht21/sht21.c b/minix/drivers/sensors/sht21/sht21.c similarity index 100% rename from drivers/sht21/sht21.c rename to minix/drivers/sensors/sht21/sht21.c diff --git a/drivers/tsl2550/Makefile b/minix/drivers/sensors/tsl2550/Makefile similarity index 91% rename from drivers/tsl2550/Makefile rename to minix/drivers/sensors/tsl2550/Makefile index 19896dc45..9dcec6387 100644 --- a/drivers/tsl2550/Makefile +++ b/minix/drivers/sensors/tsl2550/Makefile @@ -5,10 +5,6 @@ SRCS= tsl2550.c DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lchardriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/drivers/tsl2550/README.txt b/minix/drivers/sensors/tsl2550/README.txt similarity index 100% rename from drivers/tsl2550/README.txt rename to minix/drivers/sensors/tsl2550/README.txt diff --git a/drivers/tsl2550/tsl2550.c b/minix/drivers/sensors/tsl2550/tsl2550.c similarity index 100% rename from drivers/tsl2550/tsl2550.c rename to minix/drivers/sensors/tsl2550/tsl2550.c diff --git a/minix/drivers/storage/Makefile b/minix/drivers/storage/Makefile new file mode 100644 index 000000000..4597c2e39 --- /dev/null +++ b/minix/drivers/storage/Makefile @@ -0,0 +1,23 @@ +.include + +.if ${MKIMAGEONLY} == "no" +. if ${MACHINE_ARCH} == "i386" +SUBDIR+= ahci +SUBDIR+= fbd +SUBDIR+= filter +SUBDIR+= virtio_blk +. endif # ${MACHINE_ARCH} == "i386" + +SUBDIR+= mmc +SUBDIR+= vnd +.endif # ${MKIMAGEONLY} == "no" + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= at_wini +SUBDIR+= floppy +.endif # ${MACHINE_ARCH} == "i386" + +# memory driver must be last for ramdisk image +SUBDIR+= ramdisk .WAIT memory + +.include diff --git a/minix/drivers/storage/Makefile.inc b/minix/drivers/storage/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/storage/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/ahci/Makefile b/minix/drivers/storage/ahci/Makefile similarity index 100% rename from drivers/ahci/Makefile rename to minix/drivers/storage/ahci/Makefile diff --git a/drivers/ahci/ahci.c b/minix/drivers/storage/ahci/ahci.c similarity index 100% rename from drivers/ahci/ahci.c rename to minix/drivers/storage/ahci/ahci.c diff --git a/drivers/ahci/ahci.h b/minix/drivers/storage/ahci/ahci.h similarity index 100% rename from drivers/ahci/ahci.h rename to minix/drivers/storage/ahci/ahci.h diff --git a/drivers/at_wini/Makefile b/minix/drivers/storage/at_wini/Makefile similarity index 100% rename from drivers/at_wini/Makefile rename to minix/drivers/storage/at_wini/Makefile diff --git a/drivers/at_wini/at_wini.c b/minix/drivers/storage/at_wini/at_wini.c similarity index 100% rename from drivers/at_wini/at_wini.c rename to minix/drivers/storage/at_wini/at_wini.c diff --git a/drivers/at_wini/at_wini.h b/minix/drivers/storage/at_wini/at_wini.h similarity index 100% rename from drivers/at_wini/at_wini.h rename to minix/drivers/storage/at_wini/at_wini.h diff --git a/drivers/at_wini/liveupdate.c b/minix/drivers/storage/at_wini/liveupdate.c similarity index 100% rename from drivers/at_wini/liveupdate.c rename to minix/drivers/storage/at_wini/liveupdate.c diff --git a/drivers/fbd/Makefile b/minix/drivers/storage/fbd/Makefile similarity index 91% rename from drivers/fbd/Makefile rename to minix/drivers/storage/fbd/Makefile index a4bfcc320..45bb655d1 100644 --- a/drivers/fbd/Makefile +++ b/minix/drivers/storage/fbd/Makefile @@ -10,8 +10,5 @@ LDADD+= -lblockdriver -lsys CPPFLAGS+= -DDEBUG=0 # The FBD driver requires NetBSD libc. -MAN= - -BINDIR?= /usr/sbin .include diff --git a/drivers/fbd/action.c b/minix/drivers/storage/fbd/action.c similarity index 100% rename from drivers/fbd/action.c rename to minix/drivers/storage/fbd/action.c diff --git a/drivers/fbd/action.h b/minix/drivers/storage/fbd/action.h similarity index 100% rename from drivers/fbd/action.h rename to minix/drivers/storage/fbd/action.h diff --git a/drivers/fbd/fbd.c b/minix/drivers/storage/fbd/fbd.c similarity index 100% rename from drivers/fbd/fbd.c rename to minix/drivers/storage/fbd/fbd.c diff --git a/drivers/fbd/rule.c b/minix/drivers/storage/fbd/rule.c similarity index 100% rename from drivers/fbd/rule.c rename to minix/drivers/storage/fbd/rule.c diff --git a/drivers/fbd/rule.h b/minix/drivers/storage/fbd/rule.h similarity index 100% rename from drivers/fbd/rule.h rename to minix/drivers/storage/fbd/rule.h diff --git a/drivers/filter/Makefile b/minix/drivers/storage/filter/Makefile similarity index 89% rename from drivers/filter/Makefile rename to minix/drivers/storage/filter/Makefile index 3c5ad08ba..8da793f69 100644 --- a/drivers/filter/Makefile +++ b/minix/drivers/storage/filter/Makefile @@ -5,10 +5,6 @@ SRCS= main.c sum.c driver.c util.c crc.c md5.c DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} LDADD+= -lblockdriver -lsys -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -DDEBUG=1 -DDEBUG2=0 .include diff --git a/drivers/filter/crc.c b/minix/drivers/storage/filter/crc.c similarity index 100% rename from drivers/filter/crc.c rename to minix/drivers/storage/filter/crc.c diff --git a/drivers/filter/crc.h b/minix/drivers/storage/filter/crc.h similarity index 100% rename from drivers/filter/crc.h rename to minix/drivers/storage/filter/crc.h diff --git a/drivers/filter/driver.c b/minix/drivers/storage/filter/driver.c similarity index 100% rename from drivers/filter/driver.c rename to minix/drivers/storage/filter/driver.c diff --git a/drivers/filter/inc.h b/minix/drivers/storage/filter/inc.h similarity index 100% rename from drivers/filter/inc.h rename to minix/drivers/storage/filter/inc.h diff --git a/drivers/filter/main.c b/minix/drivers/storage/filter/main.c similarity index 100% rename from drivers/filter/main.c rename to minix/drivers/storage/filter/main.c diff --git a/drivers/filter/md5.c b/minix/drivers/storage/filter/md5.c similarity index 100% rename from drivers/filter/md5.c rename to minix/drivers/storage/filter/md5.c diff --git a/drivers/filter/md5.h b/minix/drivers/storage/filter/md5.h similarity index 100% rename from drivers/filter/md5.h rename to minix/drivers/storage/filter/md5.h diff --git a/drivers/filter/sum.c b/minix/drivers/storage/filter/sum.c similarity index 100% rename from drivers/filter/sum.c rename to minix/drivers/storage/filter/sum.c diff --git a/drivers/filter/util.c b/minix/drivers/storage/filter/util.c similarity index 100% rename from drivers/filter/util.c rename to minix/drivers/storage/filter/util.c diff --git a/drivers/floppy/Makefile b/minix/drivers/storage/floppy/Makefile similarity index 100% rename from drivers/floppy/Makefile rename to minix/drivers/storage/floppy/Makefile diff --git a/drivers/floppy/floppy.c b/minix/drivers/storage/floppy/floppy.c similarity index 100% rename from drivers/floppy/floppy.c rename to minix/drivers/storage/floppy/floppy.c diff --git a/drivers/floppy/floppy.h b/minix/drivers/storage/floppy/floppy.h similarity index 100% rename from drivers/floppy/floppy.h rename to minix/drivers/storage/floppy/floppy.h diff --git a/drivers/floppy/liveupdate.c b/minix/drivers/storage/floppy/liveupdate.c similarity index 100% rename from drivers/floppy/liveupdate.c rename to minix/drivers/storage/floppy/liveupdate.c diff --git a/drivers/memory/Makefile b/minix/drivers/storage/memory/Makefile similarity index 86% rename from drivers/memory/Makefile rename to minix/drivers/storage/memory/Makefile index fd9a0342b..a782b53fa 100644 --- a/drivers/memory/Makefile +++ b/minix/drivers/storage/memory/Makefile @@ -1,5 +1,4 @@ # Makefile for memory driver (MEMORY) - .include USE_BITCODE:=no @@ -9,15 +8,11 @@ SRCS= memory.c imgrd.mfs OBJS= ${SRCS:N*.h:R:S/$/.o/g} MKBUILDEXT2RD?= no -RAMDISK_PATH= ${NETBSDSRCDIR}/drivers/ramdisk +RAMDISK_PATH= ${NETBSDSRCDIR}/minix/drivers/storage/ramdisk DPADD+= ${LIBBLOCKDRIVER} ${LIBCHARDRIVER} LDADD+= -lblockdriver -lchardriver -MAN= - -BINDIR?= /usr/sbin - -CPPFLAGS.memory.c+= -I${NETBSDSRCDIR} +CPPFLAGS.memory.c+= -I${NETBSDSRCDIR}/minix imgrd.d: touch-genfiles touch-genfiles: diff --git a/drivers/memory/local.h b/minix/drivers/storage/memory/local.h similarity index 100% rename from drivers/memory/local.h rename to minix/drivers/storage/memory/local.h diff --git a/drivers/memory/memory.c b/minix/drivers/storage/memory/memory.c similarity index 100% rename from drivers/memory/memory.c rename to minix/drivers/storage/memory/memory.c diff --git a/drivers/mmc/Makefile b/minix/drivers/storage/mmc/Makefile similarity index 92% rename from drivers/mmc/Makefile rename to minix/drivers/storage/mmc/Makefile index 9480ecf2c..b21ab617e 100644 --- a/drivers/mmc/Makefile +++ b/minix/drivers/storage/mmc/Makefile @@ -2,12 +2,10 @@ PROG= mmc SRCS= mmcblk.c mmchost_dummy.c sdhcreg.h sdmmcreg.h - .if ${MACHINE_ARCH} == "earm" SRCS += mmchost_mmchs.c .endif - DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} LDADD+= -lblockdriver -lsys CLEANFILES+=.depend mmcblk.d @@ -16,8 +14,4 @@ CLEANFILES+=.depend mmcblk.d # This is a system driver. CPPFLAGS+= -D_SYSTEM=1 -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/mmc/README.txt b/minix/drivers/storage/mmc/README.txt similarity index 100% rename from drivers/mmc/README.txt rename to minix/drivers/storage/mmc/README.txt diff --git a/drivers/mmc/mmcblk.c b/minix/drivers/storage/mmc/mmcblk.c similarity index 100% rename from drivers/mmc/mmcblk.c rename to minix/drivers/storage/mmc/mmcblk.c diff --git a/drivers/mmc/mmchost.h b/minix/drivers/storage/mmc/mmchost.h similarity index 100% rename from drivers/mmc/mmchost.h rename to minix/drivers/storage/mmc/mmchost.h diff --git a/drivers/mmc/mmchost_dummy.c b/minix/drivers/storage/mmc/mmchost_dummy.c similarity index 100% rename from drivers/mmc/mmchost_dummy.c rename to minix/drivers/storage/mmc/mmchost_dummy.c diff --git a/drivers/mmc/mmchost_mmchs.c b/minix/drivers/storage/mmc/mmchost_mmchs.c similarity index 100% rename from drivers/mmc/mmchost_mmchs.c rename to minix/drivers/storage/mmc/mmchost_mmchs.c diff --git a/drivers/mmc/omap_mmc.h b/minix/drivers/storage/mmc/omap_mmc.h similarity index 100% rename from drivers/mmc/omap_mmc.h rename to minix/drivers/storage/mmc/omap_mmc.h diff --git a/drivers/mmc/sdhcreg.h b/minix/drivers/storage/mmc/sdhcreg.h similarity index 100% rename from drivers/mmc/sdhcreg.h rename to minix/drivers/storage/mmc/sdhcreg.h diff --git a/drivers/mmc/sdmmcreg.h b/minix/drivers/storage/mmc/sdmmcreg.h similarity index 100% rename from drivers/mmc/sdmmcreg.h rename to minix/drivers/storage/mmc/sdmmcreg.h diff --git a/drivers/ramdisk/Makefile b/minix/drivers/storage/ramdisk/Makefile similarity index 83% rename from drivers/ramdisk/Makefile rename to minix/drivers/storage/ramdisk/Makefile index 606b11f02..7a487bd11 100644 --- a/drivers/ramdisk/Makefile +++ b/minix/drivers/storage/ramdisk/Makefile @@ -1,5 +1,4 @@ # Makefile for ramdisk image - .include USE_BITCODE:=no @@ -68,7 +67,8 @@ PROG_DRIVERS+= mmc .if ${LDSTATIC} == "-dynamic" RAMDISK_DYNAMIC= 1 PROG_LIBEXEC+= ld.elf_so -PROG_LIBS+= libc libminlib libcompat_minix libterminfo +PROG_LIBS+= libc +PROG_MINIXLIBS+= libminlib libcompat_minix libterminfo .endif PROGRAMS=${PROG_COMMANDS} \ @@ -92,8 +92,8 @@ CLEANFILES += ${.OBJDIR}/etc/* # Tool to bootstrap the password db TOOL_PWD_MKDB?= ${NETBSDSRCDIR}/usr.sbin/pwd_mkdb/pwd_mkdb -# Remove "drivers/ramdisk" component from path -PROGROOT:= ${.OBJDIR:S,/drivers/ramdisk,,} +# Remove "drivers/storage/ramdisk" component from path +PROGROOT:= ${.OBJDIR:S,/drivers/storage/ramdisk,,} # Generate dependencies rules for config files .for etc in ${ETC} @@ -112,7 +112,7 @@ etc/${etc}: ${NETBSDSRCDIR}/etc/${etc} .if ${.CURDIR} != ${.OBJDIR} .for file in ${EXTRA} ${PROTO} ${PROTO_FILES} CLEANFILES += ${.OBJDIR}/${file} -${file}: ${NETBSDSRCDIR}/drivers/ramdisk/${file} .PHONY +${file}: ${NETBSDSRCDIR}/minix/drivers/storage/ramdisk/${file} .PHONY ${INSTALL} $> $@ .endfor .endif @@ -128,28 +128,45 @@ ${PROGROOT}/lib/${lib}/${lib}.so.0: ${MAKE} -C ${NETBSDSRCDIR}/lib/${lib} all .endfor +.for lib in ${PROG_MINIXLIBS} +PROGRAMS+= ${lib}.so.0 +CLEANFILES += ${lib}.so.0 +${lib}.so.0:${PROGROOT}/minix/lib/${lib}/${lib}.so.0 + ${INSTALL} $> $@ + +${PROGROOT}/minix/lib/${lib}/${lib}.so.0: + ${MAKE} -C ${NETBSDSRCDIR}/minix/lib/${lib} all +.endfor + # Generate dependencies rules for binaries -dir.sh:= ash -dir.fsck_mfs:= fsck.mfs +dir.acpi:= power/acpi +dir.ahci:= storage/ahci +dir.at_wini:= storage/at_wini +dir.ext2:= ../fs/ext2 +dir.floppy:= storage/floppy +dir.fsck_mfs:= fsck.mfs +dir.mfs:= ../fs/mfs +dir.mmc:= storage/mmc +dir.pci:= bus/pci +dir.pckbd:= hid/pckbd +dir.procfs:= ../fs/procfs +dir.pwd_mkdb:= ../../usr.sbin/pwd_mkdb +dir.sh:= ash +dir.virtio_blk:= storage/virtio_blk + .for srcdir in bin sbin commands drivers libexec servers usr.bin usr.sbin .for prog in ${PROG_${srcdir:tu}} ${prog}: ${PROGROOT}/${srcdir}/${dir.${prog}:U${prog}}/${prog} ${INSTALL} $> $@ ${PROGROOT}/${srcdir}/${dir.${prog}:U${prog}}/${prog}: - ${MAKE} -C ${NETBSDSRCDIR}/${srcdir}/${dir.${prog}:U${prog}} all + ${MAKE} -C ${NETBSDSRCDIR}/minix/${srcdir}/${dir.${prog}:U${prog}} all .endfor # prog .endfor # srcdir realall image: proto.gen ${ETC:C/^/etc\//} ${EXTRA} etc/master.passwd etc/pwd.db etc/spwd.db etc/passwd etc/group ${_MKMSG_CREATE} "Generating ramdisk image" ${TOOL_MKFSMFS} image proto.gen || { rm -f image; false; } -# if fsck.mfs -s image | grep -q CLEAN; \ -# then : ; \ -# else echo "CLEAN sanity check of image failed." ; \ -# echo "(Perhaps install current mkfs and fsck.)" ; \ -# rm -f image; false; \ -# fi etc/pwd.db etc/spwd.db etc/passwd: etc/master.passwd @@ -164,7 +181,7 @@ proto.dev.mtree: >${.TARGET}.tmp && \ echo "./dev type=dir uname=root gname=operator mode=0755" \ >>${.TARGET}.tmp && \ - ${NETBSDSRCDIR}/commands/MAKEDEV/MAKEDEV.sh -m -r \ + ${NETBSDSRCDIR}/minix/commands/MAKEDEV/MAKEDEV.sh -m -r \ >> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET} # We have to remove the two first entries of the generated proto file, as diff --git a/drivers/ramdisk/proto b/minix/drivers/storage/ramdisk/proto similarity index 100% rename from drivers/ramdisk/proto rename to minix/drivers/storage/ramdisk/proto diff --git a/drivers/ramdisk/proto.common.dynamic b/minix/drivers/storage/ramdisk/proto.common.dynamic similarity index 100% rename from drivers/ramdisk/proto.common.dynamic rename to minix/drivers/storage/ramdisk/proto.common.dynamic diff --git a/drivers/ramdisk/proto.common.etc b/minix/drivers/storage/ramdisk/proto.common.etc similarity index 100% rename from drivers/ramdisk/proto.common.etc rename to minix/drivers/storage/ramdisk/proto.common.etc diff --git a/drivers/ramdisk/rc b/minix/drivers/storage/ramdisk/rc similarity index 100% rename from drivers/ramdisk/rc rename to minix/drivers/storage/ramdisk/rc diff --git a/drivers/virtio_blk/Makefile b/minix/drivers/storage/virtio_blk/Makefile similarity index 100% rename from drivers/virtio_blk/Makefile rename to minix/drivers/storage/virtio_blk/Makefile diff --git a/drivers/virtio_blk/virtio_blk.c b/minix/drivers/storage/virtio_blk/virtio_blk.c similarity index 100% rename from drivers/virtio_blk/virtio_blk.c rename to minix/drivers/storage/virtio_blk/virtio_blk.c diff --git a/drivers/virtio_blk/virtio_blk.h b/minix/drivers/storage/virtio_blk/virtio_blk.h similarity index 100% rename from drivers/virtio_blk/virtio_blk.h rename to minix/drivers/storage/virtio_blk/virtio_blk.h diff --git a/drivers/vnd/Makefile b/minix/drivers/storage/vnd/Makefile similarity index 85% rename from drivers/vnd/Makefile rename to minix/drivers/storage/vnd/Makefile index 493430b27..db8e301df 100644 --- a/drivers/vnd/Makefile +++ b/minix/drivers/storage/vnd/Makefile @@ -5,8 +5,4 @@ SRCS= vnd.c DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} LDADD+= -lblockdriver -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/vnd/NOTES b/minix/drivers/storage/vnd/NOTES similarity index 100% rename from drivers/vnd/NOTES rename to minix/drivers/storage/vnd/NOTES diff --git a/drivers/vnd/vnd.c b/minix/drivers/storage/vnd/vnd.c similarity index 100% rename from drivers/vnd/vnd.c rename to minix/drivers/storage/vnd/vnd.c diff --git a/minix/drivers/system/Makefile b/minix/drivers/system/Makefile new file mode 100644 index 000000000..00033c6be --- /dev/null +++ b/minix/drivers/system/Makefile @@ -0,0 +1,10 @@ +.include + +.if ${MACHINE_ARCH} == "earm" +SUBDIR+= gpio +.endif # ${MACHINE_ARCH} == "earm" + +SUBDIR+= log +SUBDIR+= random + +.include diff --git a/minix/drivers/system/Makefile.inc b/minix/drivers/system/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/system/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/gpio/Makefile b/minix/drivers/system/gpio/Makefile similarity index 100% rename from drivers/gpio/Makefile rename to minix/drivers/system/gpio/Makefile diff --git a/drivers/gpio/README.txt b/minix/drivers/system/gpio/README.txt similarity index 100% rename from drivers/gpio/README.txt rename to minix/drivers/system/gpio/README.txt diff --git a/drivers/gpio/gpio.c b/minix/drivers/system/gpio/gpio.c similarity index 100% rename from drivers/gpio/gpio.c rename to minix/drivers/system/gpio/gpio.c diff --git a/drivers/log/Makefile b/minix/drivers/system/log/Makefile similarity index 86% rename from drivers/log/Makefile rename to minix/drivers/system/log/Makefile index 7c197e7df..9ac7e8a67 100644 --- a/drivers/log/Makefile +++ b/minix/drivers/system/log/Makefile @@ -5,8 +5,4 @@ SRCS= log.c diag.c liveupdate.c DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/log/diag.c b/minix/drivers/system/log/diag.c similarity index 100% rename from drivers/log/diag.c rename to minix/drivers/system/log/diag.c diff --git a/drivers/log/liveupdate.c b/minix/drivers/system/log/liveupdate.c similarity index 100% rename from drivers/log/liveupdate.c rename to minix/drivers/system/log/liveupdate.c diff --git a/drivers/log/log.c b/minix/drivers/system/log/log.c similarity index 100% rename from drivers/log/log.c rename to minix/drivers/system/log/log.c diff --git a/drivers/log/log.h b/minix/drivers/system/log/log.h similarity index 100% rename from drivers/log/log.h rename to minix/drivers/system/log/log.h diff --git a/drivers/random/Makefile b/minix/drivers/system/random/Makefile similarity index 77% rename from drivers/random/Makefile rename to minix/drivers/system/random/Makefile index e993c121a..ac1fb733a 100644 --- a/drivers/random/Makefile +++ b/minix/drivers/system/random/Makefile @@ -7,11 +7,6 @@ SRCS= main.c random.c rijndael_api.c rijndael_alg.c DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys -MAN= - -BINDIR?= /usr/sbin - -CPPFLAGS.random.c+= -I${NETBSDSRCDIR} +CPPFLAGS.random.c+= -I${NETBSDSRCDIR}/minix .include - diff --git a/drivers/random/aes/boxes.dat b/minix/drivers/system/random/aes/boxes.dat similarity index 100% rename from drivers/random/aes/boxes.dat rename to minix/drivers/system/random/aes/boxes.dat diff --git a/drivers/random/aes/rijndael-alg.h b/minix/drivers/system/random/aes/rijndael-alg.h similarity index 100% rename from drivers/random/aes/rijndael-alg.h rename to minix/drivers/system/random/aes/rijndael-alg.h diff --git a/drivers/random/aes/rijndael-api.h b/minix/drivers/system/random/aes/rijndael-api.h similarity index 100% rename from drivers/random/aes/rijndael-api.h rename to minix/drivers/system/random/aes/rijndael-api.h diff --git a/drivers/random/aes/rijndael.h b/minix/drivers/system/random/aes/rijndael.h similarity index 100% rename from drivers/random/aes/rijndael.h rename to minix/drivers/system/random/aes/rijndael.h diff --git a/drivers/random/aes/rijndael_alg.c b/minix/drivers/system/random/aes/rijndael_alg.c similarity index 100% rename from drivers/random/aes/rijndael_alg.c rename to minix/drivers/system/random/aes/rijndael_alg.c diff --git a/drivers/random/aes/rijndael_api.c b/minix/drivers/system/random/aes/rijndael_api.c similarity index 100% rename from drivers/random/aes/rijndael_api.c rename to minix/drivers/system/random/aes/rijndael_api.c diff --git a/drivers/random/aes/word_i386.h b/minix/drivers/system/random/aes/word_i386.h similarity index 100% rename from drivers/random/aes/word_i386.h rename to minix/drivers/system/random/aes/word_i386.h diff --git a/drivers/random/main.c b/minix/drivers/system/random/main.c similarity index 100% rename from drivers/random/main.c rename to minix/drivers/system/random/main.c diff --git a/drivers/random/random.c b/minix/drivers/system/random/random.c similarity index 100% rename from drivers/random/random.c rename to minix/drivers/system/random/random.c diff --git a/drivers/random/random.h b/minix/drivers/system/random/random.h similarity index 100% rename from drivers/random/random.h rename to minix/drivers/system/random/random.h diff --git a/minix/drivers/tty/Makefile b/minix/drivers/tty/Makefile new file mode 100644 index 000000000..1dc36d493 --- /dev/null +++ b/minix/drivers/tty/Makefile @@ -0,0 +1,9 @@ +.include + +.if ${MKIMAGEONLY} == "no" +SUBDIR+= pty +.endif # ${MACHINE_ARCH} == "i386" + +SUBDIR+= tty + +.include diff --git a/minix/drivers/tty/Makefile.inc b/minix/drivers/tty/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/tty/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/pty/Makefile b/minix/drivers/tty/pty/Makefile similarity index 87% rename from drivers/pty/Makefile rename to minix/drivers/tty/pty/Makefile index 007a152a8..c2d1d0d29 100644 --- a/drivers/pty/Makefile +++ b/minix/drivers/tty/pty/Makefile @@ -1,13 +1,8 @@ # Makefile for pseudo terminal driver (PTY) - PROG= pty SRCS= tty.c pty.c DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lchardriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/pty/pty.c b/minix/drivers/tty/pty/pty.c similarity index 100% rename from drivers/pty/pty.c rename to minix/drivers/tty/pty/pty.c diff --git a/drivers/pty/tty.c b/minix/drivers/tty/pty/tty.c similarity index 100% rename from drivers/pty/tty.c rename to minix/drivers/tty/pty/tty.c diff --git a/drivers/pty/tty.h b/minix/drivers/tty/pty/tty.h similarity index 100% rename from drivers/pty/tty.h rename to minix/drivers/tty/pty/tty.h diff --git a/drivers/tty/Makefile b/minix/drivers/tty/tty/Makefile similarity index 92% rename from drivers/tty/Makefile rename to minix/drivers/tty/tty/Makefile index 16dbd7abe..cdcda983f 100644 --- a/drivers/tty/Makefile +++ b/minix/drivers/tty/tty/Makefile @@ -1,5 +1,4 @@ # Makefile for terminal driver (TTY) - PROG= tty .include "arch/${MACHINE_ARCH}/Makefile.inc" @@ -9,10 +8,6 @@ SRCS += tty.c DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lchardriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - SUBDIR= keymaps # Needs kernel/const.h, etc diff --git a/drivers/tty/arch/earm/Makefile.inc b/minix/drivers/tty/tty/arch/earm/Makefile.inc similarity index 100% rename from drivers/tty/arch/earm/Makefile.inc rename to minix/drivers/tty/tty/arch/earm/Makefile.inc diff --git a/drivers/tty/arch/earm/console.c b/minix/drivers/tty/tty/arch/earm/console.c similarity index 100% rename from drivers/tty/arch/earm/console.c rename to minix/drivers/tty/tty/arch/earm/console.c diff --git a/drivers/tty/arch/earm/keyboard.c b/minix/drivers/tty/tty/arch/earm/keyboard.c similarity index 100% rename from drivers/tty/arch/earm/keyboard.c rename to minix/drivers/tty/tty/arch/earm/keyboard.c diff --git a/drivers/tty/arch/earm/omap_serial.h b/minix/drivers/tty/tty/arch/earm/omap_serial.h similarity index 100% rename from drivers/tty/arch/earm/omap_serial.h rename to minix/drivers/tty/tty/arch/earm/omap_serial.h diff --git a/drivers/tty/arch/earm/rs232.c b/minix/drivers/tty/tty/arch/earm/rs232.c similarity index 100% rename from drivers/tty/arch/earm/rs232.c rename to minix/drivers/tty/tty/arch/earm/rs232.c diff --git a/drivers/tty/arch/i386/Makefile.inc b/minix/drivers/tty/tty/arch/i386/Makefile.inc similarity index 100% rename from drivers/tty/arch/i386/Makefile.inc rename to minix/drivers/tty/tty/arch/i386/Makefile.inc diff --git a/drivers/tty/arch/i386/console.c b/minix/drivers/tty/tty/arch/i386/console.c similarity index 100% rename from drivers/tty/arch/i386/console.c rename to minix/drivers/tty/tty/arch/i386/console.c diff --git a/drivers/tty/arch/i386/keyboard.c b/minix/drivers/tty/tty/arch/i386/keyboard.c similarity index 100% rename from drivers/tty/arch/i386/keyboard.c rename to minix/drivers/tty/tty/arch/i386/keyboard.c diff --git a/drivers/tty/arch/i386/rs232.c b/minix/drivers/tty/tty/arch/i386/rs232.c similarity index 100% rename from drivers/tty/arch/i386/rs232.c rename to minix/drivers/tty/tty/arch/i386/rs232.c diff --git a/minix/drivers/tty/tty/keymaps/Makefile b/minix/drivers/tty/tty/keymaps/Makefile new file mode 100644 index 000000000..bf369cde8 --- /dev/null +++ b/minix/drivers/tty/tty/keymaps/Makefile @@ -0,0 +1,27 @@ +# Generate binary keymaps. + +.include + +FILES= dvorak.map french.map german.map italian.map japanese.map \ + latin-america.map norwegian.map polish.map russian-cp866.map \ + russian.map scandinavian.map spanish.map uk.map \ + us-std.map us-swap.map russian-cp1251.map \ + ukraine-koi8-u.map portuguese.map abnt2.map + +FILESDIR= /usr/lib/keymaps + +.SUFFIXES: .src .map + +HOST_CPPFLAGS+= -I${NETBSDSRCDIR}/minix + +.src.map: + ${_MKTARGET_CREATE} + ${HOST_CC} ${HOST_CFLAGS} ${HOST_CPPFLAGS} ${HOST_LDFLAGS} -DKEYSRC=\"$<\" -o ${.OBJDIR}/${.TARGET}_genmap ${.CURDIR}/genmap.c + ${.OBJDIR}/${.TARGET}_genmap > ${.OBJDIR}/${.TARGET} + rm -f ${.OBJDIR}/${.TARGET}_genmap + +realall: ${FILES} + +CLEANFILES+= ${FILES} + +.include diff --git a/drivers/tty/keymaps/abnt2.src b/minix/drivers/tty/tty/keymaps/abnt2.src similarity index 100% rename from drivers/tty/keymaps/abnt2.src rename to minix/drivers/tty/tty/keymaps/abnt2.src diff --git a/drivers/tty/keymaps/dvorak.src b/minix/drivers/tty/tty/keymaps/dvorak.src similarity index 100% rename from drivers/tty/keymaps/dvorak.src rename to minix/drivers/tty/tty/keymaps/dvorak.src diff --git a/drivers/tty/keymaps/french.src b/minix/drivers/tty/tty/keymaps/french.src similarity index 100% rename from drivers/tty/keymaps/french.src rename to minix/drivers/tty/tty/keymaps/french.src diff --git a/drivers/tty/keymaps/genmap.c b/minix/drivers/tty/tty/keymaps/genmap.c similarity index 87% rename from drivers/tty/keymaps/genmap.c rename to minix/drivers/tty/tty/keymaps/genmap.c index 372c9b321..b8073f9a8 100644 --- a/drivers/tty/keymaps/genmap.c +++ b/minix/drivers/tty/tty/keymaps/genmap.c @@ -7,8 +7,8 @@ #include #include #include -#include "../../../include/minix/input.h" -#include "../../../include/minix/keymap.h" +#include "include/minix/input.h" +#include "include/minix/keymap.h" keymap_t keymap = { #include KEYSRC diff --git a/drivers/tty/keymaps/german.src b/minix/drivers/tty/tty/keymaps/german.src similarity index 100% rename from drivers/tty/keymaps/german.src rename to minix/drivers/tty/tty/keymaps/german.src diff --git a/drivers/tty/keymaps/italian.src b/minix/drivers/tty/tty/keymaps/italian.src similarity index 100% rename from drivers/tty/keymaps/italian.src rename to minix/drivers/tty/tty/keymaps/italian.src diff --git a/drivers/tty/keymaps/japanese.src b/minix/drivers/tty/tty/keymaps/japanese.src similarity index 100% rename from drivers/tty/keymaps/japanese.src rename to minix/drivers/tty/tty/keymaps/japanese.src diff --git a/drivers/tty/keymaps/latin-america.src b/minix/drivers/tty/tty/keymaps/latin-america.src similarity index 100% rename from drivers/tty/keymaps/latin-america.src rename to minix/drivers/tty/tty/keymaps/latin-america.src diff --git a/drivers/tty/keymaps/norwegian.src b/minix/drivers/tty/tty/keymaps/norwegian.src similarity index 100% rename from drivers/tty/keymaps/norwegian.src rename to minix/drivers/tty/tty/keymaps/norwegian.src diff --git a/drivers/tty/keymaps/polish.src b/minix/drivers/tty/tty/keymaps/polish.src similarity index 100% rename from drivers/tty/keymaps/polish.src rename to minix/drivers/tty/tty/keymaps/polish.src diff --git a/drivers/tty/keymaps/portuguese.src b/minix/drivers/tty/tty/keymaps/portuguese.src similarity index 100% rename from drivers/tty/keymaps/portuguese.src rename to minix/drivers/tty/tty/keymaps/portuguese.src diff --git a/drivers/tty/keymaps/russian-cp1251.src b/minix/drivers/tty/tty/keymaps/russian-cp1251.src old mode 100755 new mode 100644 similarity index 100% rename from drivers/tty/keymaps/russian-cp1251.src rename to minix/drivers/tty/tty/keymaps/russian-cp1251.src diff --git a/drivers/tty/keymaps/russian-cp866.src b/minix/drivers/tty/tty/keymaps/russian-cp866.src similarity index 100% rename from drivers/tty/keymaps/russian-cp866.src rename to minix/drivers/tty/tty/keymaps/russian-cp866.src diff --git a/drivers/tty/keymaps/russian.src b/minix/drivers/tty/tty/keymaps/russian.src similarity index 100% rename from drivers/tty/keymaps/russian.src rename to minix/drivers/tty/tty/keymaps/russian.src diff --git a/drivers/tty/keymaps/scandinavian.src b/minix/drivers/tty/tty/keymaps/scandinavian.src similarity index 100% rename from drivers/tty/keymaps/scandinavian.src rename to minix/drivers/tty/tty/keymaps/scandinavian.src diff --git a/drivers/tty/keymaps/spanish.src b/minix/drivers/tty/tty/keymaps/spanish.src similarity index 100% rename from drivers/tty/keymaps/spanish.src rename to minix/drivers/tty/tty/keymaps/spanish.src diff --git a/drivers/tty/keymaps/uk.src b/minix/drivers/tty/tty/keymaps/uk.src similarity index 100% rename from drivers/tty/keymaps/uk.src rename to minix/drivers/tty/tty/keymaps/uk.src diff --git a/drivers/tty/keymaps/ukraine-koi8-u.src b/minix/drivers/tty/tty/keymaps/ukraine-koi8-u.src old mode 100755 new mode 100644 similarity index 100% rename from drivers/tty/keymaps/ukraine-koi8-u.src rename to minix/drivers/tty/tty/keymaps/ukraine-koi8-u.src diff --git a/drivers/tty/keymaps/us-std.src b/minix/drivers/tty/tty/keymaps/us-std.src similarity index 100% rename from drivers/tty/keymaps/us-std.src rename to minix/drivers/tty/tty/keymaps/us-std.src diff --git a/drivers/tty/keymaps/us-swap.src b/minix/drivers/tty/tty/keymaps/us-swap.src similarity index 100% rename from drivers/tty/keymaps/us-swap.src rename to minix/drivers/tty/tty/keymaps/us-swap.src diff --git a/drivers/tty/tty.c b/minix/drivers/tty/tty/tty.c similarity index 100% rename from drivers/tty/tty.c rename to minix/drivers/tty/tty/tty.c diff --git a/drivers/tty/tty.h b/minix/drivers/tty/tty/tty.h similarity index 100% rename from drivers/tty/tty.h rename to minix/drivers/tty/tty/tty.h diff --git a/minix/drivers/usb/Makefile b/minix/drivers/usb/Makefile new file mode 100644 index 000000000..992e26ac4 --- /dev/null +++ b/minix/drivers/usb/Makefile @@ -0,0 +1,9 @@ +.include + +.if ${MACHINE_ARCH} == "earm" +SUBDIR+= usbd +.endif # ${MACHINE_ARCH} == "earm" + +SUBDIR+= usb_storage + +.include diff --git a/minix/drivers/usb/Makefile.inc b/minix/drivers/usb/Makefile.inc new file mode 100644 index 000000000..ed158b3e7 --- /dev/null +++ b/minix/drivers/usb/Makefile.inc @@ -0,0 +1,3 @@ +MAN?= + +.include "../Makefile.inc" diff --git a/drivers/usb_storage/Makefile b/minix/drivers/usb/usb_storage/Makefile old mode 100755 new mode 100644 similarity index 94% rename from drivers/usb_storage/Makefile rename to minix/drivers/usb/usb_storage/Makefile index 430faa737..b3a667aad --- a/drivers/usb_storage/Makefile +++ b/minix/drivers/usb/usb_storage/Makefile @@ -13,8 +13,4 @@ LDADD+= -lblockdriver -lddekit_usb_client -lsys -lminlib -lddekit -lusb #LDADD+= -Wl,-Ttext=0x800000 #CPPFLAGS+= -DMASS_DEBUG -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/usb_storage/README.txt b/minix/drivers/usb/usb_storage/README.txt old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/README.txt rename to minix/drivers/usb/usb_storage/README.txt diff --git a/drivers/usb_storage/bulk.c b/minix/drivers/usb/usb_storage/bulk.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/bulk.c rename to minix/drivers/usb/usb_storage/bulk.c diff --git a/drivers/usb_storage/bulk.h b/minix/drivers/usb/usb_storage/bulk.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/bulk.h rename to minix/drivers/usb/usb_storage/bulk.h diff --git a/drivers/usb_storage/common.h b/minix/drivers/usb/usb_storage/common.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/common.h rename to minix/drivers/usb/usb_storage/common.h diff --git a/drivers/usb_storage/scsi.c b/minix/drivers/usb/usb_storage/scsi.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/scsi.c rename to minix/drivers/usb/usb_storage/scsi.c diff --git a/drivers/usb_storage/scsi.h b/minix/drivers/usb/usb_storage/scsi.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/scsi.h rename to minix/drivers/usb/usb_storage/scsi.h diff --git a/drivers/usb_storage/urb_helper.c b/minix/drivers/usb/usb_storage/urb_helper.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/urb_helper.c rename to minix/drivers/usb/usb_storage/urb_helper.c diff --git a/drivers/usb_storage/urb_helper.h b/minix/drivers/usb/usb_storage/urb_helper.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/urb_helper.h rename to minix/drivers/usb/usb_storage/urb_helper.h diff --git a/drivers/usb_storage/usb_storage.c b/minix/drivers/usb/usb_storage/usb_storage.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/usb_storage.c rename to minix/drivers/usb/usb_storage/usb_storage.c diff --git a/drivers/usb_storage/usb_storage.conf b/minix/drivers/usb/usb_storage/usb_storage.conf old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/usb_storage.conf rename to minix/drivers/usb/usb_storage/usb_storage.conf diff --git a/drivers/usb_storage/usb_storage.h b/minix/drivers/usb/usb_storage/usb_storage.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usb_storage/usb_storage.h rename to minix/drivers/usb/usb_storage/usb_storage.h diff --git a/drivers/usbd/Makefile b/minix/drivers/usb/usbd/Makefile old mode 100755 new mode 100644 similarity index 97% rename from drivers/usbd/Makefile rename to minix/drivers/usb/usbd/Makefile index 61048cdc8..739f2f56d --- a/drivers/usbd/Makefile +++ b/minix/drivers/usb/usbd/Makefile @@ -1,11 +1,8 @@ # Makefile for usb host controllers - -.if ${MACHINE_ARCH} == "earm" - .include +.if ${MACHINE_ARCH} == "earm" SUBDIR= .WAIT base/earm +.endif .include - -.endif diff --git a/drivers/usbd/README.txt b/minix/drivers/usb/usbd/README.txt old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/README.txt rename to minix/drivers/usb/usbd/README.txt diff --git a/drivers/usbd/base/earm/Makefile b/minix/drivers/usb/usbd/base/earm/Makefile old mode 100755 new mode 100644 similarity index 94% rename from drivers/usbd/base/earm/Makefile rename to minix/drivers/usb/usbd/base/earm/Makefile index 26eb439d2..e7babf6a1 --- a/drivers/usbd/base/earm/Makefile +++ b/minix/drivers/usb/usbd/base/earm/Makefile @@ -1,9 +1,9 @@ -# # Makefile for the EARM USBD -# PROG= usbd SRCS= usbd.c usbd_earm.c hcd.c hcd_common.c hcd_ddekit.c musb_am335x.c musb_core.c +MAN= +BINDIR= /usr/sbin .PATH: ${.CURDIR}/../ ${.CURDIR}/../../hcd ${.CURDIR}/../../hcd/musb @@ -12,8 +12,4 @@ CPPFLAGS+= -I${.CURDIR}/../../include DPADD+= ${LIBDDEKIT} ${LIBDDEKIT_USB_SERVER} ${LIBDEVMAN} ${LIBUSB} ${LIBMINC} ${LIBCLKCONF} ${LIBSYS} ${LIBMINLIB} LDADD+= -lddekit -lddekit_usb_server -ldevman -lusb -lminc -lclkconf -lsys -lminlib -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/usbd/base/earm/usbd_earm.c b/minix/drivers/usb/usbd/base/earm/usbd_earm.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/base/earm/usbd_earm.c rename to minix/drivers/usb/usbd/base/earm/usbd_earm.c diff --git a/drivers/usbd/base/usbd.c b/minix/drivers/usb/usbd/base/usbd.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/base/usbd.c rename to minix/drivers/usb/usbd/base/usbd.c diff --git a/drivers/usbd/hcd/hcd.c b/minix/drivers/usb/usbd/hcd/hcd.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/hcd/hcd.c rename to minix/drivers/usb/usbd/hcd/hcd.c diff --git a/drivers/usbd/hcd/hcd_common.c b/minix/drivers/usb/usbd/hcd/hcd_common.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/hcd/hcd_common.c rename to minix/drivers/usb/usbd/hcd/hcd_common.c diff --git a/drivers/usbd/hcd/hcd_ddekit.c b/minix/drivers/usb/usbd/hcd/hcd_ddekit.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/hcd/hcd_ddekit.c rename to minix/drivers/usb/usbd/hcd/hcd_ddekit.c diff --git a/drivers/usbd/hcd/musb/musb_am335x.c b/minix/drivers/usb/usbd/hcd/musb/musb_am335x.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/hcd/musb/musb_am335x.c rename to minix/drivers/usb/usbd/hcd/musb/musb_am335x.c diff --git a/drivers/usbd/hcd/musb/musb_core.c b/minix/drivers/usb/usbd/hcd/musb/musb_core.c old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/hcd/musb/musb_core.c rename to minix/drivers/usb/usbd/hcd/musb/musb_core.c diff --git a/drivers/usbd/hcd/musb/musb_core.h b/minix/drivers/usb/usbd/hcd/musb/musb_core.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/hcd/musb/musb_core.h rename to minix/drivers/usb/usbd/hcd/musb/musb_core.h diff --git a/drivers/usbd/hcd/musb/musb_regs.h b/minix/drivers/usb/usbd/hcd/musb/musb_regs.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/hcd/musb/musb_regs.h rename to minix/drivers/usb/usbd/hcd/musb/musb_regs.h diff --git a/drivers/usbd/include/usb/hcd_common.h b/minix/drivers/usb/usbd/include/usb/hcd_common.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/include/usb/hcd_common.h rename to minix/drivers/usb/usbd/include/usb/hcd_common.h diff --git a/drivers/usbd/include/usb/hcd_ddekit.h b/minix/drivers/usb/usbd/include/usb/hcd_ddekit.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/include/usb/hcd_ddekit.h rename to minix/drivers/usb/usbd/include/usb/hcd_ddekit.h diff --git a/drivers/usbd/include/usb/hcd_interface.h b/minix/drivers/usb/usbd/include/usb/hcd_interface.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/include/usb/hcd_interface.h rename to minix/drivers/usb/usbd/include/usb/hcd_interface.h diff --git a/drivers/usbd/include/usb/hcd_platforms.h b/minix/drivers/usb/usbd/include/usb/hcd_platforms.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/include/usb/hcd_platforms.h rename to minix/drivers/usb/usbd/include/usb/hcd_platforms.h diff --git a/drivers/usbd/include/usb/usb_common.h b/minix/drivers/usb/usbd/include/usb/usb_common.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/include/usb/usb_common.h rename to minix/drivers/usb/usbd/include/usb/usb_common.h diff --git a/drivers/usbd/include/usb/usbd_interface.h b/minix/drivers/usb/usbd/include/usb/usbd_interface.h old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/include/usb/usbd_interface.h rename to minix/drivers/usb/usbd/include/usb/usbd_interface.h diff --git a/drivers/usbd/usbd.conf b/minix/drivers/usb/usbd/usbd.conf old mode 100755 new mode 100644 similarity index 100% rename from drivers/usbd/usbd.conf rename to minix/drivers/usb/usbd/usbd.conf diff --git a/minix/drivers/video/Makefile b/minix/drivers/video/Makefile new file mode 100644 index 000000000..747857337 --- /dev/null +++ b/minix/drivers/video/Makefile @@ -0,0 +1,8 @@ +.include + +.if ${MACHINE_ARCH} == "earm" +SUBDIR+= fb +SUBDIR+= tda19988 +.endif # ${MACHINE_ARCH} == "earm" + +.include diff --git a/minix/drivers/video/Makefile.inc b/minix/drivers/video/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/video/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/fb/Makefile b/minix/drivers/video/fb/Makefile similarity index 94% rename from drivers/fb/Makefile rename to minix/drivers/video/fb/Makefile index 493892fb4..54bcdff85 100644 --- a/drivers/fb/Makefile +++ b/minix/drivers/video/fb/Makefile @@ -15,8 +15,4 @@ CPPFLAGS+= -I${.CURDIR} -I${NETBSDSRCDIR}/sys DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/fb/README.txt b/minix/drivers/video/fb/README.txt similarity index 100% rename from drivers/fb/README.txt rename to minix/drivers/video/fb/README.txt diff --git a/drivers/fb/arch/earm/Makefile.inc b/minix/drivers/video/fb/arch/earm/Makefile.inc similarity index 100% rename from drivers/fb/arch/earm/Makefile.inc rename to minix/drivers/video/fb/arch/earm/Makefile.inc diff --git a/drivers/fb/arch/earm/dss.h b/minix/drivers/video/fb/arch/earm/dss.h similarity index 100% rename from drivers/fb/arch/earm/dss.h rename to minix/drivers/video/fb/arch/earm/dss.h diff --git a/drivers/fb/arch/earm/fb_arch.c b/minix/drivers/video/fb/arch/earm/fb_arch.c similarity index 100% rename from drivers/fb/arch/earm/fb_arch.c rename to minix/drivers/video/fb/arch/earm/fb_arch.c diff --git a/drivers/fb/fb.c b/minix/drivers/video/fb/fb.c similarity index 100% rename from drivers/fb/fb.c rename to minix/drivers/video/fb/fb.c diff --git a/drivers/fb/fb.h b/minix/drivers/video/fb/fb.h similarity index 100% rename from drivers/fb/fb.h rename to minix/drivers/video/fb/fb.h diff --git a/drivers/fb/fb_edid.c b/minix/drivers/video/fb/fb_edid.c similarity index 100% rename from drivers/fb/fb_edid.c rename to minix/drivers/video/fb/fb_edid.c diff --git a/drivers/fb/fb_edid.h b/minix/drivers/video/fb/fb_edid.h similarity index 100% rename from drivers/fb/fb_edid.h rename to minix/drivers/video/fb/fb_edid.h diff --git a/drivers/fb/logos.h b/minix/drivers/video/fb/logos.h similarity index 100% rename from drivers/fb/logos.h rename to minix/drivers/video/fb/logos.h diff --git a/drivers/tda19988/Makefile b/minix/drivers/video/tda19988/Makefile similarity index 91% rename from drivers/tda19988/Makefile rename to minix/drivers/video/tda19988/Makefile index f9605d9e0..fe4358dc7 100644 --- a/drivers/tda19988/Makefile +++ b/minix/drivers/video/tda19988/Makefile @@ -5,10 +5,6 @@ SRCS= tda19988.c DPADD+= ${LIBI2CDRIVER} ${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lblockdriver -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${NETBSDSRCDIR} .include diff --git a/drivers/tda19988/README.txt b/minix/drivers/video/tda19988/README.txt similarity index 100% rename from drivers/tda19988/README.txt rename to minix/drivers/video/tda19988/README.txt diff --git a/drivers/tda19988/tda19988.c b/minix/drivers/video/tda19988/tda19988.c similarity index 100% rename from drivers/tda19988/tda19988.c rename to minix/drivers/video/tda19988/tda19988.c diff --git a/minix/drivers/vmm_guest/Makefile b/minix/drivers/vmm_guest/Makefile new file mode 100644 index 000000000..054df04ca --- /dev/null +++ b/minix/drivers/vmm_guest/Makefile @@ -0,0 +1,7 @@ +.include + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= vbox +.endif # ${MACHINE_ARCH} == "i386" + +.include diff --git a/minix/drivers/vmm_guest/Makefile.inc b/minix/drivers/vmm_guest/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/drivers/vmm_guest/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/drivers/vbox/Makefile b/minix/drivers/vmm_guest/vbox/Makefile similarity index 85% rename from drivers/vbox/Makefile rename to minix/drivers/vmm_guest/vbox/Makefile index 843298bd1..a8aab8b31 100644 --- a/drivers/vbox/Makefile +++ b/minix/drivers/vmm_guest/vbox/Makefile @@ -5,8 +5,4 @@ SRCS= vbox.c hgcm.c err.c DPADD+= ${LIBSYS} LDADD+= -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/drivers/vbox/err.c b/minix/drivers/vmm_guest/vbox/err.c similarity index 100% rename from drivers/vbox/err.c rename to minix/drivers/vmm_guest/vbox/err.c diff --git a/drivers/vbox/hgcm.c b/minix/drivers/vmm_guest/vbox/hgcm.c similarity index 100% rename from drivers/vbox/hgcm.c rename to minix/drivers/vmm_guest/vbox/hgcm.c diff --git a/drivers/vbox/proto.h b/minix/drivers/vmm_guest/vbox/proto.h similarity index 100% rename from drivers/vbox/proto.h rename to minix/drivers/vmm_guest/vbox/proto.h diff --git a/drivers/vbox/vbox.c b/minix/drivers/vmm_guest/vbox/vbox.c similarity index 100% rename from drivers/vbox/vbox.c rename to minix/drivers/vmm_guest/vbox/vbox.c diff --git a/drivers/vbox/vmmdev.h b/minix/drivers/vmm_guest/vbox/vmmdev.h similarity index 100% rename from drivers/vbox/vmmdev.h rename to minix/drivers/vmm_guest/vbox/vmmdev.h diff --git a/minix/fs/Makefile b/minix/fs/Makefile new file mode 100644 index 000000000..0c17c45c1 --- /dev/null +++ b/minix/fs/Makefile @@ -0,0 +1,17 @@ +.include + +SUBDIR+= mfs +SUBDIR+= pfs + +.if ${MKIMAGEONLY} == "no" +SUBDIR+= ext2 +SUBDIR+= iso9660fs +SUBDIR+= procfs + +. if ${MACHINE_ARCH} == "i386" +SUBDIR+= hgfs +SUBDIR+= vbfs +. endif # ${MACHINE_ARCH} == "i386" +.endif # ${MKIMAGEONLY} == "no" + +.include diff --git a/minix/fs/Makefile.inc b/minix/fs/Makefile.inc new file mode 100644 index 000000000..5c329c729 --- /dev/null +++ b/minix/fs/Makefile.inc @@ -0,0 +1,7 @@ +BINDIR?=/usr/sbin +MAN?= + +LDADD+= -lminlib -lcompat_minix +DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} + +.include "../Makefile.inc" diff --git a/servers/ext2/Makefile b/minix/fs/ext2/Makefile similarity index 100% rename from servers/ext2/Makefile rename to minix/fs/ext2/Makefile diff --git a/servers/ext2/balloc.c b/minix/fs/ext2/balloc.c similarity index 100% rename from servers/ext2/balloc.c rename to minix/fs/ext2/balloc.c diff --git a/servers/ext2/buf.h b/minix/fs/ext2/buf.h similarity index 100% rename from servers/ext2/buf.h rename to minix/fs/ext2/buf.h diff --git a/servers/ext2/const.h b/minix/fs/ext2/const.h similarity index 100% rename from servers/ext2/const.h rename to minix/fs/ext2/const.h diff --git a/servers/ext2/fs.h b/minix/fs/ext2/fs.h similarity index 100% rename from servers/ext2/fs.h rename to minix/fs/ext2/fs.h diff --git a/servers/ext2/glo.h b/minix/fs/ext2/glo.h similarity index 100% rename from servers/ext2/glo.h rename to minix/fs/ext2/glo.h diff --git a/servers/ext2/ialloc.c b/minix/fs/ext2/ialloc.c similarity index 100% rename from servers/ext2/ialloc.c rename to minix/fs/ext2/ialloc.c diff --git a/servers/ext2/inode.c b/minix/fs/ext2/inode.c similarity index 100% rename from servers/ext2/inode.c rename to minix/fs/ext2/inode.c diff --git a/servers/ext2/inode.h b/minix/fs/ext2/inode.h similarity index 100% rename from servers/ext2/inode.h rename to minix/fs/ext2/inode.h diff --git a/servers/ext2/link.c b/minix/fs/ext2/link.c similarity index 100% rename from servers/ext2/link.c rename to minix/fs/ext2/link.c diff --git a/servers/ext2/main.c b/minix/fs/ext2/main.c similarity index 100% rename from servers/ext2/main.c rename to minix/fs/ext2/main.c diff --git a/servers/ext2/misc.c b/minix/fs/ext2/misc.c similarity index 100% rename from servers/ext2/misc.c rename to minix/fs/ext2/misc.c diff --git a/servers/ext2/mount.c b/minix/fs/ext2/mount.c similarity index 100% rename from servers/ext2/mount.c rename to minix/fs/ext2/mount.c diff --git a/servers/ext2/open.c b/minix/fs/ext2/open.c similarity index 100% rename from servers/ext2/open.c rename to minix/fs/ext2/open.c diff --git a/servers/ext2/path.c b/minix/fs/ext2/path.c similarity index 100% rename from servers/ext2/path.c rename to minix/fs/ext2/path.c diff --git a/servers/ext2/protect.c b/minix/fs/ext2/protect.c similarity index 100% rename from servers/ext2/protect.c rename to minix/fs/ext2/protect.c diff --git a/servers/ext2/proto.h b/minix/fs/ext2/proto.h similarity index 100% rename from servers/ext2/proto.h rename to minix/fs/ext2/proto.h diff --git a/servers/ext2/read.c b/minix/fs/ext2/read.c similarity index 100% rename from servers/ext2/read.c rename to minix/fs/ext2/read.c diff --git a/servers/ext2/stadir.c b/minix/fs/ext2/stadir.c similarity index 100% rename from servers/ext2/stadir.c rename to minix/fs/ext2/stadir.c diff --git a/servers/ext2/super.c b/minix/fs/ext2/super.c similarity index 100% rename from servers/ext2/super.c rename to minix/fs/ext2/super.c diff --git a/servers/ext2/super.h b/minix/fs/ext2/super.h similarity index 100% rename from servers/ext2/super.h rename to minix/fs/ext2/super.h diff --git a/servers/ext2/table.c b/minix/fs/ext2/table.c similarity index 100% rename from servers/ext2/table.c rename to minix/fs/ext2/table.c diff --git a/servers/ext2/time.c b/minix/fs/ext2/time.c similarity index 100% rename from servers/ext2/time.c rename to minix/fs/ext2/time.c diff --git a/servers/ext2/type.h b/minix/fs/ext2/type.h similarity index 100% rename from servers/ext2/type.h rename to minix/fs/ext2/type.h diff --git a/servers/ext2/utility.c b/minix/fs/ext2/utility.c similarity index 100% rename from servers/ext2/utility.c rename to minix/fs/ext2/utility.c diff --git a/servers/ext2/write.c b/minix/fs/ext2/write.c similarity index 100% rename from servers/ext2/write.c rename to minix/fs/ext2/write.c diff --git a/servers/hgfs/Makefile b/minix/fs/hgfs/Makefile similarity index 100% rename from servers/hgfs/Makefile rename to minix/fs/hgfs/Makefile diff --git a/servers/hgfs/hgfs.c b/minix/fs/hgfs/hgfs.c similarity index 100% rename from servers/hgfs/hgfs.c rename to minix/fs/hgfs/hgfs.c diff --git a/servers/iso9660fs/Makefile b/minix/fs/iso9660fs/Makefile similarity index 100% rename from servers/iso9660fs/Makefile rename to minix/fs/iso9660fs/Makefile diff --git a/servers/iso9660fs/buf.h b/minix/fs/iso9660fs/buf.h similarity index 100% rename from servers/iso9660fs/buf.h rename to minix/fs/iso9660fs/buf.h diff --git a/servers/iso9660fs/const.h b/minix/fs/iso9660fs/const.h similarity index 100% rename from servers/iso9660fs/const.h rename to minix/fs/iso9660fs/const.h diff --git a/servers/iso9660fs/glo.h b/minix/fs/iso9660fs/glo.h similarity index 100% rename from servers/iso9660fs/glo.h rename to minix/fs/iso9660fs/glo.h diff --git a/servers/iso9660fs/inc.h b/minix/fs/iso9660fs/inc.h similarity index 100% rename from servers/iso9660fs/inc.h rename to minix/fs/iso9660fs/inc.h diff --git a/servers/iso9660fs/inode.c b/minix/fs/iso9660fs/inode.c similarity index 100% rename from servers/iso9660fs/inode.c rename to minix/fs/iso9660fs/inode.c diff --git a/servers/iso9660fs/inode.h b/minix/fs/iso9660fs/inode.h similarity index 100% rename from servers/iso9660fs/inode.h rename to minix/fs/iso9660fs/inode.h diff --git a/servers/iso9660fs/main.c b/minix/fs/iso9660fs/main.c similarity index 100% rename from servers/iso9660fs/main.c rename to minix/fs/iso9660fs/main.c diff --git a/servers/iso9660fs/misc.c b/minix/fs/iso9660fs/misc.c similarity index 100% rename from servers/iso9660fs/misc.c rename to minix/fs/iso9660fs/misc.c diff --git a/servers/iso9660fs/mount.c b/minix/fs/iso9660fs/mount.c similarity index 100% rename from servers/iso9660fs/mount.c rename to minix/fs/iso9660fs/mount.c diff --git a/servers/iso9660fs/path.c b/minix/fs/iso9660fs/path.c similarity index 100% rename from servers/iso9660fs/path.c rename to minix/fs/iso9660fs/path.c diff --git a/servers/iso9660fs/proto.h b/minix/fs/iso9660fs/proto.h similarity index 100% rename from servers/iso9660fs/proto.h rename to minix/fs/iso9660fs/proto.h diff --git a/servers/iso9660fs/read.c b/minix/fs/iso9660fs/read.c similarity index 100% rename from servers/iso9660fs/read.c rename to minix/fs/iso9660fs/read.c diff --git a/servers/iso9660fs/stadir.c b/minix/fs/iso9660fs/stadir.c similarity index 100% rename from servers/iso9660fs/stadir.c rename to minix/fs/iso9660fs/stadir.c diff --git a/servers/iso9660fs/super.c b/minix/fs/iso9660fs/super.c similarity index 100% rename from servers/iso9660fs/super.c rename to minix/fs/iso9660fs/super.c diff --git a/servers/iso9660fs/super.h b/minix/fs/iso9660fs/super.h similarity index 100% rename from servers/iso9660fs/super.h rename to minix/fs/iso9660fs/super.h diff --git a/servers/iso9660fs/table.c b/minix/fs/iso9660fs/table.c similarity index 100% rename from servers/iso9660fs/table.c rename to minix/fs/iso9660fs/table.c diff --git a/servers/iso9660fs/utility.c b/minix/fs/iso9660fs/utility.c similarity index 100% rename from servers/iso9660fs/utility.c rename to minix/fs/iso9660fs/utility.c diff --git a/servers/mfs/Makefile b/minix/fs/mfs/Makefile similarity index 100% rename from servers/mfs/Makefile rename to minix/fs/mfs/Makefile diff --git a/servers/mfs/buf.h b/minix/fs/mfs/buf.h similarity index 100% rename from servers/mfs/buf.h rename to minix/fs/mfs/buf.h diff --git a/servers/mfs/cache.c b/minix/fs/mfs/cache.c similarity index 100% rename from servers/mfs/cache.c rename to minix/fs/mfs/cache.c diff --git a/servers/mfs/clean.h b/minix/fs/mfs/clean.h similarity index 100% rename from servers/mfs/clean.h rename to minix/fs/mfs/clean.h diff --git a/servers/mfs/const.h b/minix/fs/mfs/const.h similarity index 100% rename from servers/mfs/const.h rename to minix/fs/mfs/const.h diff --git a/servers/mfs/fs.h b/minix/fs/mfs/fs.h similarity index 100% rename from servers/mfs/fs.h rename to minix/fs/mfs/fs.h diff --git a/servers/mfs/glo.h b/minix/fs/mfs/glo.h similarity index 100% rename from servers/mfs/glo.h rename to minix/fs/mfs/glo.h diff --git a/servers/mfs/inode.c b/minix/fs/mfs/inode.c similarity index 100% rename from servers/mfs/inode.c rename to minix/fs/mfs/inode.c diff --git a/servers/mfs/inode.h b/minix/fs/mfs/inode.h similarity index 100% rename from servers/mfs/inode.h rename to minix/fs/mfs/inode.h diff --git a/servers/mfs/link.c b/minix/fs/mfs/link.c similarity index 100% rename from servers/mfs/link.c rename to minix/fs/mfs/link.c diff --git a/servers/mfs/main.c b/minix/fs/mfs/main.c similarity index 100% rename from servers/mfs/main.c rename to minix/fs/mfs/main.c diff --git a/servers/mfs/mfsdir.h b/minix/fs/mfs/mfsdir.h similarity index 100% rename from servers/mfs/mfsdir.h rename to minix/fs/mfs/mfsdir.h diff --git a/servers/mfs/misc.c b/minix/fs/mfs/misc.c similarity index 100% rename from servers/mfs/misc.c rename to minix/fs/mfs/misc.c diff --git a/servers/mfs/mount.c b/minix/fs/mfs/mount.c similarity index 100% rename from servers/mfs/mount.c rename to minix/fs/mfs/mount.c diff --git a/servers/mfs/open.c b/minix/fs/mfs/open.c similarity index 100% rename from servers/mfs/open.c rename to minix/fs/mfs/open.c diff --git a/servers/mfs/path.c b/minix/fs/mfs/path.c similarity index 100% rename from servers/mfs/path.c rename to minix/fs/mfs/path.c diff --git a/servers/mfs/pipe.c b/minix/fs/mfs/pipe.c similarity index 100% rename from servers/mfs/pipe.c rename to minix/fs/mfs/pipe.c diff --git a/servers/mfs/protect.c b/minix/fs/mfs/protect.c similarity index 100% rename from servers/mfs/protect.c rename to minix/fs/mfs/protect.c diff --git a/servers/mfs/proto.h b/minix/fs/mfs/proto.h similarity index 100% rename from servers/mfs/proto.h rename to minix/fs/mfs/proto.h diff --git a/servers/mfs/read.c b/minix/fs/mfs/read.c similarity index 100% rename from servers/mfs/read.c rename to minix/fs/mfs/read.c diff --git a/servers/mfs/stadir.c b/minix/fs/mfs/stadir.c similarity index 100% rename from servers/mfs/stadir.c rename to minix/fs/mfs/stadir.c diff --git a/servers/mfs/stats.c b/minix/fs/mfs/stats.c similarity index 100% rename from servers/mfs/stats.c rename to minix/fs/mfs/stats.c diff --git a/servers/mfs/super.c b/minix/fs/mfs/super.c similarity index 100% rename from servers/mfs/super.c rename to minix/fs/mfs/super.c diff --git a/servers/mfs/super.h b/minix/fs/mfs/super.h similarity index 100% rename from servers/mfs/super.h rename to minix/fs/mfs/super.h diff --git a/servers/mfs/table.c b/minix/fs/mfs/table.c similarity index 100% rename from servers/mfs/table.c rename to minix/fs/mfs/table.c diff --git a/servers/mfs/time.c b/minix/fs/mfs/time.c similarity index 100% rename from servers/mfs/time.c rename to minix/fs/mfs/time.c diff --git a/servers/mfs/type.h b/minix/fs/mfs/type.h similarity index 100% rename from servers/mfs/type.h rename to minix/fs/mfs/type.h diff --git a/servers/mfs/utility.c b/minix/fs/mfs/utility.c similarity index 100% rename from servers/mfs/utility.c rename to minix/fs/mfs/utility.c diff --git a/servers/mfs/write.c b/minix/fs/mfs/write.c similarity index 100% rename from servers/mfs/write.c rename to minix/fs/mfs/write.c diff --git a/servers/pfs/Makefile b/minix/fs/pfs/Makefile similarity index 100% rename from servers/pfs/Makefile rename to minix/fs/pfs/Makefile diff --git a/servers/pfs/buf.h b/minix/fs/pfs/buf.h similarity index 100% rename from servers/pfs/buf.h rename to minix/fs/pfs/buf.h diff --git a/servers/pfs/buffer.c b/minix/fs/pfs/buffer.c similarity index 100% rename from servers/pfs/buffer.c rename to minix/fs/pfs/buffer.c diff --git a/servers/pfs/const.h b/minix/fs/pfs/const.h similarity index 100% rename from servers/pfs/const.h rename to minix/fs/pfs/const.h diff --git a/servers/pfs/fs.h b/minix/fs/pfs/fs.h similarity index 100% rename from servers/pfs/fs.h rename to minix/fs/pfs/fs.h diff --git a/servers/pfs/glo.h b/minix/fs/pfs/glo.h similarity index 100% rename from servers/pfs/glo.h rename to minix/fs/pfs/glo.h diff --git a/servers/pfs/inode.c b/minix/fs/pfs/inode.c similarity index 100% rename from servers/pfs/inode.c rename to minix/fs/pfs/inode.c diff --git a/servers/pfs/inode.h b/minix/fs/pfs/inode.h similarity index 100% rename from servers/pfs/inode.h rename to minix/fs/pfs/inode.h diff --git a/servers/pfs/link.c b/minix/fs/pfs/link.c similarity index 100% rename from servers/pfs/link.c rename to minix/fs/pfs/link.c diff --git a/servers/pfs/main.c b/minix/fs/pfs/main.c similarity index 100% rename from servers/pfs/main.c rename to minix/fs/pfs/main.c diff --git a/servers/pfs/misc.c b/minix/fs/pfs/misc.c similarity index 100% rename from servers/pfs/misc.c rename to minix/fs/pfs/misc.c diff --git a/servers/pfs/mount.c b/minix/fs/pfs/mount.c similarity index 100% rename from servers/pfs/mount.c rename to minix/fs/pfs/mount.c diff --git a/servers/pfs/open.c b/minix/fs/pfs/open.c similarity index 100% rename from servers/pfs/open.c rename to minix/fs/pfs/open.c diff --git a/servers/pfs/proto.h b/minix/fs/pfs/proto.h similarity index 100% rename from servers/pfs/proto.h rename to minix/fs/pfs/proto.h diff --git a/servers/pfs/read.c b/minix/fs/pfs/read.c similarity index 100% rename from servers/pfs/read.c rename to minix/fs/pfs/read.c diff --git a/servers/pfs/stadir.c b/minix/fs/pfs/stadir.c similarity index 100% rename from servers/pfs/stadir.c rename to minix/fs/pfs/stadir.c diff --git a/servers/pfs/super.c b/minix/fs/pfs/super.c similarity index 100% rename from servers/pfs/super.c rename to minix/fs/pfs/super.c diff --git a/servers/pfs/table.c b/minix/fs/pfs/table.c similarity index 100% rename from servers/pfs/table.c rename to minix/fs/pfs/table.c diff --git a/servers/pfs/utility.c b/minix/fs/pfs/utility.c similarity index 100% rename from servers/pfs/utility.c rename to minix/fs/pfs/utility.c diff --git a/servers/procfs/Makefile b/minix/fs/procfs/Makefile similarity index 67% rename from servers/procfs/Makefile rename to minix/fs/procfs/Makefile index 610fb3711..26acea459 100644 --- a/servers/procfs/Makefile +++ b/minix/fs/procfs/Makefile @@ -6,7 +6,9 @@ PROG= procfs SRCS= buf.c main.c pid.c root.c tree.c util.c cpuinfo.c -CPPFLAGS+= -I${NETBSDSRCDIR} -I${NETBSDSRCDIR}/servers +CPPFLAGS+= -I${NETBSDSRCDIR}/minix +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/fs +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/servers DPADD+= ${LIBVTREEFS} ${LIBMINLIB} LDADD+= -lvtreefs -lminlib diff --git a/servers/procfs/NOTES b/minix/fs/procfs/NOTES similarity index 100% rename from servers/procfs/NOTES rename to minix/fs/procfs/NOTES diff --git a/servers/procfs/buf.c b/minix/fs/procfs/buf.c similarity index 100% rename from servers/procfs/buf.c rename to minix/fs/procfs/buf.c diff --git a/servers/procfs/const.h b/minix/fs/procfs/const.h similarity index 100% rename from servers/procfs/const.h rename to minix/fs/procfs/const.h diff --git a/servers/procfs/cpuinfo.c b/minix/fs/procfs/cpuinfo.c similarity index 100% rename from servers/procfs/cpuinfo.c rename to minix/fs/procfs/cpuinfo.c diff --git a/servers/procfs/cpuinfo.h b/minix/fs/procfs/cpuinfo.h similarity index 100% rename from servers/procfs/cpuinfo.h rename to minix/fs/procfs/cpuinfo.h diff --git a/servers/procfs/glo.h b/minix/fs/procfs/glo.h similarity index 100% rename from servers/procfs/glo.h rename to minix/fs/procfs/glo.h diff --git a/servers/procfs/inc.h b/minix/fs/procfs/inc.h similarity index 100% rename from servers/procfs/inc.h rename to minix/fs/procfs/inc.h diff --git a/servers/procfs/main.c b/minix/fs/procfs/main.c similarity index 100% rename from servers/procfs/main.c rename to minix/fs/procfs/main.c diff --git a/servers/procfs/pid.c b/minix/fs/procfs/pid.c similarity index 100% rename from servers/procfs/pid.c rename to minix/fs/procfs/pid.c diff --git a/servers/procfs/proto.h b/minix/fs/procfs/proto.h similarity index 100% rename from servers/procfs/proto.h rename to minix/fs/procfs/proto.h diff --git a/servers/procfs/root.c b/minix/fs/procfs/root.c similarity index 100% rename from servers/procfs/root.c rename to minix/fs/procfs/root.c diff --git a/servers/procfs/tree.c b/minix/fs/procfs/tree.c similarity index 100% rename from servers/procfs/tree.c rename to minix/fs/procfs/tree.c diff --git a/servers/procfs/type.h b/minix/fs/procfs/type.h similarity index 100% rename from servers/procfs/type.h rename to minix/fs/procfs/type.h diff --git a/servers/procfs/util.c b/minix/fs/procfs/util.c similarity index 100% rename from servers/procfs/util.c rename to minix/fs/procfs/util.c diff --git a/servers/vbfs/Makefile b/minix/fs/vbfs/Makefile similarity index 100% rename from servers/vbfs/Makefile rename to minix/fs/vbfs/Makefile diff --git a/servers/vbfs/vbfs.c b/minix/fs/vbfs/vbfs.c similarity index 100% rename from servers/vbfs/vbfs.c rename to minix/fs/vbfs/vbfs.c diff --git a/minix/include/Makefile b/minix/include/Makefile new file mode 100644 index 000000000..c11cb7824 --- /dev/null +++ b/minix/include/Makefile @@ -0,0 +1,19 @@ +# Doing a make includes builds /usr/include + +NOOBJ= # defined + +INCS+= env.h fetch.h lib.h libutil.h varargs.h + +.include + +INCSDIR= /usr/include + +SUBDIR+= arch +SUBDIR+= ddekit +SUBDIR+= libdde +SUBDIR+= minix +SUBDIR+= net +SUBDIR+= sys + +.include +.include diff --git a/include/arch/Makefile b/minix/include/arch/Makefile similarity index 100% rename from include/arch/Makefile rename to minix/include/arch/Makefile diff --git a/include/arch/earm/Makefile b/minix/include/arch/earm/Makefile similarity index 100% rename from include/arch/earm/Makefile rename to minix/include/arch/earm/Makefile diff --git a/include/arch/earm/include/Makefile b/minix/include/arch/earm/include/Makefile similarity index 100% rename from include/arch/earm/include/Makefile rename to minix/include/arch/earm/include/Makefile diff --git a/include/arch/earm/include/archconst.h b/minix/include/arch/earm/include/archconst.h similarity index 100% rename from include/arch/earm/include/archconst.h rename to minix/include/arch/earm/include/archconst.h diff --git a/include/arch/earm/include/archtypes.h b/minix/include/arch/earm/include/archtypes.h similarity index 100% rename from include/arch/earm/include/archtypes.h rename to minix/include/arch/earm/include/archtypes.h diff --git a/include/arch/earm/include/diskparm.h b/minix/include/arch/earm/include/diskparm.h similarity index 100% rename from include/arch/earm/include/diskparm.h rename to minix/include/arch/earm/include/diskparm.h diff --git a/include/arch/earm/include/elf.h b/minix/include/arch/earm/include/elf.h similarity index 100% rename from include/arch/earm/include/elf.h rename to minix/include/arch/earm/include/elf.h diff --git a/include/arch/earm/include/interrupt.h b/minix/include/arch/earm/include/interrupt.h similarity index 100% rename from include/arch/earm/include/interrupt.h rename to minix/include/arch/earm/include/interrupt.h diff --git a/include/arch/earm/include/ipcconst.h b/minix/include/arch/earm/include/ipcconst.h similarity index 100% rename from include/arch/earm/include/ipcconst.h rename to minix/include/arch/earm/include/ipcconst.h diff --git a/include/arch/earm/include/memory.h b/minix/include/arch/earm/include/memory.h similarity index 100% rename from include/arch/earm/include/memory.h rename to minix/include/arch/earm/include/memory.h diff --git a/include/arch/earm/include/multiboot.h b/minix/include/arch/earm/include/multiboot.h similarity index 100% rename from include/arch/earm/include/multiboot.h rename to minix/include/arch/earm/include/multiboot.h diff --git a/include/arch/earm/include/partition.h b/minix/include/arch/earm/include/partition.h similarity index 100% rename from include/arch/earm/include/partition.h rename to minix/include/arch/earm/include/partition.h diff --git a/include/arch/earm/include/stackframe.h b/minix/include/arch/earm/include/stackframe.h similarity index 100% rename from include/arch/earm/include/stackframe.h rename to minix/include/arch/earm/include/stackframe.h diff --git a/include/arch/earm/include/vm.h b/minix/include/arch/earm/include/vm.h similarity index 100% rename from include/arch/earm/include/vm.h rename to minix/include/arch/earm/include/vm.h diff --git a/include/arch/i386/Makefile b/minix/include/arch/i386/Makefile similarity index 100% rename from include/arch/i386/Makefile rename to minix/include/arch/i386/Makefile diff --git a/include/arch/i386/include/Makefile b/minix/include/arch/i386/include/Makefile similarity index 100% rename from include/arch/i386/include/Makefile rename to minix/include/arch/i386/include/Makefile diff --git a/include/arch/i386/include/archconst.h b/minix/include/arch/i386/include/archconst.h similarity index 100% rename from include/arch/i386/include/archconst.h rename to minix/include/arch/i386/include/archconst.h diff --git a/include/arch/i386/include/archtypes.h b/minix/include/arch/i386/include/archtypes.h similarity index 100% rename from include/arch/i386/include/archtypes.h rename to minix/include/arch/i386/include/archtypes.h diff --git a/include/arch/i386/include/bios.h b/minix/include/arch/i386/include/bios.h similarity index 100% rename from include/arch/i386/include/bios.h rename to minix/include/arch/i386/include/bios.h diff --git a/include/arch/i386/include/cmos.h b/minix/include/arch/i386/include/cmos.h similarity index 100% rename from include/arch/i386/include/cmos.h rename to minix/include/arch/i386/include/cmos.h diff --git a/include/arch/i386/include/diskparm.h b/minix/include/arch/i386/include/diskparm.h similarity index 100% rename from include/arch/i386/include/diskparm.h rename to minix/include/arch/i386/include/diskparm.h diff --git a/include/arch/i386/include/elf.h b/minix/include/arch/i386/include/elf.h similarity index 100% rename from include/arch/i386/include/elf.h rename to minix/include/arch/i386/include/elf.h diff --git a/include/arch/i386/include/fpu.h b/minix/include/arch/i386/include/fpu.h similarity index 100% rename from include/arch/i386/include/fpu.h rename to minix/include/arch/i386/include/fpu.h diff --git a/include/arch/i386/include/int86.h b/minix/include/arch/i386/include/int86.h similarity index 100% rename from include/arch/i386/include/int86.h rename to minix/include/arch/i386/include/int86.h diff --git a/include/arch/i386/include/interrupt.h b/minix/include/arch/i386/include/interrupt.h similarity index 100% rename from include/arch/i386/include/interrupt.h rename to minix/include/arch/i386/include/interrupt.h diff --git a/include/arch/i386/include/ipcconst.h b/minix/include/arch/i386/include/ipcconst.h similarity index 100% rename from include/arch/i386/include/ipcconst.h rename to minix/include/arch/i386/include/ipcconst.h diff --git a/include/arch/i386/include/memory.h b/minix/include/arch/i386/include/memory.h similarity index 100% rename from include/arch/i386/include/memory.h rename to minix/include/arch/i386/include/memory.h diff --git a/include/arch/i386/include/partition.h b/minix/include/arch/i386/include/partition.h similarity index 100% rename from include/arch/i386/include/partition.h rename to minix/include/arch/i386/include/partition.h diff --git a/include/arch/i386/include/pci.h b/minix/include/arch/i386/include/pci.h similarity index 100% rename from include/arch/i386/include/pci.h rename to minix/include/arch/i386/include/pci.h diff --git a/include/arch/i386/include/pci_amd.h b/minix/include/arch/i386/include/pci_amd.h similarity index 100% rename from include/arch/i386/include/pci_amd.h rename to minix/include/arch/i386/include/pci_amd.h diff --git a/include/arch/i386/include/pci_intel.h b/minix/include/arch/i386/include/pci_intel.h similarity index 100% rename from include/arch/i386/include/pci_intel.h rename to minix/include/arch/i386/include/pci_intel.h diff --git a/include/arch/i386/include/pci_sis.h b/minix/include/arch/i386/include/pci_sis.h similarity index 100% rename from include/arch/i386/include/pci_sis.h rename to minix/include/arch/i386/include/pci_sis.h diff --git a/include/arch/i386/include/pci_via.h b/minix/include/arch/i386/include/pci_via.h similarity index 100% rename from include/arch/i386/include/pci_via.h rename to minix/include/arch/i386/include/pci_via.h diff --git a/include/arch/i386/include/ports.h b/minix/include/arch/i386/include/ports.h similarity index 100% rename from include/arch/i386/include/ports.h rename to minix/include/arch/i386/include/ports.h diff --git a/include/arch/i386/include/stackframe.h b/minix/include/arch/i386/include/stackframe.h similarity index 100% rename from include/arch/i386/include/stackframe.h rename to minix/include/arch/i386/include/stackframe.h diff --git a/include/arch/i386/include/vm.h b/minix/include/arch/i386/include/vm.h similarity index 100% rename from include/arch/i386/include/vm.h rename to minix/include/arch/i386/include/vm.h diff --git a/include/ddekit/Makefile b/minix/include/ddekit/Makefile similarity index 100% rename from include/ddekit/Makefile rename to minix/include/ddekit/Makefile diff --git a/include/ddekit/assert.h b/minix/include/ddekit/assert.h similarity index 100% rename from include/ddekit/assert.h rename to minix/include/ddekit/assert.h diff --git a/include/ddekit/attribs.h b/minix/include/ddekit/attribs.h similarity index 100% rename from include/ddekit/attribs.h rename to minix/include/ddekit/attribs.h diff --git a/include/ddekit/condvar.h b/minix/include/ddekit/condvar.h similarity index 100% rename from include/ddekit/condvar.h rename to minix/include/ddekit/condvar.h diff --git a/include/ddekit/ddekit.h b/minix/include/ddekit/ddekit.h similarity index 100% rename from include/ddekit/ddekit.h rename to minix/include/ddekit/ddekit.h diff --git a/include/ddekit/debug.h b/minix/include/ddekit/debug.h similarity index 100% rename from include/ddekit/debug.h rename to minix/include/ddekit/debug.h diff --git a/include/ddekit/initcall.h b/minix/include/ddekit/initcall.h similarity index 100% rename from include/ddekit/initcall.h rename to minix/include/ddekit/initcall.h diff --git a/include/ddekit/inline.h b/minix/include/ddekit/inline.h similarity index 100% rename from include/ddekit/inline.h rename to minix/include/ddekit/inline.h diff --git a/include/ddekit/interrupt.h b/minix/include/ddekit/interrupt.h similarity index 100% rename from include/ddekit/interrupt.h rename to minix/include/ddekit/interrupt.h diff --git a/include/ddekit/lock.h b/minix/include/ddekit/lock.h similarity index 100% rename from include/ddekit/lock.h rename to minix/include/ddekit/lock.h diff --git a/include/ddekit/memory.h b/minix/include/ddekit/memory.h similarity index 100% rename from include/ddekit/memory.h rename to minix/include/ddekit/memory.h diff --git a/include/ddekit/minix/Makefile b/minix/include/ddekit/minix/Makefile similarity index 100% rename from include/ddekit/minix/Makefile rename to minix/include/ddekit/minix/Makefile diff --git a/include/ddekit/minix/msg_queue.h b/minix/include/ddekit/minix/msg_queue.h similarity index 100% rename from include/ddekit/minix/msg_queue.h rename to minix/include/ddekit/minix/msg_queue.h diff --git a/include/ddekit/minix/pci.h b/minix/include/ddekit/minix/pci.h similarity index 100% rename from include/ddekit/minix/pci.h rename to minix/include/ddekit/minix/pci.h diff --git a/include/ddekit/panic.h b/minix/include/ddekit/panic.h similarity index 100% rename from include/ddekit/panic.h rename to minix/include/ddekit/panic.h diff --git a/include/ddekit/pci.h b/minix/include/ddekit/pci.h similarity index 100% rename from include/ddekit/pci.h rename to minix/include/ddekit/pci.h diff --git a/include/ddekit/pgtab.h b/minix/include/ddekit/pgtab.h similarity index 100% rename from include/ddekit/pgtab.h rename to minix/include/ddekit/pgtab.h diff --git a/include/ddekit/printf.h b/minix/include/ddekit/printf.h similarity index 100% rename from include/ddekit/printf.h rename to minix/include/ddekit/printf.h diff --git a/include/ddekit/resources.h b/minix/include/ddekit/resources.h similarity index 100% rename from include/ddekit/resources.h rename to minix/include/ddekit/resources.h diff --git a/include/ddekit/semaphore.h b/minix/include/ddekit/semaphore.h similarity index 100% rename from include/ddekit/semaphore.h rename to minix/include/ddekit/semaphore.h diff --git a/include/ddekit/thread.h b/minix/include/ddekit/thread.h similarity index 100% rename from include/ddekit/thread.h rename to minix/include/ddekit/thread.h diff --git a/include/ddekit/timer.h b/minix/include/ddekit/timer.h similarity index 100% rename from include/ddekit/timer.h rename to minix/include/ddekit/timer.h diff --git a/include/ddekit/types.h b/minix/include/ddekit/types.h similarity index 100% rename from include/ddekit/types.h rename to minix/include/ddekit/types.h diff --git a/include/ddekit/usb.h b/minix/include/ddekit/usb.h similarity index 100% rename from include/ddekit/usb.h rename to minix/include/ddekit/usb.h diff --git a/include/env.h b/minix/include/env.h similarity index 100% rename from include/env.h rename to minix/include/env.h diff --git a/include/fetch.h b/minix/include/fetch.h similarity index 100% rename from include/fetch.h rename to minix/include/fetch.h diff --git a/include/lib.h b/minix/include/lib.h similarity index 100% rename from include/lib.h rename to minix/include/lib.h diff --git a/include/libdde/Makefile b/minix/include/libdde/Makefile similarity index 100% rename from include/libdde/Makefile rename to minix/include/libdde/Makefile diff --git a/include/libdde/usb_server.h b/minix/include/libdde/usb_server.h similarity index 100% rename from include/libdde/usb_server.h rename to minix/include/libdde/usb_server.h diff --git a/include/libutil.h b/minix/include/libutil.h similarity index 100% rename from include/libutil.h rename to minix/include/libutil.h diff --git a/include/minix/Makefile b/minix/include/minix/Makefile similarity index 100% rename from include/minix/Makefile rename to minix/include/minix/Makefile diff --git a/include/minix/acpi.h b/minix/include/minix/acpi.h similarity index 100% rename from include/minix/acpi.h rename to minix/include/minix/acpi.h diff --git a/include/minix/audio_fw.h b/minix/include/minix/audio_fw.h similarity index 100% rename from include/minix/audio_fw.h rename to minix/include/minix/audio_fw.h diff --git a/include/minix/bdev.h b/minix/include/minix/bdev.h similarity index 100% rename from include/minix/bdev.h rename to minix/include/minix/bdev.h diff --git a/include/minix/bitmap.h b/minix/include/minix/bitmap.h similarity index 100% rename from include/minix/bitmap.h rename to minix/include/minix/bitmap.h diff --git a/include/minix/blockdriver.h b/minix/include/minix/blockdriver.h similarity index 100% rename from include/minix/blockdriver.h rename to minix/include/minix/blockdriver.h diff --git a/include/minix/blockdriver_mt.h b/minix/include/minix/blockdriver_mt.h similarity index 100% rename from include/minix/blockdriver_mt.h rename to minix/include/minix/blockdriver_mt.h diff --git a/include/minix/board.h b/minix/include/minix/board.h similarity index 100% rename from include/minix/board.h rename to minix/include/minix/board.h diff --git a/include/minix/btrace.h b/minix/include/minix/btrace.h similarity index 100% rename from include/minix/btrace.h rename to minix/include/minix/btrace.h diff --git a/include/minix/callnr.h b/minix/include/minix/callnr.h similarity index 100% rename from include/minix/callnr.h rename to minix/include/minix/callnr.h diff --git a/include/minix/chardriver.h b/minix/include/minix/chardriver.h similarity index 100% rename from include/minix/chardriver.h rename to minix/include/minix/chardriver.h diff --git a/include/minix/clkconf.h b/minix/include/minix/clkconf.h similarity index 100% rename from include/minix/clkconf.h rename to minix/include/minix/clkconf.h diff --git a/include/minix/com.h b/minix/include/minix/com.h similarity index 100% rename from include/minix/com.h rename to minix/include/minix/com.h diff --git a/include/minix/config.h b/minix/include/minix/config.h similarity index 100% rename from include/minix/config.h rename to minix/include/minix/config.h diff --git a/include/minix/const.h b/minix/include/minix/const.h similarity index 100% rename from include/minix/const.h rename to minix/include/minix/const.h diff --git a/include/minix/cpufeature.h b/minix/include/minix/cpufeature.h similarity index 100% rename from include/minix/cpufeature.h rename to minix/include/minix/cpufeature.h diff --git a/include/minix/debug.h b/minix/include/minix/debug.h similarity index 100% rename from include/minix/debug.h rename to minix/include/minix/debug.h diff --git a/include/minix/devio.h b/minix/include/minix/devio.h similarity index 100% rename from include/minix/devio.h rename to minix/include/minix/devio.h diff --git a/include/minix/devman.h b/minix/include/minix/devman.h similarity index 100% rename from include/minix/devman.h rename to minix/include/minix/devman.h diff --git a/include/minix/dmap.h b/minix/include/minix/dmap.h similarity index 100% rename from include/minix/dmap.h rename to minix/include/minix/dmap.h diff --git a/include/minix/driver.h b/minix/include/minix/driver.h similarity index 100% rename from include/minix/driver.h rename to minix/include/minix/driver.h diff --git a/include/minix/drivers.h b/minix/include/minix/drivers.h similarity index 100% rename from include/minix/drivers.h rename to minix/include/minix/drivers.h diff --git a/include/minix/drvlib.h b/minix/include/minix/drvlib.h similarity index 100% rename from include/minix/drvlib.h rename to minix/include/minix/drvlib.h diff --git a/include/minix/ds.h b/minix/include/minix/ds.h similarity index 100% rename from include/minix/ds.h rename to minix/include/minix/ds.h diff --git a/include/minix/endpoint.h b/minix/include/minix/endpoint.h similarity index 100% rename from include/minix/endpoint.h rename to minix/include/minix/endpoint.h diff --git a/include/minix/fb.h b/minix/include/minix/fb.h similarity index 100% rename from include/minix/fb.h rename to minix/include/minix/fb.h diff --git a/include/minix/fslib.h b/minix/include/minix/fslib.h similarity index 100% rename from include/minix/fslib.h rename to minix/include/minix/fslib.h diff --git a/include/minix/gcov.h b/minix/include/minix/gcov.h similarity index 100% rename from include/minix/gcov.h rename to minix/include/minix/gcov.h diff --git a/include/minix/gpio.h b/minix/include/minix/gpio.h similarity index 100% rename from include/minix/gpio.h rename to minix/include/minix/gpio.h diff --git a/include/minix/hash.h b/minix/include/minix/hash.h similarity index 100% rename from include/minix/hash.h rename to minix/include/minix/hash.h diff --git a/include/minix/hgfs.h b/minix/include/minix/hgfs.h similarity index 100% rename from include/minix/hgfs.h rename to minix/include/minix/hgfs.h diff --git a/include/minix/i2c.h b/minix/include/minix/i2c.h similarity index 100% rename from include/minix/i2c.h rename to minix/include/minix/i2c.h diff --git a/include/minix/i2cdriver.h b/minix/include/minix/i2cdriver.h similarity index 100% rename from include/minix/i2cdriver.h rename to minix/include/minix/i2cdriver.h diff --git a/include/minix/input.h b/minix/include/minix/input.h similarity index 100% rename from include/minix/input.h rename to minix/include/minix/input.h diff --git a/include/minix/inputdriver.h b/minix/include/minix/inputdriver.h similarity index 100% rename from include/minix/inputdriver.h rename to minix/include/minix/inputdriver.h diff --git a/include/minix/ioctl.h b/minix/include/minix/ioctl.h similarity index 100% rename from include/minix/ioctl.h rename to minix/include/minix/ioctl.h diff --git a/include/minix/ipc.h b/minix/include/minix/ipc.h similarity index 99% rename from include/minix/ipc.h rename to minix/include/minix/ipc.h index d8eb00e96..622c40daf 100644 --- a/include/minix/ipc.h +++ b/minix/include/minix/ipc.h @@ -2378,7 +2378,8 @@ struct minix_ipcvecs { int (*senda)(asynmsg_t *table, size_t count); }; -/* kernel-set IPC vectors retrieved by a constructor in libc/sys-minix/init.c */ +/* kernel-set IPC vectors retrieved by a constructor in + * minix/lib/libc/sys/init.c */ extern struct minix_ipcvecs _minix_ipcvecs; static inline int _ipc_send(endpoint_t dest, message *m_ptr) diff --git a/include/minix/ipcconst.h b/minix/include/minix/ipcconst.h similarity index 100% rename from include/minix/ipcconst.h rename to minix/include/minix/ipcconst.h diff --git a/include/minix/keymap.h b/minix/include/minix/keymap.h similarity index 100% rename from include/minix/keymap.h rename to minix/include/minix/keymap.h diff --git a/include/minix/libminixfs.h b/minix/include/minix/libminixfs.h similarity index 100% rename from include/minix/libminixfs.h rename to minix/include/minix/libminixfs.h diff --git a/include/minix/log.h b/minix/include/minix/log.h similarity index 100% rename from include/minix/log.h rename to minix/include/minix/log.h diff --git a/include/minix/minlib.h b/minix/include/minix/minlib.h similarity index 100% rename from include/minix/minlib.h rename to minix/include/minix/minlib.h diff --git a/include/minix/mmio.h b/minix/include/minix/mmio.h similarity index 100% rename from include/minix/mmio.h rename to minix/include/minix/mmio.h diff --git a/include/minix/mthread.h b/minix/include/minix/mthread.h similarity index 100% rename from include/minix/mthread.h rename to minix/include/minix/mthread.h diff --git a/include/minix/netdriver.h b/minix/include/minix/netdriver.h similarity index 100% rename from include/minix/netdriver.h rename to minix/include/minix/netdriver.h diff --git a/include/minix/netsock.h b/minix/include/minix/netsock.h similarity index 100% rename from include/minix/netsock.h rename to minix/include/minix/netsock.h diff --git a/include/minix/optset.h b/minix/include/minix/optset.h similarity index 100% rename from include/minix/optset.h rename to minix/include/minix/optset.h diff --git a/include/minix/padconf.h b/minix/include/minix/padconf.h similarity index 100% rename from include/minix/padconf.h rename to minix/include/minix/padconf.h diff --git a/include/minix/param.h b/minix/include/minix/param.h similarity index 100% rename from include/minix/param.h rename to minix/include/minix/param.h diff --git a/include/minix/partition.h b/minix/include/minix/partition.h similarity index 100% rename from include/minix/partition.h rename to minix/include/minix/partition.h diff --git a/include/minix/paths.h b/minix/include/minix/paths.h similarity index 100% rename from include/minix/paths.h rename to minix/include/minix/paths.h diff --git a/include/minix/portio.h b/minix/include/minix/portio.h similarity index 100% rename from include/minix/portio.h rename to minix/include/minix/portio.h diff --git a/include/minix/priv.h b/minix/include/minix/priv.h similarity index 100% rename from include/minix/priv.h rename to minix/include/minix/priv.h diff --git a/include/minix/procfs.h b/minix/include/minix/procfs.h similarity index 100% rename from include/minix/procfs.h rename to minix/include/minix/procfs.h diff --git a/include/minix/profile.h b/minix/include/minix/profile.h similarity index 100% rename from include/minix/profile.h rename to minix/include/minix/profile.h diff --git a/include/minix/queryparam.h b/minix/include/minix/queryparam.h similarity index 100% rename from include/minix/queryparam.h rename to minix/include/minix/queryparam.h diff --git a/include/minix/rs.h b/minix/include/minix/rs.h similarity index 100% rename from include/minix/rs.h rename to minix/include/minix/rs.h diff --git a/include/minix/safecopies.h b/minix/include/minix/safecopies.h similarity index 100% rename from include/minix/safecopies.h rename to minix/include/minix/safecopies.h diff --git a/include/minix/sched.h b/minix/include/minix/sched.h similarity index 100% rename from include/minix/sched.h rename to minix/include/minix/sched.h diff --git a/include/minix/sef.h b/minix/include/minix/sef.h similarity index 100% rename from include/minix/sef.h rename to minix/include/minix/sef.h diff --git a/include/minix/sffs.h b/minix/include/minix/sffs.h similarity index 100% rename from include/minix/sffs.h rename to minix/include/minix/sffs.h diff --git a/include/minix/sound.h b/minix/include/minix/sound.h similarity index 100% rename from include/minix/sound.h rename to minix/include/minix/sound.h diff --git a/include/minix/spin.h b/minix/include/minix/spin.h similarity index 100% rename from include/minix/spin.h rename to minix/include/minix/spin.h diff --git a/include/minix/sys_config.h b/minix/include/minix/sys_config.h similarity index 100% rename from include/minix/sys_config.h rename to minix/include/minix/sys_config.h diff --git a/include/minix/sysinfo.h b/minix/include/minix/sysinfo.h similarity index 100% rename from include/minix/sysinfo.h rename to minix/include/minix/sysinfo.h diff --git a/include/minix/syslib.h b/minix/include/minix/syslib.h similarity index 100% rename from include/minix/syslib.h rename to minix/include/minix/syslib.h diff --git a/include/minix/sysutil.h b/minix/include/minix/sysutil.h similarity index 100% rename from include/minix/sysutil.h rename to minix/include/minix/sysutil.h diff --git a/include/minix/timers.h b/minix/include/minix/timers.h similarity index 100% rename from include/minix/timers.h rename to minix/include/minix/timers.h diff --git a/include/minix/type.h b/minix/include/minix/type.h similarity index 100% rename from include/minix/type.h rename to minix/include/minix/type.h diff --git a/include/minix/u64.h b/minix/include/minix/u64.h similarity index 100% rename from include/minix/u64.h rename to minix/include/minix/u64.h diff --git a/include/minix/usb.h b/minix/include/minix/usb.h similarity index 100% rename from include/minix/usb.h rename to minix/include/minix/usb.h diff --git a/include/minix/usb_ch9.h b/minix/include/minix/usb_ch9.h similarity index 100% rename from include/minix/usb_ch9.h rename to minix/include/minix/usb_ch9.h diff --git a/include/minix/vbox.h b/minix/include/minix/vbox.h similarity index 100% rename from include/minix/vbox.h rename to minix/include/minix/vbox.h diff --git a/include/minix/vboxfs.h b/minix/include/minix/vboxfs.h similarity index 100% rename from include/minix/vboxfs.h rename to minix/include/minix/vboxfs.h diff --git a/include/minix/vboxif.h b/minix/include/minix/vboxif.h similarity index 100% rename from include/minix/vboxif.h rename to minix/include/minix/vboxif.h diff --git a/include/minix/vboxtype.h b/minix/include/minix/vboxtype.h similarity index 100% rename from include/minix/vboxtype.h rename to minix/include/minix/vboxtype.h diff --git a/include/minix/vfsif.h b/minix/include/minix/vfsif.h similarity index 100% rename from include/minix/vfsif.h rename to minix/include/minix/vfsif.h diff --git a/include/minix/virtio.h b/minix/include/minix/virtio.h similarity index 100% rename from include/minix/virtio.h rename to minix/include/minix/virtio.h diff --git a/include/minix/vm.h b/minix/include/minix/vm.h similarity index 100% rename from include/minix/vm.h rename to minix/include/minix/vm.h diff --git a/include/minix/vtreefs.h b/minix/include/minix/vtreefs.h similarity index 100% rename from include/minix/vtreefs.h rename to minix/include/minix/vtreefs.h diff --git a/include/net/Makefile b/minix/include/net/Makefile similarity index 100% rename from include/net/Makefile rename to minix/include/net/Makefile diff --git a/include/net/gen/Makefile b/minix/include/net/gen/Makefile similarity index 100% rename from include/net/gen/Makefile rename to minix/include/net/gen/Makefile diff --git a/include/net/gen/arp_io.h b/minix/include/net/gen/arp_io.h similarity index 100% rename from include/net/gen/arp_io.h rename to minix/include/net/gen/arp_io.h diff --git a/include/net/gen/dhcp.h b/minix/include/net/gen/dhcp.h similarity index 100% rename from include/net/gen/dhcp.h rename to minix/include/net/gen/dhcp.h diff --git a/include/net/gen/eth_hdr.h b/minix/include/net/gen/eth_hdr.h similarity index 100% rename from include/net/gen/eth_hdr.h rename to minix/include/net/gen/eth_hdr.h diff --git a/include/net/gen/eth_io.h b/minix/include/net/gen/eth_io.h similarity index 100% rename from include/net/gen/eth_io.h rename to minix/include/net/gen/eth_io.h diff --git a/include/net/gen/ether.h b/minix/include/net/gen/ether.h similarity index 100% rename from include/net/gen/ether.h rename to minix/include/net/gen/ether.h diff --git a/include/net/gen/icmp.h b/minix/include/net/gen/icmp.h similarity index 100% rename from include/net/gen/icmp.h rename to minix/include/net/gen/icmp.h diff --git a/include/net/gen/icmp_hdr.h b/minix/include/net/gen/icmp_hdr.h similarity index 100% rename from include/net/gen/icmp_hdr.h rename to minix/include/net/gen/icmp_hdr.h diff --git a/include/net/gen/if_ether.h b/minix/include/net/gen/if_ether.h similarity index 100% rename from include/net/gen/if_ether.h rename to minix/include/net/gen/if_ether.h diff --git a/include/net/gen/in.h b/minix/include/net/gen/in.h similarity index 100% rename from include/net/gen/in.h rename to minix/include/net/gen/in.h diff --git a/include/net/gen/inet.h b/minix/include/net/gen/inet.h similarity index 100% rename from include/net/gen/inet.h rename to minix/include/net/gen/inet.h diff --git a/include/net/gen/ip_hdr.h b/minix/include/net/gen/ip_hdr.h similarity index 100% rename from include/net/gen/ip_hdr.h rename to minix/include/net/gen/ip_hdr.h diff --git a/include/net/gen/ip_io.h b/minix/include/net/gen/ip_io.h similarity index 100% rename from include/net/gen/ip_io.h rename to minix/include/net/gen/ip_io.h diff --git a/include/net/gen/oneCsum.h b/minix/include/net/gen/oneCsum.h similarity index 100% rename from include/net/gen/oneCsum.h rename to minix/include/net/gen/oneCsum.h diff --git a/include/net/gen/psip_hdr.h b/minix/include/net/gen/psip_hdr.h similarity index 100% rename from include/net/gen/psip_hdr.h rename to minix/include/net/gen/psip_hdr.h diff --git a/include/net/gen/psip_io.h b/minix/include/net/gen/psip_io.h similarity index 100% rename from include/net/gen/psip_io.h rename to minix/include/net/gen/psip_io.h diff --git a/include/net/gen/rip.h b/minix/include/net/gen/rip.h similarity index 100% rename from include/net/gen/rip.h rename to minix/include/net/gen/rip.h diff --git a/include/net/gen/route.h b/minix/include/net/gen/route.h similarity index 100% rename from include/net/gen/route.h rename to minix/include/net/gen/route.h diff --git a/include/net/gen/socket.h b/minix/include/net/gen/socket.h similarity index 100% rename from include/net/gen/socket.h rename to minix/include/net/gen/socket.h diff --git a/include/net/gen/tcp.h b/minix/include/net/gen/tcp.h similarity index 100% rename from include/net/gen/tcp.h rename to minix/include/net/gen/tcp.h diff --git a/include/net/gen/tcp_hdr.h b/minix/include/net/gen/tcp_hdr.h similarity index 100% rename from include/net/gen/tcp_hdr.h rename to minix/include/net/gen/tcp_hdr.h diff --git a/include/net/gen/tcp_io.h b/minix/include/net/gen/tcp_io.h similarity index 100% rename from include/net/gen/tcp_io.h rename to minix/include/net/gen/tcp_io.h diff --git a/include/net/gen/udp.h b/minix/include/net/gen/udp.h similarity index 100% rename from include/net/gen/udp.h rename to minix/include/net/gen/udp.h diff --git a/include/net/gen/udp_hdr.h b/minix/include/net/gen/udp_hdr.h similarity index 100% rename from include/net/gen/udp_hdr.h rename to minix/include/net/gen/udp_hdr.h diff --git a/include/net/gen/udp_io.h b/minix/include/net/gen/udp_io.h similarity index 100% rename from include/net/gen/udp_io.h rename to minix/include/net/gen/udp_io.h diff --git a/include/net/gen/udp_io_hdr.h b/minix/include/net/gen/udp_io_hdr.h similarity index 100% rename from include/net/gen/udp_io_hdr.h rename to minix/include/net/gen/udp_io_hdr.h diff --git a/include/net/gen/vjhc.h b/minix/include/net/gen/vjhc.h similarity index 100% rename from include/net/gen/vjhc.h rename to minix/include/net/gen/vjhc.h diff --git a/include/net/hton.h b/minix/include/net/hton.h similarity index 100% rename from include/net/hton.h rename to minix/include/net/hton.h diff --git a/include/net/if.h b/minix/include/net/if.h similarity index 100% rename from include/net/if.h rename to minix/include/net/if.h diff --git a/include/net/netlib.h b/minix/include/net/netlib.h similarity index 100% rename from include/net/netlib.h rename to minix/include/net/netlib.h diff --git a/include/sys/Makefile b/minix/include/sys/Makefile similarity index 100% rename from include/sys/Makefile rename to minix/include/sys/Makefile diff --git a/include/sys/elf64.h b/minix/include/sys/elf64.h similarity index 100% rename from include/sys/elf64.h rename to minix/include/sys/elf64.h diff --git a/include/sys/elf_common.h b/minix/include/sys/elf_common.h similarity index 100% rename from include/sys/elf_common.h rename to minix/include/sys/elf_common.h diff --git a/include/sys/elf_core.h b/minix/include/sys/elf_core.h similarity index 100% rename from include/sys/elf_core.h rename to minix/include/sys/elf_core.h diff --git a/include/sys/elf_generic.h b/minix/include/sys/elf_generic.h similarity index 100% rename from include/sys/elf_generic.h rename to minix/include/sys/elf_generic.h diff --git a/include/sys/ioc_block.h b/minix/include/sys/ioc_block.h similarity index 100% rename from include/sys/ioc_block.h rename to minix/include/sys/ioc_block.h diff --git a/include/sys/ioc_disk.h b/minix/include/sys/ioc_disk.h similarity index 100% rename from include/sys/ioc_disk.h rename to minix/include/sys/ioc_disk.h diff --git a/include/sys/ioc_fb.h b/minix/include/sys/ioc_fb.h similarity index 100% rename from include/sys/ioc_fb.h rename to minix/include/sys/ioc_fb.h diff --git a/include/sys/ioc_fbd.h b/minix/include/sys/ioc_fbd.h similarity index 100% rename from include/sys/ioc_fbd.h rename to minix/include/sys/ioc_fbd.h diff --git a/include/sys/ioc_file.h b/minix/include/sys/ioc_file.h similarity index 100% rename from include/sys/ioc_file.h rename to minix/include/sys/ioc_file.h diff --git a/include/sys/ioc_memory.h b/minix/include/sys/ioc_memory.h similarity index 100% rename from include/sys/ioc_memory.h rename to minix/include/sys/ioc_memory.h diff --git a/include/sys/ioc_net.h b/minix/include/sys/ioc_net.h similarity index 100% rename from include/sys/ioc_net.h rename to minix/include/sys/ioc_net.h diff --git a/include/sys/ioc_sound.h b/minix/include/sys/ioc_sound.h similarity index 100% rename from include/sys/ioc_sound.h rename to minix/include/sys/ioc_sound.h diff --git a/include/sys/ioc_tape.h b/minix/include/sys/ioc_tape.h similarity index 100% rename from include/sys/ioc_tape.h rename to minix/include/sys/ioc_tape.h diff --git a/include/sys/kbdio.h b/minix/include/sys/kbdio.h similarity index 100% rename from include/sys/kbdio.h rename to minix/include/sys/kbdio.h diff --git a/include/sys/procfs.h b/minix/include/sys/procfs.h similarity index 100% rename from include/sys/procfs.h rename to minix/include/sys/procfs.h diff --git a/include/sys/statfs.h b/minix/include/sys/statfs.h similarity index 100% rename from include/sys/statfs.h rename to minix/include/sys/statfs.h diff --git a/include/sys/svrctl.h b/minix/include/sys/svrctl.h similarity index 100% rename from include/sys/svrctl.h rename to minix/include/sys/svrctl.h diff --git a/include/sys/video.h b/minix/include/sys/video.h similarity index 100% rename from include/sys/video.h rename to minix/include/sys/video.h diff --git a/include/sys/vm.h b/minix/include/sys/vm.h similarity index 100% rename from include/sys/vm.h rename to minix/include/sys/vm.h diff --git a/include/varargs.h b/minix/include/varargs.h similarity index 100% rename from include/varargs.h rename to minix/include/varargs.h diff --git a/kernel/Makefile b/minix/kernel/Makefile similarity index 90% rename from kernel/Makefile rename to minix/kernel/Makefile index 546658b66..2363f63e5 100644 --- a/kernel/Makefile +++ b/minix/kernel/Makefile @@ -24,7 +24,7 @@ CFLAGS += -fno-stack-protector CPPFLAGS+= -D__kernel__ # kernel headers are always called through kernel/*.h -CPPFLAGS+= -I${NETBSDSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR}/minix # kernel headers are always called through kernel/*.h, this # time for generated headers, during cross compilation @@ -34,7 +34,7 @@ CPPFLAGS+= -I${.OBJDIR}/.. CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}/include CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}/bsp/include -CPPFLAGS+= -I${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/include/arch/${MACHINE_ARCH}/include .include "system/Makefile.inc" @@ -64,11 +64,11 @@ CLEANFILES+=extracted-errno.h extracted-mfield.h extracted-mtype.h procoffsets.h debug.o debug.d: extracted-errno.h extracted-mfield.h extracted-mtype.h -extracted-errno.h: extract-errno.sh ../include/errno.h +extracted-errno.h: extract-errno.sh ../../include/errno.h ${_MKTARGET_CREATE} cd ${.CURDIR} ; ${HOST_SH} extract-errno.sh > ${.OBJDIR}/extracted-errno.h -extracted-mfield.h: extract-mfield.sh ../lib/libc/sys-minix/*.c ../lib/libsys/*.c +extracted-mfield.h: extract-mfield.sh ../lib/libc/sys/*.c ../lib/libsys/*.c ${_MKTARGET_CREATE} cd ${.CURDIR} ; ${HOST_SH} extract-mfield.sh > ${.OBJDIR}/extracted-mfield.h diff --git a/kernel/arch/earm/Makefile.inc b/minix/kernel/arch/earm/Makefile.inc similarity index 91% rename from kernel/arch/earm/Makefile.inc rename to minix/kernel/arch/earm/Makefile.inc index 72c569eb7..1b671011b 100644 --- a/kernel/arch/earm/Makefile.inc +++ b/minix/kernel/arch/earm/Makefile.inc @@ -6,12 +6,12 @@ HERE=${.CURDIR}/arch/${MACHINE_ARCH} # objects we want unpaged from -lminlib MINLIB_OBJS_UNPAGED= get_bp.o -get_bp.o: ${NETBSDSRCDIR}/lib/libminlib/${MACHINE_ARCH}/get_bp.S +get_bp.o: ${NETBSDSRCDIR}/minix/lib/libminlib/${MACHINE_ARCH}/get_bp.S # objects we want unpaged from -lsys SYS_OBJS_UNPAGED=assert.o stacktrace.o -assert.o: ${NETBSDSRCDIR}/lib/libsys/assert.c -stacktrace.o: ${NETBSDSRCDIR}/lib/libsys/stacktrace.c +assert.o: ${NETBSDSRCDIR}/minix/lib/libsys/assert.c +stacktrace.o: ${NETBSDSRCDIR}/minix/lib/libsys/stacktrace.c # objects we want unpaged from -lminc MINC_OBJS_UNPAGED= atoi.o \ @@ -20,7 +20,7 @@ MINC_OBJS_UNPAGED= atoi.o \ memcpy.o memmove.o memset.o \ udivdi3.o umoddi3.o qdivrem.o MINC_OBJS_UNPAGED+= __aeabi_ldiv0.o __aeabi_idiv0.o __aeabi_uldivmod.o divide.o divsi3.o udivsi3.o -atoi.o: ${NETBSDSRCDIR}/lib/libminc/atoi.c +atoi.o: ${NETBSDSRCDIR}/minix/lib/libminc/atoi.c printf.o: ${NETBSDSRCDIR}/sys/lib/libsa/printf.c subr_prf.o: ${NETBSDSRCDIR}/sys/lib/libsa/subr_prf.c memcpy.o: ${NETBSDSRCDIR}/common/lib/libc/arch/arm/string/memcpy.S @@ -85,7 +85,7 @@ SRCS+= procoffsets.h PROCOFFSETSCF=procoffsets.cf -.PATH: ${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include +.PATH: ${NETBSDSRCDIR}/minix/include/arch/${MACHINE_ARCH}/include procoffsets.h: ${PROCOFFSETSCF} kernel.h proc.h stackframe.h archtypes.h ${_MKTARGET_CREATE} diff --git a/kernel/arch/earm/arch_clock.c b/minix/kernel/arch/earm/arch_clock.c similarity index 100% rename from kernel/arch/earm/arch_clock.c rename to minix/kernel/arch/earm/arch_clock.c diff --git a/kernel/arch/earm/arch_do_vmctl.c b/minix/kernel/arch/earm/arch_do_vmctl.c similarity index 100% rename from kernel/arch/earm/arch_do_vmctl.c rename to minix/kernel/arch/earm/arch_do_vmctl.c diff --git a/kernel/arch/earm/arch_reset.c b/minix/kernel/arch/earm/arch_reset.c similarity index 100% rename from kernel/arch/earm/arch_reset.c rename to minix/kernel/arch/earm/arch_reset.c diff --git a/kernel/arch/earm/arch_system.c b/minix/kernel/arch/earm/arch_system.c similarity index 100% rename from kernel/arch/earm/arch_system.c rename to minix/kernel/arch/earm/arch_system.c diff --git a/kernel/arch/earm/bsp/include/bsp_init.h b/minix/kernel/arch/earm/bsp/include/bsp_init.h similarity index 100% rename from kernel/arch/earm/bsp/include/bsp_init.h rename to minix/kernel/arch/earm/bsp/include/bsp_init.h diff --git a/kernel/arch/earm/bsp/include/bsp_intr.h b/minix/kernel/arch/earm/bsp/include/bsp_intr.h similarity index 100% rename from kernel/arch/earm/bsp/include/bsp_intr.h rename to minix/kernel/arch/earm/bsp/include/bsp_intr.h diff --git a/kernel/arch/earm/bsp/include/bsp_padconf.h b/minix/kernel/arch/earm/bsp/include/bsp_padconf.h similarity index 100% rename from kernel/arch/earm/bsp/include/bsp_padconf.h rename to minix/kernel/arch/earm/bsp/include/bsp_padconf.h diff --git a/kernel/arch/earm/bsp/include/bsp_reset.h b/minix/kernel/arch/earm/bsp/include/bsp_reset.h similarity index 100% rename from kernel/arch/earm/bsp/include/bsp_reset.h rename to minix/kernel/arch/earm/bsp/include/bsp_reset.h diff --git a/kernel/arch/earm/bsp/include/bsp_serial.h b/minix/kernel/arch/earm/bsp/include/bsp_serial.h similarity index 100% rename from kernel/arch/earm/bsp/include/bsp_serial.h rename to minix/kernel/arch/earm/bsp/include/bsp_serial.h diff --git a/kernel/arch/earm/bsp/include/bsp_timer.h b/minix/kernel/arch/earm/bsp/include/bsp_timer.h similarity index 100% rename from kernel/arch/earm/bsp/include/bsp_timer.h rename to minix/kernel/arch/earm/bsp/include/bsp_timer.h diff --git a/kernel/arch/earm/bsp/ti/Makefile.inc b/minix/kernel/arch/earm/bsp/ti/Makefile.inc similarity index 100% rename from kernel/arch/earm/bsp/ti/Makefile.inc rename to minix/kernel/arch/earm/bsp/ti/Makefile.inc diff --git a/kernel/arch/earm/bsp/ti/omap_init.c b/minix/kernel/arch/earm/bsp/ti/omap_init.c similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_init.c rename to minix/kernel/arch/earm/bsp/ti/omap_init.c diff --git a/kernel/arch/earm/bsp/ti/omap_intr.c b/minix/kernel/arch/earm/bsp/ti/omap_intr.c similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_intr.c rename to minix/kernel/arch/earm/bsp/ti/omap_intr.c diff --git a/kernel/arch/earm/bsp/ti/omap_intr_registers.h b/minix/kernel/arch/earm/bsp/ti/omap_intr_registers.h similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_intr_registers.h rename to minix/kernel/arch/earm/bsp/ti/omap_intr_registers.h diff --git a/kernel/arch/earm/bsp/ti/omap_padconf.c b/minix/kernel/arch/earm/bsp/ti/omap_padconf.c similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_padconf.c rename to minix/kernel/arch/earm/bsp/ti/omap_padconf.c diff --git a/kernel/arch/earm/bsp/ti/omap_reset.c b/minix/kernel/arch/earm/bsp/ti/omap_reset.c similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_reset.c rename to minix/kernel/arch/earm/bsp/ti/omap_reset.c diff --git a/kernel/arch/earm/bsp/ti/omap_rtc.c b/minix/kernel/arch/earm/bsp/ti/omap_rtc.c similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_rtc.c rename to minix/kernel/arch/earm/bsp/ti/omap_rtc.c diff --git a/kernel/arch/earm/bsp/ti/omap_rtc.h b/minix/kernel/arch/earm/bsp/ti/omap_rtc.h similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_rtc.h rename to minix/kernel/arch/earm/bsp/ti/omap_rtc.h diff --git a/kernel/arch/earm/bsp/ti/omap_serial.c b/minix/kernel/arch/earm/bsp/ti/omap_serial.c similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_serial.c rename to minix/kernel/arch/earm/bsp/ti/omap_serial.c diff --git a/kernel/arch/earm/bsp/ti/omap_serial.h b/minix/kernel/arch/earm/bsp/ti/omap_serial.h similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_serial.h rename to minix/kernel/arch/earm/bsp/ti/omap_serial.h diff --git a/kernel/arch/earm/bsp/ti/omap_timer.c b/minix/kernel/arch/earm/bsp/ti/omap_timer.c similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_timer.c rename to minix/kernel/arch/earm/bsp/ti/omap_timer.c diff --git a/kernel/arch/earm/bsp/ti/omap_timer_registers.h b/minix/kernel/arch/earm/bsp/ti/omap_timer_registers.h similarity index 100% rename from kernel/arch/earm/bsp/ti/omap_timer_registers.h rename to minix/kernel/arch/earm/bsp/ti/omap_timer_registers.h diff --git a/kernel/arch/earm/direct_tty_utils.c b/minix/kernel/arch/earm/direct_tty_utils.c similarity index 100% rename from kernel/arch/earm/direct_tty_utils.c rename to minix/kernel/arch/earm/direct_tty_utils.c diff --git a/kernel/arch/earm/do_padconf.c b/minix/kernel/arch/earm/do_padconf.c similarity index 100% rename from kernel/arch/earm/do_padconf.c rename to minix/kernel/arch/earm/do_padconf.c diff --git a/kernel/arch/earm/exc.S b/minix/kernel/arch/earm/exc.S similarity index 100% rename from kernel/arch/earm/exc.S rename to minix/kernel/arch/earm/exc.S diff --git a/kernel/arch/earm/exception.c b/minix/kernel/arch/earm/exception.c similarity index 100% rename from kernel/arch/earm/exception.c rename to minix/kernel/arch/earm/exception.c diff --git a/kernel/arch/earm/glo.h b/minix/kernel/arch/earm/glo.h similarity index 100% rename from kernel/arch/earm/glo.h rename to minix/kernel/arch/earm/glo.h diff --git a/kernel/arch/earm/head.S b/minix/kernel/arch/earm/head.S similarity index 100% rename from kernel/arch/earm/head.S rename to minix/kernel/arch/earm/head.S diff --git a/kernel/arch/earm/hw_intr.c b/minix/kernel/arch/earm/hw_intr.c similarity index 100% rename from kernel/arch/earm/hw_intr.c rename to minix/kernel/arch/earm/hw_intr.c diff --git a/kernel/arch/earm/include/arch_clock.h b/minix/kernel/arch/earm/include/arch_clock.h similarity index 100% rename from kernel/arch/earm/include/arch_clock.h rename to minix/kernel/arch/earm/include/arch_clock.h diff --git a/kernel/arch/earm/include/arch_proto.h b/minix/kernel/arch/earm/include/arch_proto.h similarity index 100% rename from kernel/arch/earm/include/arch_proto.h rename to minix/kernel/arch/earm/include/arch_proto.h diff --git a/kernel/arch/earm/include/arch_watchdog.h b/minix/kernel/arch/earm/include/arch_watchdog.h similarity index 100% rename from kernel/arch/earm/include/arch_watchdog.h rename to minix/kernel/arch/earm/include/arch_watchdog.h diff --git a/kernel/arch/earm/include/archconst.h b/minix/kernel/arch/earm/include/archconst.h similarity index 100% rename from kernel/arch/earm/include/archconst.h rename to minix/kernel/arch/earm/include/archconst.h diff --git a/kernel/arch/earm/include/ccnt.h b/minix/kernel/arch/earm/include/ccnt.h similarity index 100% rename from kernel/arch/earm/include/ccnt.h rename to minix/kernel/arch/earm/include/ccnt.h diff --git a/kernel/arch/earm/include/cpufunc.h b/minix/kernel/arch/earm/include/cpufunc.h similarity index 100% rename from kernel/arch/earm/include/cpufunc.h rename to minix/kernel/arch/earm/include/cpufunc.h diff --git a/kernel/arch/earm/include/direct_utils.h b/minix/kernel/arch/earm/include/direct_utils.h similarity index 100% rename from kernel/arch/earm/include/direct_utils.h rename to minix/kernel/arch/earm/include/direct_utils.h diff --git a/kernel/arch/earm/include/hw_intr.h b/minix/kernel/arch/earm/include/hw_intr.h similarity index 100% rename from kernel/arch/earm/include/hw_intr.h rename to minix/kernel/arch/earm/include/hw_intr.h diff --git a/kernel/arch/earm/include/io.h b/minix/kernel/arch/earm/include/io.h similarity index 100% rename from kernel/arch/earm/include/io.h rename to minix/kernel/arch/earm/include/io.h diff --git a/kernel/arch/earm/kernel.lds b/minix/kernel/arch/earm/kernel.lds similarity index 100% rename from kernel/arch/earm/kernel.lds rename to minix/kernel/arch/earm/kernel.lds diff --git a/kernel/arch/earm/klib.S b/minix/kernel/arch/earm/klib.S similarity index 100% rename from kernel/arch/earm/klib.S rename to minix/kernel/arch/earm/klib.S diff --git a/kernel/arch/earm/memory.c b/minix/kernel/arch/earm/memory.c similarity index 100% rename from kernel/arch/earm/memory.c rename to minix/kernel/arch/earm/memory.c diff --git a/kernel/arch/earm/mpx.S b/minix/kernel/arch/earm/mpx.S similarity index 100% rename from kernel/arch/earm/mpx.S rename to minix/kernel/arch/earm/mpx.S diff --git a/kernel/arch/earm/pg_utils.c b/minix/kernel/arch/earm/pg_utils.c similarity index 100% rename from kernel/arch/earm/pg_utils.c rename to minix/kernel/arch/earm/pg_utils.c diff --git a/kernel/arch/earm/phys_copy.S b/minix/kernel/arch/earm/phys_copy.S similarity index 100% rename from kernel/arch/earm/phys_copy.S rename to minix/kernel/arch/earm/phys_copy.S diff --git a/kernel/arch/earm/phys_memset.S b/minix/kernel/arch/earm/phys_memset.S similarity index 100% rename from kernel/arch/earm/phys_memset.S rename to minix/kernel/arch/earm/phys_memset.S diff --git a/kernel/arch/earm/pre_init.c b/minix/kernel/arch/earm/pre_init.c similarity index 100% rename from kernel/arch/earm/pre_init.c rename to minix/kernel/arch/earm/pre_init.c diff --git a/kernel/arch/earm/procoffsets.cf b/minix/kernel/arch/earm/procoffsets.cf similarity index 100% rename from kernel/arch/earm/procoffsets.cf rename to minix/kernel/arch/earm/procoffsets.cf diff --git a/kernel/arch/earm/protect.c b/minix/kernel/arch/earm/protect.c similarity index 100% rename from kernel/arch/earm/protect.c rename to minix/kernel/arch/earm/protect.c diff --git a/kernel/arch/earm/sconst.h b/minix/kernel/arch/earm/sconst.h similarity index 100% rename from kernel/arch/earm/sconst.h rename to minix/kernel/arch/earm/sconst.h diff --git a/kernel/arch/earm/timer.h b/minix/kernel/arch/earm/timer.h similarity index 100% rename from kernel/arch/earm/timer.h rename to minix/kernel/arch/earm/timer.h diff --git a/kernel/arch/i386/Makefile.inc b/minix/kernel/arch/i386/Makefile.inc similarity index 89% rename from kernel/arch/i386/Makefile.inc rename to minix/kernel/arch/i386/Makefile.inc index 2fc957a22..f5fe8b360 100644 --- a/kernel/arch/i386/Makefile.inc +++ b/minix/kernel/arch/i386/Makefile.inc @@ -6,14 +6,14 @@ HERE=${.CURDIR}/arch/${MACHINE_ARCH} # objects we want unpaged from -lminlib MINLIB_OBJS_UNPAGED= _cpufeature.o _cpuid.o get_bp.o -_cpufeature.o: ${NETBSDSRCDIR}/lib/libminlib/${MACHINE_ARCH}/_cpufeature.c -_cpuid.o: ${NETBSDSRCDIR}/lib/libminlib/${MACHINE_ARCH}/_cpuid.S -get_bp.o: ${NETBSDSRCDIR}/lib/libminlib/${MACHINE_ARCH}/get_bp.S +_cpufeature.o: ${NETBSDSRCDIR}/minix/lib/libminlib/${MACHINE_ARCH}/_cpufeature.c +_cpuid.o: ${NETBSDSRCDIR}/minix/lib/libminlib/${MACHINE_ARCH}/_cpuid.S +get_bp.o: ${NETBSDSRCDIR}/minix/lib/libminlib/${MACHINE_ARCH}/get_bp.S # objects we want unpaged from -lsys SYS_OBJS_UNPAGED=assert.o stacktrace.o -assert.o: ${NETBSDSRCDIR}/lib/libsys/assert.c -stacktrace.o: ${NETBSDSRCDIR}/lib/libsys/stacktrace.c +assert.o: ${NETBSDSRCDIR}/minix/lib/libsys/assert.c +stacktrace.o: ${NETBSDSRCDIR}/minix/lib/libsys/stacktrace.c # objects we want unpaged from -lminc MINC_OBJS_UNPAGED= atoi.o \ @@ -21,7 +21,7 @@ MINC_OBJS_UNPAGED= atoi.o \ strcmp.o strcpy.o strlen.o strncmp.o \ memcpy.o memmove.o memset.o \ udivdi3.o umoddi3.o qdivrem.o -atoi.o: ${NETBSDSRCDIR}/lib/libminc/atoi.c +atoi.o: ${NETBSDSRCDIR}/minix/lib/libminc/atoi.c printf.o: ${NETBSDSRCDIR}/sys/lib/libsa/printf.c subr_prf.o: ${NETBSDSRCDIR}/sys/lib/libsa/subr_prf.c memcpy.o: ${NETBSDSRCDIR}/common/lib/libc/arch/i386/string/memcpy.S @@ -111,7 +111,7 @@ SRCS+= procoffsets.h PROCOFFSETSCF=procoffsets.cf -.PATH: ${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include +.PATH: ${NETBSDSRCDIR}/minix/include/arch/${MACHINE_ARCH}/include procoffsets.h: ${PROCOFFSETSCF} kernel.h proc.h stackframe.h archtypes.h ${_MKTARGET_CREATE} diff --git a/kernel/arch/i386/acpi.c b/minix/kernel/arch/i386/acpi.c similarity index 100% rename from kernel/arch/i386/acpi.c rename to minix/kernel/arch/i386/acpi.c diff --git a/kernel/arch/i386/acpi.h b/minix/kernel/arch/i386/acpi.h similarity index 100% rename from kernel/arch/i386/acpi.h rename to minix/kernel/arch/i386/acpi.h diff --git a/kernel/arch/i386/apic.c b/minix/kernel/arch/i386/apic.c similarity index 100% rename from kernel/arch/i386/apic.c rename to minix/kernel/arch/i386/apic.c diff --git a/kernel/arch/i386/apic.h b/minix/kernel/arch/i386/apic.h similarity index 100% rename from kernel/arch/i386/apic.h rename to minix/kernel/arch/i386/apic.h diff --git a/kernel/arch/i386/apic_asm.S b/minix/kernel/arch/i386/apic_asm.S similarity index 100% rename from kernel/arch/i386/apic_asm.S rename to minix/kernel/arch/i386/apic_asm.S diff --git a/kernel/arch/i386/apic_asm.h b/minix/kernel/arch/i386/apic_asm.h similarity index 100% rename from kernel/arch/i386/apic_asm.h rename to minix/kernel/arch/i386/apic_asm.h diff --git a/kernel/arch/i386/arch_clock.c b/minix/kernel/arch/i386/arch_clock.c similarity index 100% rename from kernel/arch/i386/arch_clock.c rename to minix/kernel/arch/i386/arch_clock.c diff --git a/kernel/arch/i386/arch_do_vmctl.c b/minix/kernel/arch/i386/arch_do_vmctl.c similarity index 100% rename from kernel/arch/i386/arch_do_vmctl.c rename to minix/kernel/arch/i386/arch_do_vmctl.c diff --git a/kernel/arch/i386/arch_reset.c b/minix/kernel/arch/i386/arch_reset.c similarity index 100% rename from kernel/arch/i386/arch_reset.c rename to minix/kernel/arch/i386/arch_reset.c diff --git a/kernel/arch/i386/arch_smp.c b/minix/kernel/arch/i386/arch_smp.c similarity index 100% rename from kernel/arch/i386/arch_smp.c rename to minix/kernel/arch/i386/arch_smp.c diff --git a/kernel/arch/i386/arch_system.c b/minix/kernel/arch/i386/arch_system.c similarity index 100% rename from kernel/arch/i386/arch_system.c rename to minix/kernel/arch/i386/arch_system.c diff --git a/kernel/arch/i386/arch_watchdog.c b/minix/kernel/arch/i386/arch_watchdog.c similarity index 100% rename from kernel/arch/i386/arch_watchdog.c rename to minix/kernel/arch/i386/arch_watchdog.c diff --git a/kernel/arch/i386/breakpoints.c b/minix/kernel/arch/i386/breakpoints.c similarity index 100% rename from kernel/arch/i386/breakpoints.c rename to minix/kernel/arch/i386/breakpoints.c diff --git a/kernel/arch/i386/debugreg.S b/minix/kernel/arch/i386/debugreg.S similarity index 100% rename from kernel/arch/i386/debugreg.S rename to minix/kernel/arch/i386/debugreg.S diff --git a/kernel/arch/i386/debugreg.h b/minix/kernel/arch/i386/debugreg.h similarity index 100% rename from kernel/arch/i386/debugreg.h rename to minix/kernel/arch/i386/debugreg.h diff --git a/kernel/arch/i386/direct_tty_utils.c b/minix/kernel/arch/i386/direct_tty_utils.c similarity index 100% rename from kernel/arch/i386/direct_tty_utils.c rename to minix/kernel/arch/i386/direct_tty_utils.c diff --git a/kernel/arch/i386/do_iopenable.c b/minix/kernel/arch/i386/do_iopenable.c similarity index 100% rename from kernel/arch/i386/do_iopenable.c rename to minix/kernel/arch/i386/do_iopenable.c diff --git a/kernel/arch/i386/do_readbios.c b/minix/kernel/arch/i386/do_readbios.c similarity index 100% rename from kernel/arch/i386/do_readbios.c rename to minix/kernel/arch/i386/do_readbios.c diff --git a/kernel/arch/i386/do_sdevio.c b/minix/kernel/arch/i386/do_sdevio.c similarity index 100% rename from kernel/arch/i386/do_sdevio.c rename to minix/kernel/arch/i386/do_sdevio.c diff --git a/kernel/arch/i386/exception.c b/minix/kernel/arch/i386/exception.c similarity index 100% rename from kernel/arch/i386/exception.c rename to minix/kernel/arch/i386/exception.c diff --git a/kernel/arch/i386/glo.h b/minix/kernel/arch/i386/glo.h similarity index 100% rename from kernel/arch/i386/glo.h rename to minix/kernel/arch/i386/glo.h diff --git a/kernel/arch/i386/head.S b/minix/kernel/arch/i386/head.S similarity index 100% rename from kernel/arch/i386/head.S rename to minix/kernel/arch/i386/head.S diff --git a/kernel/arch/i386/i8259.c b/minix/kernel/arch/i386/i8259.c similarity index 100% rename from kernel/arch/i386/i8259.c rename to minix/kernel/arch/i386/i8259.c diff --git a/kernel/arch/i386/include/arch_clock.h b/minix/kernel/arch/i386/include/arch_clock.h similarity index 100% rename from kernel/arch/i386/include/arch_clock.h rename to minix/kernel/arch/i386/include/arch_clock.h diff --git a/kernel/arch/i386/include/arch_proto.h b/minix/kernel/arch/i386/include/arch_proto.h similarity index 100% rename from kernel/arch/i386/include/arch_proto.h rename to minix/kernel/arch/i386/include/arch_proto.h diff --git a/kernel/arch/i386/include/arch_smp.h b/minix/kernel/arch/i386/include/arch_smp.h similarity index 100% rename from kernel/arch/i386/include/arch_smp.h rename to minix/kernel/arch/i386/include/arch_smp.h diff --git a/kernel/arch/i386/include/arch_watchdog.h b/minix/kernel/arch/i386/include/arch_watchdog.h similarity index 100% rename from kernel/arch/i386/include/arch_watchdog.h rename to minix/kernel/arch/i386/include/arch_watchdog.h diff --git a/kernel/arch/i386/include/archconst.h b/minix/kernel/arch/i386/include/archconst.h similarity index 100% rename from kernel/arch/i386/include/archconst.h rename to minix/kernel/arch/i386/include/archconst.h diff --git a/kernel/arch/i386/include/direct_utils.h b/minix/kernel/arch/i386/include/direct_utils.h similarity index 100% rename from kernel/arch/i386/include/direct_utils.h rename to minix/kernel/arch/i386/include/direct_utils.h diff --git a/kernel/arch/i386/include/hw_intr.h b/minix/kernel/arch/i386/include/hw_intr.h similarity index 100% rename from kernel/arch/i386/include/hw_intr.h rename to minix/kernel/arch/i386/include/hw_intr.h diff --git a/kernel/arch/i386/io_inb.S b/minix/kernel/arch/i386/io_inb.S similarity index 100% rename from kernel/arch/i386/io_inb.S rename to minix/kernel/arch/i386/io_inb.S diff --git a/kernel/arch/i386/io_inl.S b/minix/kernel/arch/i386/io_inl.S similarity index 100% rename from kernel/arch/i386/io_inl.S rename to minix/kernel/arch/i386/io_inl.S diff --git a/kernel/arch/i386/io_intr.S b/minix/kernel/arch/i386/io_intr.S similarity index 100% rename from kernel/arch/i386/io_intr.S rename to minix/kernel/arch/i386/io_intr.S diff --git a/kernel/arch/i386/io_inw.S b/minix/kernel/arch/i386/io_inw.S similarity index 100% rename from kernel/arch/i386/io_inw.S rename to minix/kernel/arch/i386/io_inw.S diff --git a/kernel/arch/i386/io_outb.S b/minix/kernel/arch/i386/io_outb.S similarity index 100% rename from kernel/arch/i386/io_outb.S rename to minix/kernel/arch/i386/io_outb.S diff --git a/kernel/arch/i386/io_outl.S b/minix/kernel/arch/i386/io_outl.S similarity index 100% rename from kernel/arch/i386/io_outl.S rename to minix/kernel/arch/i386/io_outl.S diff --git a/kernel/arch/i386/io_outw.S b/minix/kernel/arch/i386/io_outw.S similarity index 100% rename from kernel/arch/i386/io_outw.S rename to minix/kernel/arch/i386/io_outw.S diff --git a/kernel/arch/i386/kernel.lds b/minix/kernel/arch/i386/kernel.lds similarity index 100% rename from kernel/arch/i386/kernel.lds rename to minix/kernel/arch/i386/kernel.lds diff --git a/kernel/arch/i386/klib.S b/minix/kernel/arch/i386/klib.S similarity index 100% rename from kernel/arch/i386/klib.S rename to minix/kernel/arch/i386/klib.S diff --git a/kernel/arch/i386/memory.c b/minix/kernel/arch/i386/memory.c similarity index 100% rename from kernel/arch/i386/memory.c rename to minix/kernel/arch/i386/memory.c diff --git a/kernel/arch/i386/mpx.S b/minix/kernel/arch/i386/mpx.S similarity index 100% rename from kernel/arch/i386/mpx.S rename to minix/kernel/arch/i386/mpx.S diff --git a/kernel/arch/i386/oxpcie.c b/minix/kernel/arch/i386/oxpcie.c similarity index 100% rename from kernel/arch/i386/oxpcie.c rename to minix/kernel/arch/i386/oxpcie.c diff --git a/kernel/arch/i386/oxpcie.h b/minix/kernel/arch/i386/oxpcie.h similarity index 100% rename from kernel/arch/i386/oxpcie.h rename to minix/kernel/arch/i386/oxpcie.h diff --git a/kernel/arch/i386/pg_utils.c b/minix/kernel/arch/i386/pg_utils.c similarity index 100% rename from kernel/arch/i386/pg_utils.c rename to minix/kernel/arch/i386/pg_utils.c diff --git a/kernel/arch/i386/pre_init.c b/minix/kernel/arch/i386/pre_init.c similarity index 100% rename from kernel/arch/i386/pre_init.c rename to minix/kernel/arch/i386/pre_init.c diff --git a/kernel/arch/i386/procoffsets.cf b/minix/kernel/arch/i386/procoffsets.cf similarity index 100% rename from kernel/arch/i386/procoffsets.cf rename to minix/kernel/arch/i386/procoffsets.cf diff --git a/kernel/arch/i386/protect.c b/minix/kernel/arch/i386/protect.c similarity index 100% rename from kernel/arch/i386/protect.c rename to minix/kernel/arch/i386/protect.c diff --git a/kernel/arch/i386/sconst.h b/minix/kernel/arch/i386/sconst.h similarity index 100% rename from kernel/arch/i386/sconst.h rename to minix/kernel/arch/i386/sconst.h diff --git a/kernel/arch/i386/serial.h b/minix/kernel/arch/i386/serial.h similarity index 100% rename from kernel/arch/i386/serial.h rename to minix/kernel/arch/i386/serial.h diff --git a/kernel/arch/i386/trampoline.S b/minix/kernel/arch/i386/trampoline.S similarity index 100% rename from kernel/arch/i386/trampoline.S rename to minix/kernel/arch/i386/trampoline.S diff --git a/kernel/arch/i386/usermapped_data_arch.c b/minix/kernel/arch/i386/usermapped_data_arch.c similarity index 100% rename from kernel/arch/i386/usermapped_data_arch.c rename to minix/kernel/arch/i386/usermapped_data_arch.c diff --git a/kernel/arch/i386/usermapped_glo_ipc.S b/minix/kernel/arch/i386/usermapped_glo_ipc.S similarity index 100% rename from kernel/arch/i386/usermapped_glo_ipc.S rename to minix/kernel/arch/i386/usermapped_glo_ipc.S diff --git a/kernel/clock.c b/minix/kernel/clock.c similarity index 100% rename from kernel/clock.c rename to minix/kernel/clock.c diff --git a/kernel/clock.h b/minix/kernel/clock.h similarity index 100% rename from kernel/clock.h rename to minix/kernel/clock.h diff --git a/kernel/config.h b/minix/kernel/config.h similarity index 100% rename from kernel/config.h rename to minix/kernel/config.h diff --git a/kernel/const.h b/minix/kernel/const.h similarity index 100% rename from kernel/const.h rename to minix/kernel/const.h diff --git a/kernel/cpulocals.c b/minix/kernel/cpulocals.c similarity index 100% rename from kernel/cpulocals.c rename to minix/kernel/cpulocals.c diff --git a/kernel/cpulocals.h b/minix/kernel/cpulocals.h similarity index 100% rename from kernel/cpulocals.h rename to minix/kernel/cpulocals.h diff --git a/kernel/debug.c b/minix/kernel/debug.c similarity index 100% rename from kernel/debug.c rename to minix/kernel/debug.c diff --git a/kernel/debug.h b/minix/kernel/debug.h similarity index 100% rename from kernel/debug.h rename to minix/kernel/debug.h diff --git a/kernel/extract-errno.sh b/minix/kernel/extract-errno.sh similarity index 89% rename from kernel/extract-errno.sh rename to minix/kernel/extract-errno.sh index 09ba67bba..99b476599 100644 --- a/kernel/extract-errno.sh +++ b/minix/kernel/extract-errno.sh @@ -3,7 +3,7 @@ set -e # grep message type and errno constants and make them into a .h file -cat ../sys/sys/errno.h | \ +cat ../../sys/sys/errno.h | \ tr -s ' \t' ' ' | \ sed 's/^# /#/' | \ egrep '^#define [A-Z_][A-Z0-9_]* \( ?_SIGN ?[0-9]+ ?\)' | \ diff --git a/kernel/extract-mfield.sh b/minix/kernel/extract-mfield.sh similarity index 95% rename from kernel/extract-mfield.sh rename to minix/kernel/extract-mfield.sh index a84ba8f56..3651bfbc1 100644 --- a/kernel/extract-mfield.sh +++ b/minix/kernel/extract-mfield.sh @@ -4,7 +4,7 @@ set -e find_files_and_lines() ( - find ../lib/libc/sys-minix ../lib/libsys -name '*.c' | \ + find ../lib/libc/sys ../lib/libsys -name '*.c' | \ xargs egrep -n '((_syscall|_taskcall)\([^,][^,]*,[ ]*|_kernel_call\()[A-Z_][A-Z0-9_]*,[ ]*&m\)' | \ cut -d: -f1,2 ) diff --git a/kernel/extract-mtype.sh b/minix/kernel/extract-mtype.sh similarity index 100% rename from kernel/extract-mtype.sh rename to minix/kernel/extract-mtype.sh diff --git a/kernel/glo.h b/minix/kernel/glo.h similarity index 100% rename from kernel/glo.h rename to minix/kernel/glo.h diff --git a/kernel/interrupt.c b/minix/kernel/interrupt.c similarity index 100% rename from kernel/interrupt.c rename to minix/kernel/interrupt.c diff --git a/kernel/interrupt.h b/minix/kernel/interrupt.h similarity index 100% rename from kernel/interrupt.h rename to minix/kernel/interrupt.h diff --git a/kernel/ipc.h b/minix/kernel/ipc.h similarity index 100% rename from kernel/ipc.h rename to minix/kernel/ipc.h diff --git a/kernel/kernel.h b/minix/kernel/kernel.h similarity index 100% rename from kernel/kernel.h rename to minix/kernel/kernel.h diff --git a/kernel/main.c b/minix/kernel/main.c similarity index 100% rename from kernel/main.c rename to minix/kernel/main.c diff --git a/kernel/priv.h b/minix/kernel/priv.h similarity index 100% rename from kernel/priv.h rename to minix/kernel/priv.h diff --git a/kernel/proc.c b/minix/kernel/proc.c similarity index 100% rename from kernel/proc.c rename to minix/kernel/proc.c diff --git a/kernel/proc.h b/minix/kernel/proc.h similarity index 100% rename from kernel/proc.h rename to minix/kernel/proc.h diff --git a/kernel/profile.c b/minix/kernel/profile.c similarity index 100% rename from kernel/profile.c rename to minix/kernel/profile.c diff --git a/kernel/profile.h b/minix/kernel/profile.h similarity index 100% rename from kernel/profile.h rename to minix/kernel/profile.h diff --git a/kernel/proto.h b/minix/kernel/proto.h similarity index 100% rename from kernel/proto.h rename to minix/kernel/proto.h diff --git a/kernel/smp.c b/minix/kernel/smp.c similarity index 100% rename from kernel/smp.c rename to minix/kernel/smp.c diff --git a/kernel/smp.h b/minix/kernel/smp.h similarity index 100% rename from kernel/smp.h rename to minix/kernel/smp.h diff --git a/kernel/spinlock.h b/minix/kernel/spinlock.h similarity index 100% rename from kernel/spinlock.h rename to minix/kernel/spinlock.h diff --git a/kernel/system.c b/minix/kernel/system.c similarity index 100% rename from kernel/system.c rename to minix/kernel/system.c diff --git a/kernel/system.h b/minix/kernel/system.h similarity index 100% rename from kernel/system.h rename to minix/kernel/system.h diff --git a/kernel/system/Makefile.inc b/minix/kernel/system/Makefile.inc similarity index 100% rename from kernel/system/Makefile.inc rename to minix/kernel/system/Makefile.inc diff --git a/kernel/system/do_abort.c b/minix/kernel/system/do_abort.c similarity index 100% rename from kernel/system/do_abort.c rename to minix/kernel/system/do_abort.c diff --git a/kernel/system/do_clear.c b/minix/kernel/system/do_clear.c similarity index 100% rename from kernel/system/do_clear.c rename to minix/kernel/system/do_clear.c diff --git a/kernel/system/do_copy.c b/minix/kernel/system/do_copy.c similarity index 100% rename from kernel/system/do_copy.c rename to minix/kernel/system/do_copy.c diff --git a/kernel/system/do_cprofile.c b/minix/kernel/system/do_cprofile.c similarity index 100% rename from kernel/system/do_cprofile.c rename to minix/kernel/system/do_cprofile.c diff --git a/kernel/system/do_devio.c b/minix/kernel/system/do_devio.c similarity index 100% rename from kernel/system/do_devio.c rename to minix/kernel/system/do_devio.c diff --git a/kernel/system/do_diagctl.c b/minix/kernel/system/do_diagctl.c similarity index 100% rename from kernel/system/do_diagctl.c rename to minix/kernel/system/do_diagctl.c diff --git a/kernel/system/do_endksig.c b/minix/kernel/system/do_endksig.c similarity index 100% rename from kernel/system/do_endksig.c rename to minix/kernel/system/do_endksig.c diff --git a/kernel/system/do_exec.c b/minix/kernel/system/do_exec.c similarity index 100% rename from kernel/system/do_exec.c rename to minix/kernel/system/do_exec.c diff --git a/kernel/system/do_exit.c b/minix/kernel/system/do_exit.c similarity index 100% rename from kernel/system/do_exit.c rename to minix/kernel/system/do_exit.c diff --git a/kernel/system/do_fork.c b/minix/kernel/system/do_fork.c similarity index 100% rename from kernel/system/do_fork.c rename to minix/kernel/system/do_fork.c diff --git a/kernel/system/do_getinfo.c b/minix/kernel/system/do_getinfo.c similarity index 100% rename from kernel/system/do_getinfo.c rename to minix/kernel/system/do_getinfo.c diff --git a/kernel/system/do_getksig.c b/minix/kernel/system/do_getksig.c similarity index 100% rename from kernel/system/do_getksig.c rename to minix/kernel/system/do_getksig.c diff --git a/kernel/system/do_irqctl.c b/minix/kernel/system/do_irqctl.c similarity index 100% rename from kernel/system/do_irqctl.c rename to minix/kernel/system/do_irqctl.c diff --git a/kernel/system/do_kill.c b/minix/kernel/system/do_kill.c similarity index 100% rename from kernel/system/do_kill.c rename to minix/kernel/system/do_kill.c diff --git a/kernel/system/do_mcontext.c b/minix/kernel/system/do_mcontext.c similarity index 100% rename from kernel/system/do_mcontext.c rename to minix/kernel/system/do_mcontext.c diff --git a/kernel/system/do_memset.c b/minix/kernel/system/do_memset.c similarity index 100% rename from kernel/system/do_memset.c rename to minix/kernel/system/do_memset.c diff --git a/kernel/system/do_privctl.c b/minix/kernel/system/do_privctl.c similarity index 100% rename from kernel/system/do_privctl.c rename to minix/kernel/system/do_privctl.c diff --git a/kernel/system/do_profbuf.c b/minix/kernel/system/do_profbuf.c similarity index 100% rename from kernel/system/do_profbuf.c rename to minix/kernel/system/do_profbuf.c diff --git a/kernel/system/do_runctl.c b/minix/kernel/system/do_runctl.c similarity index 100% rename from kernel/system/do_runctl.c rename to minix/kernel/system/do_runctl.c diff --git a/kernel/system/do_safecopy.c b/minix/kernel/system/do_safecopy.c similarity index 100% rename from kernel/system/do_safecopy.c rename to minix/kernel/system/do_safecopy.c diff --git a/kernel/system/do_safememset.c b/minix/kernel/system/do_safememset.c similarity index 100% rename from kernel/system/do_safememset.c rename to minix/kernel/system/do_safememset.c diff --git a/kernel/system/do_schedctl.c b/minix/kernel/system/do_schedctl.c similarity index 100% rename from kernel/system/do_schedctl.c rename to minix/kernel/system/do_schedctl.c diff --git a/kernel/system/do_schedule.c b/minix/kernel/system/do_schedule.c similarity index 100% rename from kernel/system/do_schedule.c rename to minix/kernel/system/do_schedule.c diff --git a/kernel/system/do_setalarm.c b/minix/kernel/system/do_setalarm.c similarity index 100% rename from kernel/system/do_setalarm.c rename to minix/kernel/system/do_setalarm.c diff --git a/kernel/system/do_setgrant.c b/minix/kernel/system/do_setgrant.c similarity index 100% rename from kernel/system/do_setgrant.c rename to minix/kernel/system/do_setgrant.c diff --git a/kernel/system/do_settime.c b/minix/kernel/system/do_settime.c similarity index 100% rename from kernel/system/do_settime.c rename to minix/kernel/system/do_settime.c diff --git a/kernel/system/do_sigreturn.c b/minix/kernel/system/do_sigreturn.c similarity index 100% rename from kernel/system/do_sigreturn.c rename to minix/kernel/system/do_sigreturn.c diff --git a/kernel/system/do_sigsend.c b/minix/kernel/system/do_sigsend.c similarity index 100% rename from kernel/system/do_sigsend.c rename to minix/kernel/system/do_sigsend.c diff --git a/kernel/system/do_sprofile.c b/minix/kernel/system/do_sprofile.c similarity index 100% rename from kernel/system/do_sprofile.c rename to minix/kernel/system/do_sprofile.c diff --git a/kernel/system/do_statectl.c b/minix/kernel/system/do_statectl.c similarity index 100% rename from kernel/system/do_statectl.c rename to minix/kernel/system/do_statectl.c diff --git a/kernel/system/do_stime.c b/minix/kernel/system/do_stime.c similarity index 100% rename from kernel/system/do_stime.c rename to minix/kernel/system/do_stime.c diff --git a/kernel/system/do_times.c b/minix/kernel/system/do_times.c similarity index 100% rename from kernel/system/do_times.c rename to minix/kernel/system/do_times.c diff --git a/kernel/system/do_trace.c b/minix/kernel/system/do_trace.c similarity index 100% rename from kernel/system/do_trace.c rename to minix/kernel/system/do_trace.c diff --git a/kernel/system/do_umap.c b/minix/kernel/system/do_umap.c similarity index 100% rename from kernel/system/do_umap.c rename to minix/kernel/system/do_umap.c diff --git a/kernel/system/do_umap_remote.c b/minix/kernel/system/do_umap_remote.c similarity index 100% rename from kernel/system/do_umap_remote.c rename to minix/kernel/system/do_umap_remote.c diff --git a/kernel/system/do_update.c b/minix/kernel/system/do_update.c similarity index 100% rename from kernel/system/do_update.c rename to minix/kernel/system/do_update.c diff --git a/kernel/system/do_vdevio.c b/minix/kernel/system/do_vdevio.c similarity index 100% rename from kernel/system/do_vdevio.c rename to minix/kernel/system/do_vdevio.c diff --git a/kernel/system/do_vmctl.c b/minix/kernel/system/do_vmctl.c similarity index 100% rename from kernel/system/do_vmctl.c rename to minix/kernel/system/do_vmctl.c diff --git a/kernel/system/do_vtimer.c b/minix/kernel/system/do_vtimer.c similarity index 100% rename from kernel/system/do_vtimer.c rename to minix/kernel/system/do_vtimer.c diff --git a/kernel/system/do_vumap.c b/minix/kernel/system/do_vumap.c similarity index 100% rename from kernel/system/do_vumap.c rename to minix/kernel/system/do_vumap.c diff --git a/kernel/table.c b/minix/kernel/table.c similarity index 100% rename from kernel/table.c rename to minix/kernel/table.c diff --git a/kernel/type.h b/minix/kernel/type.h similarity index 100% rename from kernel/type.h rename to minix/kernel/type.h diff --git a/kernel/usermapped_data.c b/minix/kernel/usermapped_data.c similarity index 100% rename from kernel/usermapped_data.c rename to minix/kernel/usermapped_data.c diff --git a/kernel/utility.c b/minix/kernel/utility.c similarity index 100% rename from kernel/utility.c rename to minix/kernel/utility.c diff --git a/kernel/vm.h b/minix/kernel/vm.h similarity index 100% rename from kernel/vm.h rename to minix/kernel/vm.h diff --git a/kernel/watchdog.c b/minix/kernel/watchdog.c similarity index 100% rename from kernel/watchdog.c rename to minix/kernel/watchdog.c diff --git a/kernel/watchdog.h b/minix/kernel/watchdog.h similarity index 100% rename from kernel/watchdog.h rename to minix/kernel/watchdog.h diff --git a/minix/lib/Makefile b/minix/lib/Makefile new file mode 100644 index 000000000..c245be803 --- /dev/null +++ b/minix/lib/Makefile @@ -0,0 +1,52 @@ +.include + +SUBDIR+= libminlib +SUBDIR+= .WAIT + +SUBDIR+= libsys +SUBDIR+= libmthread +SUBDIR+= .WAIT + +SUBDIR+= libasyn +SUBDIR+= libaudiodriver +SUBDIR+= libbdev +SUBDIR+= libblockdriver +SUBDIR+= libchardriver +SUBDIR+= libcompat_minix +SUBDIR+= libddekit +SUBDIR+= libdevman +SUBDIR+= libexec +SUBDIR+= libfetch +SUBDIR+= libinputdriver +SUBDIR+= libminc +SUBDIR+= libminixfs +SUBDIR+= libnetdriver +SUBDIR+= libsffs +SUBDIR+= libtimers +SUBDIR+= libusb +SUBDIR+= libvtreefs + +.if (${HAVE_LIBGCC} == "no") +SUBDIR+= libgcc_s_empty +.endif + +.if (${MKLWIP} == "yes") +SUBDIR+= liblwip +SUBDIR+= libnetsock +.endif + +.if (${MACHINE_ARCH} == "i386") +SUBDIR+= libhgfs +SUBDIR+= libvassert +SUBDIR+= libvboxfs +SUBDIR+= libvirtio +.endif + +.if (${MACHINE_ARCH} == "earm") +SUBDIR+= libclkconf +SUBDIR+= libgpio +SUBDIR+= libi2cdriver +.endif + +.include +.include diff --git a/minix/lib/Makefile.inc b/minix/lib/Makefile.inc new file mode 100644 index 000000000..4f8970543 --- /dev/null +++ b/minix/lib/Makefile.inc @@ -0,0 +1 @@ +WARNS?= 5 diff --git a/lib/libasyn/Makefile b/minix/lib/libasyn/Makefile similarity index 100% rename from lib/libasyn/Makefile rename to minix/lib/libasyn/Makefile diff --git a/lib/libasyn/Makefile.inc b/minix/lib/libasyn/Makefile.inc similarity index 100% rename from lib/libasyn/Makefile.inc rename to minix/lib/libasyn/Makefile.inc diff --git a/lib/libasyn/asyn.h b/minix/lib/libasyn/asyn.h similarity index 100% rename from lib/libasyn/asyn.h rename to minix/lib/libasyn/asyn.h diff --git a/lib/libasyn/asyn_cancel.c b/minix/lib/libasyn/asyn_cancel.c similarity index 100% rename from lib/libasyn/asyn_cancel.c rename to minix/lib/libasyn/asyn_cancel.c diff --git a/lib/libasyn/asyn_close.c b/minix/lib/libasyn/asyn_close.c similarity index 100% rename from lib/libasyn/asyn_close.c rename to minix/lib/libasyn/asyn_close.c diff --git a/lib/libasyn/asyn_init.c b/minix/lib/libasyn/asyn_init.c similarity index 100% rename from lib/libasyn/asyn_init.c rename to minix/lib/libasyn/asyn_init.c diff --git a/lib/libasyn/asyn_pending.c b/minix/lib/libasyn/asyn_pending.c similarity index 100% rename from lib/libasyn/asyn_pending.c rename to minix/lib/libasyn/asyn_pending.c diff --git a/lib/libasyn/asyn_read.c b/minix/lib/libasyn/asyn_read.c similarity index 100% rename from lib/libasyn/asyn_read.c rename to minix/lib/libasyn/asyn_read.c diff --git a/lib/libasyn/asyn_special.c b/minix/lib/libasyn/asyn_special.c similarity index 100% rename from lib/libasyn/asyn_special.c rename to minix/lib/libasyn/asyn_special.c diff --git a/lib/libasyn/asyn_synch.c b/minix/lib/libasyn/asyn_synch.c similarity index 100% rename from lib/libasyn/asyn_synch.c rename to minix/lib/libasyn/asyn_synch.c diff --git a/lib/libasyn/asyn_wait.c b/minix/lib/libasyn/asyn_wait.c similarity index 100% rename from lib/libasyn/asyn_wait.c rename to minix/lib/libasyn/asyn_wait.c diff --git a/lib/libasyn/asyn_write.c b/minix/lib/libasyn/asyn_write.c similarity index 100% rename from lib/libasyn/asyn_write.c rename to minix/lib/libasyn/asyn_write.c diff --git a/lib/libasyn/asynchio.h b/minix/lib/libasyn/asynchio.h similarity index 100% rename from lib/libasyn/asynchio.h rename to minix/lib/libasyn/asynchio.h diff --git a/lib/libaudiodriver/Makefile b/minix/lib/libaudiodriver/Makefile similarity index 100% rename from lib/libaudiodriver/Makefile rename to minix/lib/libaudiodriver/Makefile diff --git a/lib/libaudiodriver/audio_fw.c b/minix/lib/libaudiodriver/audio_fw.c similarity index 100% rename from lib/libaudiodriver/audio_fw.c rename to minix/lib/libaudiodriver/audio_fw.c diff --git a/lib/libaudiodriver/liveupdate.c b/minix/lib/libaudiodriver/liveupdate.c similarity index 100% rename from lib/libaudiodriver/liveupdate.c rename to minix/lib/libaudiodriver/liveupdate.c diff --git a/lib/libbdev/Makefile b/minix/lib/libbdev/Makefile similarity index 100% rename from lib/libbdev/Makefile rename to minix/lib/libbdev/Makefile diff --git a/lib/libbdev/NOTES b/minix/lib/libbdev/NOTES similarity index 100% rename from lib/libbdev/NOTES rename to minix/lib/libbdev/NOTES diff --git a/lib/libbdev/bdev.c b/minix/lib/libbdev/bdev.c similarity index 100% rename from lib/libbdev/bdev.c rename to minix/lib/libbdev/bdev.c diff --git a/lib/libbdev/call.c b/minix/lib/libbdev/call.c similarity index 100% rename from lib/libbdev/call.c rename to minix/lib/libbdev/call.c diff --git a/lib/libbdev/const.h b/minix/lib/libbdev/const.h similarity index 100% rename from lib/libbdev/const.h rename to minix/lib/libbdev/const.h diff --git a/lib/libbdev/driver.c b/minix/lib/libbdev/driver.c similarity index 100% rename from lib/libbdev/driver.c rename to minix/lib/libbdev/driver.c diff --git a/lib/libbdev/ipc.c b/minix/lib/libbdev/ipc.c similarity index 100% rename from lib/libbdev/ipc.c rename to minix/lib/libbdev/ipc.c diff --git a/lib/libbdev/minor.c b/minix/lib/libbdev/minor.c similarity index 100% rename from lib/libbdev/minor.c rename to minix/lib/libbdev/minor.c diff --git a/lib/libbdev/proto.h b/minix/lib/libbdev/proto.h similarity index 100% rename from lib/libbdev/proto.h rename to minix/lib/libbdev/proto.h diff --git a/lib/libbdev/type.h b/minix/lib/libbdev/type.h similarity index 100% rename from lib/libbdev/type.h rename to minix/lib/libbdev/type.h diff --git a/lib/libblockdriver/Makefile b/minix/lib/libblockdriver/Makefile similarity index 100% rename from lib/libblockdriver/Makefile rename to minix/lib/libblockdriver/Makefile diff --git a/lib/libblockdriver/const.h b/minix/lib/libblockdriver/const.h similarity index 100% rename from lib/libblockdriver/const.h rename to minix/lib/libblockdriver/const.h diff --git a/lib/libblockdriver/driver.c b/minix/lib/libblockdriver/driver.c similarity index 100% rename from lib/libblockdriver/driver.c rename to minix/lib/libblockdriver/driver.c diff --git a/lib/libblockdriver/driver.h b/minix/lib/libblockdriver/driver.h similarity index 100% rename from lib/libblockdriver/driver.h rename to minix/lib/libblockdriver/driver.h diff --git a/lib/libblockdriver/driver_mt.c b/minix/lib/libblockdriver/driver_mt.c similarity index 100% rename from lib/libblockdriver/driver_mt.c rename to minix/lib/libblockdriver/driver_mt.c diff --git a/lib/libblockdriver/driver_st.c b/minix/lib/libblockdriver/driver_st.c similarity index 100% rename from lib/libblockdriver/driver_st.c rename to minix/lib/libblockdriver/driver_st.c diff --git a/lib/libblockdriver/drvlib.c b/minix/lib/libblockdriver/drvlib.c similarity index 100% rename from lib/libblockdriver/drvlib.c rename to minix/lib/libblockdriver/drvlib.c diff --git a/lib/libblockdriver/mq.c b/minix/lib/libblockdriver/mq.c similarity index 100% rename from lib/libblockdriver/mq.c rename to minix/lib/libblockdriver/mq.c diff --git a/lib/libblockdriver/mq.h b/minix/lib/libblockdriver/mq.h similarity index 100% rename from lib/libblockdriver/mq.h rename to minix/lib/libblockdriver/mq.h diff --git a/lib/libblockdriver/trace.c b/minix/lib/libblockdriver/trace.c similarity index 100% rename from lib/libblockdriver/trace.c rename to minix/lib/libblockdriver/trace.c diff --git a/lib/libblockdriver/trace.h b/minix/lib/libblockdriver/trace.h similarity index 100% rename from lib/libblockdriver/trace.h rename to minix/lib/libblockdriver/trace.h diff --git a/lib/libc/minix/Makefile.inc b/minix/lib/libc/Makefile.inc similarity index 70% rename from lib/libc/minix/Makefile.inc rename to minix/lib/libc/Makefile.inc index 286a38fbd..a78d7ffc4 100644 --- a/lib/libc/minix/Makefile.inc +++ b/minix/lib/libc/Makefile.inc @@ -1,5 +1,5 @@ # MINIX Specifics sources -.PATH: ${.CURDIR}/minix +.PATH: ${NETBSDSRCDIR}/minix/lib/libc SRCS+= minix-malloc.c minix-calloc.c SRCS+= minix-malloc-debug.c diff --git a/lib/libc/arch/arm/sys-minix/Makefile.inc b/minix/lib/libc/arch/arm/sys/Makefile.inc similarity index 76% rename from lib/libc/arch/arm/sys-minix/Makefile.inc rename to minix/lib/libc/arch/arm/sys/Makefile.inc index f638e49ea..a915fcc76 100644 --- a/lib/libc/arch/arm/sys-minix/Makefile.inc +++ b/minix/lib/libc/arch/arm/sys/Makefile.inc @@ -1,5 +1,5 @@ # rts sources -HERE=${ARCHDIR}/sys-minix +HERE=${NETBSDSRCDIR}/minix/lib/libc/arch/${ARCHSUBDIR}/sys .PATH: ${HERE} TMP=ucontextoffsets.h.tmp @@ -19,7 +19,7 @@ SRCS+= \ ucontextoffsets.h: ${CF} ucontextoffsets.h: ${NETBSDSRCDIR}/sys/sys/ucontext.h -ucontextoffsets.h: ${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include/stackframe.h +ucontextoffsets.h: ${NETBSDSRCDIR}/minix/include/arch/${MACHINE_ARCH}/include/stackframe.h ucontextoffsets.h: ${_MKTARGET_CREATE} cat ${CF} | \ diff --git a/lib/libc/arch/arm/sys-minix/__sigreturn.S b/minix/lib/libc/arch/arm/sys/__sigreturn.S similarity index 100% rename from lib/libc/arch/arm/sys-minix/__sigreturn.S rename to minix/lib/libc/arch/arm/sys/__sigreturn.S diff --git a/lib/libc/arch/arm/sys-minix/_do_kernel_call_intr.S b/minix/lib/libc/arch/arm/sys/_do_kernel_call_intr.S similarity index 100% rename from lib/libc/arch/arm/sys-minix/_do_kernel_call_intr.S rename to minix/lib/libc/arch/arm/sys/_do_kernel_call_intr.S diff --git a/lib/libc/arch/arm/sys-minix/_ipc.S b/minix/lib/libc/arch/arm/sys/_ipc.S similarity index 100% rename from lib/libc/arch/arm/sys-minix/_ipc.S rename to minix/lib/libc/arch/arm/sys/_ipc.S diff --git a/lib/libc/arch/arm/sys-minix/brksize.S b/minix/lib/libc/arch/arm/sys/brksize.S similarity index 100% rename from lib/libc/arch/arm/sys-minix/brksize.S rename to minix/lib/libc/arch/arm/sys/brksize.S diff --git a/lib/libc/arch/arm/sys-minix/get_minix_kerninfo.S b/minix/lib/libc/arch/arm/sys/get_minix_kerninfo.S similarity index 100% rename from lib/libc/arch/arm/sys-minix/get_minix_kerninfo.S rename to minix/lib/libc/arch/arm/sys/get_minix_kerninfo.S diff --git a/lib/libc/arch/arm/sys-minix/ucontext.S b/minix/lib/libc/arch/arm/sys/ucontext.S similarity index 100% rename from lib/libc/arch/arm/sys-minix/ucontext.S rename to minix/lib/libc/arch/arm/sys/ucontext.S diff --git a/lib/libc/arch/arm/sys-minix/ucontextoffsets.cf b/minix/lib/libc/arch/arm/sys/ucontextoffsets.cf similarity index 100% rename from lib/libc/arch/arm/sys-minix/ucontextoffsets.cf rename to minix/lib/libc/arch/arm/sys/ucontextoffsets.cf diff --git a/lib/libc/arch/i386/sys-minix/Makefile.inc b/minix/lib/libc/arch/i386/sys/Makefile.inc similarity index 76% rename from lib/libc/arch/i386/sys-minix/Makefile.inc rename to minix/lib/libc/arch/i386/sys/Makefile.inc index f638e49ea..a915fcc76 100644 --- a/lib/libc/arch/i386/sys-minix/Makefile.inc +++ b/minix/lib/libc/arch/i386/sys/Makefile.inc @@ -1,5 +1,5 @@ # rts sources -HERE=${ARCHDIR}/sys-minix +HERE=${NETBSDSRCDIR}/minix/lib/libc/arch/${ARCHSUBDIR}/sys .PATH: ${HERE} TMP=ucontextoffsets.h.tmp @@ -19,7 +19,7 @@ SRCS+= \ ucontextoffsets.h: ${CF} ucontextoffsets.h: ${NETBSDSRCDIR}/sys/sys/ucontext.h -ucontextoffsets.h: ${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include/stackframe.h +ucontextoffsets.h: ${NETBSDSRCDIR}/minix/include/arch/${MACHINE_ARCH}/include/stackframe.h ucontextoffsets.h: ${_MKTARGET_CREATE} cat ${CF} | \ diff --git a/lib/libc/arch/i386/sys-minix/__sigreturn.S b/minix/lib/libc/arch/i386/sys/__sigreturn.S similarity index 100% rename from lib/libc/arch/i386/sys-minix/__sigreturn.S rename to minix/lib/libc/arch/i386/sys/__sigreturn.S diff --git a/lib/libc/arch/i386/sys-minix/_do_kernel_call_intr.S b/minix/lib/libc/arch/i386/sys/_do_kernel_call_intr.S similarity index 100% rename from lib/libc/arch/i386/sys-minix/_do_kernel_call_intr.S rename to minix/lib/libc/arch/i386/sys/_do_kernel_call_intr.S diff --git a/lib/libc/arch/i386/sys-minix/_ipc.S b/minix/lib/libc/arch/i386/sys/_ipc.S similarity index 100% rename from lib/libc/arch/i386/sys-minix/_ipc.S rename to minix/lib/libc/arch/i386/sys/_ipc.S diff --git a/lib/libc/arch/i386/sys-minix/brksize.S b/minix/lib/libc/arch/i386/sys/brksize.S similarity index 100% rename from lib/libc/arch/i386/sys-minix/brksize.S rename to minix/lib/libc/arch/i386/sys/brksize.S diff --git a/lib/libc/arch/i386/sys-minix/get_minix_kerninfo.S b/minix/lib/libc/arch/i386/sys/get_minix_kerninfo.S similarity index 100% rename from lib/libc/arch/i386/sys-minix/get_minix_kerninfo.S rename to minix/lib/libc/arch/i386/sys/get_minix_kerninfo.S diff --git a/lib/libc/arch/i386/sys-minix/ucontext.S b/minix/lib/libc/arch/i386/sys/ucontext.S similarity index 100% rename from lib/libc/arch/i386/sys-minix/ucontext.S rename to minix/lib/libc/arch/i386/sys/ucontext.S diff --git a/lib/libc/arch/i386/sys-minix/ucontextoffsets.cf b/minix/lib/libc/arch/i386/sys/ucontextoffsets.cf similarity index 100% rename from lib/libc/arch/i386/sys-minix/ucontextoffsets.cf rename to minix/lib/libc/arch/i386/sys/ucontextoffsets.cf diff --git a/lib/libc/gen/minix/clock.c b/minix/lib/libc/gen/clock.c similarity index 100% rename from lib/libc/gen/minix/clock.c rename to minix/lib/libc/gen/clock.c diff --git a/lib/libc/gen/minix/getdomainname.c b/minix/lib/libc/gen/getdomainname.c similarity index 100% rename from lib/libc/gen/minix/getdomainname.c rename to minix/lib/libc/gen/getdomainname.c diff --git a/lib/libc/gen/minix/gethostname.c b/minix/lib/libc/gen/gethostname.c similarity index 100% rename from lib/libc/gen/minix/gethostname.c rename to minix/lib/libc/gen/gethostname.c diff --git a/lib/libc/gen/minix/getloadavg.c b/minix/lib/libc/gen/getloadavg.c similarity index 100% rename from lib/libc/gen/minix/getloadavg.c rename to minix/lib/libc/gen/getloadavg.c diff --git a/lib/libc/gen/minix/getpagesize.c b/minix/lib/libc/gen/getpagesize.c similarity index 100% rename from lib/libc/gen/minix/getpagesize.c rename to minix/lib/libc/gen/getpagesize.c diff --git a/lib/libc/gen/minix/getpass.c b/minix/lib/libc/gen/getpass.c similarity index 100% rename from lib/libc/gen/minix/getpass.c rename to minix/lib/libc/gen/getpass.c diff --git a/lib/libc/gen/minix/raise.c b/minix/lib/libc/gen/raise.c similarity index 100% rename from lib/libc/gen/minix/raise.c rename to minix/lib/libc/gen/raise.c diff --git a/lib/libc/gen/minix/sethostname.c b/minix/lib/libc/gen/sethostname.c similarity index 100% rename from lib/libc/gen/minix/sethostname.c rename to minix/lib/libc/gen/sethostname.c diff --git a/lib/libc/gen/minix/sysconf.c b/minix/lib/libc/gen/sysconf.c similarity index 100% rename from lib/libc/gen/minix/sysconf.c rename to minix/lib/libc/gen/sysconf.c diff --git a/lib/libc/gen/minix/uname.c b/minix/lib/libc/gen/uname.c similarity index 100% rename from lib/libc/gen/minix/uname.c rename to minix/lib/libc/gen/uname.c diff --git a/lib/libc/gen/minix/wait.c b/minix/lib/libc/gen/wait.c similarity index 100% rename from lib/libc/gen/minix/wait.c rename to minix/lib/libc/gen/wait.c diff --git a/lib/libc/gen/minix/waitpid.c b/minix/lib/libc/gen/waitpid.c similarity index 100% rename from lib/libc/gen/minix/waitpid.c rename to minix/lib/libc/gen/waitpid.c diff --git a/lib/libc/minix/malloc-debug.h b/minix/lib/libc/malloc-debug.h similarity index 100% rename from lib/libc/minix/malloc-debug.h rename to minix/lib/libc/malloc-debug.h diff --git a/lib/libc/minix/minix-calloc.c b/minix/lib/libc/minix-calloc.c similarity index 100% rename from lib/libc/minix/minix-calloc.c rename to minix/lib/libc/minix-calloc.c diff --git a/lib/libc/minix/minix-malloc-debug.c b/minix/lib/libc/minix-malloc-debug.c similarity index 100% rename from lib/libc/minix/minix-malloc-debug.c rename to minix/lib/libc/minix-malloc-debug.c diff --git a/lib/libc/minix/minix-malloc.c b/minix/lib/libc/minix-malloc.c similarity index 100% rename from lib/libc/minix/minix-malloc.c rename to minix/lib/libc/minix-malloc.c diff --git a/lib/libc/net/minix/getifaddrs.c b/minix/lib/libc/net/getifaddrs.c similarity index 100% rename from lib/libc/net/minix/getifaddrs.c rename to minix/lib/libc/net/getifaddrs.c diff --git a/lib/libc/net/minix/getpeereid.c b/minix/lib/libc/net/getpeereid.c similarity index 100% rename from lib/libc/net/minix/getpeereid.c rename to minix/lib/libc/net/getpeereid.c diff --git a/lib/libc/sys-minix/MISSING_SYSCALLS b/minix/lib/libc/sys/MISSING_SYSCALLS similarity index 100% rename from lib/libc/sys-minix/MISSING_SYSCALLS rename to minix/lib/libc/sys/MISSING_SYSCALLS diff --git a/lib/libc/sys-minix/Makefile.inc b/minix/lib/libc/sys/Makefile.inc similarity index 93% rename from lib/libc/sys-minix/Makefile.inc rename to minix/lib/libc/sys/Makefile.inc index 4d3e0253f..b54699a10 100644 --- a/lib/libc/sys-minix/Makefile.inc +++ b/minix/lib/libc/sys/Makefile.inc @@ -1,4 +1,4 @@ -.PATH: ${.CURDIR}/sys-minix +.PATH: ${NETBSDSRCDIR}/minix/lib/libc/sys SRCS+= accept.c access.c adjtime.c bind.c brk.c sbrk.c m_closefrom.c getsid.c \ chdir.c chmod.c fchmod.c chown.c fchown.c chroot.c close.c \ @@ -32,4 +32,4 @@ OBJS+= lchown.o lchmod.o lchown.o lchown.pico lchown.bc: ${NETBSDSRCDIR}/tools/compat/lchown.c lchmod.o lchmod.pico lchmod.bc: ${NETBSDSRCDIR}/tools/compat/lchmod.c -.include "${ARCHDIR}/sys-minix/Makefile.inc" +.include "${NETBSDSRCDIR}/minix/lib/libc/arch/${ARCHSUBDIR}/sys/Makefile.inc" diff --git a/lib/libc/sys-minix/__getcwd.c b/minix/lib/libc/sys/__getcwd.c similarity index 100% rename from lib/libc/sys-minix/__getcwd.c rename to minix/lib/libc/sys/__getcwd.c diff --git a/lib/libc/sys-minix/__getlogin.c b/minix/lib/libc/sys/__getlogin.c similarity index 100% rename from lib/libc/sys-minix/__getlogin.c rename to minix/lib/libc/sys/__getlogin.c diff --git a/lib/libc/sys-minix/_exit.c b/minix/lib/libc/sys/_exit.c similarity index 100% rename from lib/libc/sys-minix/_exit.c rename to minix/lib/libc/sys/_exit.c diff --git a/lib/libc/sys-minix/_mcontext.c b/minix/lib/libc/sys/_mcontext.c similarity index 100% rename from lib/libc/sys-minix/_mcontext.c rename to minix/lib/libc/sys/_mcontext.c diff --git a/lib/libc/sys-minix/_ucontext.c b/minix/lib/libc/sys/_ucontext.c similarity index 100% rename from lib/libc/sys-minix/_ucontext.c rename to minix/lib/libc/sys/_ucontext.c diff --git a/lib/libc/sys-minix/accept.c b/minix/lib/libc/sys/accept.c similarity index 100% rename from lib/libc/sys-minix/accept.c rename to minix/lib/libc/sys/accept.c diff --git a/lib/libc/sys-minix/access.c b/minix/lib/libc/sys/access.c similarity index 100% rename from lib/libc/sys-minix/access.c rename to minix/lib/libc/sys/access.c diff --git a/lib/libc/sys-minix/adjtime.c b/minix/lib/libc/sys/adjtime.c similarity index 100% rename from lib/libc/sys-minix/adjtime.c rename to minix/lib/libc/sys/adjtime.c diff --git a/lib/libc/sys-minix/bind.c b/minix/lib/libc/sys/bind.c similarity index 100% rename from lib/libc/sys-minix/bind.c rename to minix/lib/libc/sys/bind.c diff --git a/lib/libc/sys-minix/brk.c b/minix/lib/libc/sys/brk.c similarity index 100% rename from lib/libc/sys-minix/brk.c rename to minix/lib/libc/sys/brk.c diff --git a/lib/libc/sys-minix/chdir.c b/minix/lib/libc/sys/chdir.c similarity index 100% rename from lib/libc/sys-minix/chdir.c rename to minix/lib/libc/sys/chdir.c diff --git a/lib/libc/sys-minix/chmod.c b/minix/lib/libc/sys/chmod.c similarity index 100% rename from lib/libc/sys-minix/chmod.c rename to minix/lib/libc/sys/chmod.c diff --git a/lib/libc/sys-minix/chown.c b/minix/lib/libc/sys/chown.c similarity index 100% rename from lib/libc/sys-minix/chown.c rename to minix/lib/libc/sys/chown.c diff --git a/lib/libc/sys-minix/chroot.c b/minix/lib/libc/sys/chroot.c similarity index 100% rename from lib/libc/sys-minix/chroot.c rename to minix/lib/libc/sys/chroot.c diff --git a/lib/libc/sys-minix/clock_getres.c b/minix/lib/libc/sys/clock_getres.c similarity index 100% rename from lib/libc/sys-minix/clock_getres.c rename to minix/lib/libc/sys/clock_getres.c diff --git a/lib/libc/sys-minix/clock_gettime.c b/minix/lib/libc/sys/clock_gettime.c similarity index 100% rename from lib/libc/sys-minix/clock_gettime.c rename to minix/lib/libc/sys/clock_gettime.c diff --git a/lib/libc/sys-minix/clock_settime.c b/minix/lib/libc/sys/clock_settime.c similarity index 100% rename from lib/libc/sys-minix/clock_settime.c rename to minix/lib/libc/sys/clock_settime.c diff --git a/lib/libc/sys-minix/close.c b/minix/lib/libc/sys/close.c similarity index 100% rename from lib/libc/sys-minix/close.c rename to minix/lib/libc/sys/close.c diff --git a/lib/libc/sys-minix/connect.c b/minix/lib/libc/sys/connect.c similarity index 100% rename from lib/libc/sys-minix/connect.c rename to minix/lib/libc/sys/connect.c diff --git a/lib/libc/sys-minix/cprofile.c b/minix/lib/libc/sys/cprofile.c similarity index 100% rename from lib/libc/sys-minix/cprofile.c rename to minix/lib/libc/sys/cprofile.c diff --git a/lib/libc/sys-minix/dup.c b/minix/lib/libc/sys/dup.c similarity index 100% rename from lib/libc/sys-minix/dup.c rename to minix/lib/libc/sys/dup.c diff --git a/lib/libc/sys-minix/dup2.c b/minix/lib/libc/sys/dup2.c similarity index 100% rename from lib/libc/sys-minix/dup2.c rename to minix/lib/libc/sys/dup2.c diff --git a/lib/libc/sys-minix/environ.c b/minix/lib/libc/sys/environ.c similarity index 100% rename from lib/libc/sys-minix/environ.c rename to minix/lib/libc/sys/environ.c diff --git a/lib/libc/sys-minix/execve.c b/minix/lib/libc/sys/execve.c similarity index 100% rename from lib/libc/sys-minix/execve.c rename to minix/lib/libc/sys/execve.c diff --git a/lib/libc/sys-minix/fchmod.c b/minix/lib/libc/sys/fchmod.c similarity index 100% rename from lib/libc/sys-minix/fchmod.c rename to minix/lib/libc/sys/fchmod.c diff --git a/lib/libc/sys-minix/fchown.c b/minix/lib/libc/sys/fchown.c similarity index 100% rename from lib/libc/sys-minix/fchown.c rename to minix/lib/libc/sys/fchown.c diff --git a/lib/libc/sys-minix/fcntl.c b/minix/lib/libc/sys/fcntl.c similarity index 100% rename from lib/libc/sys-minix/fcntl.c rename to minix/lib/libc/sys/fcntl.c diff --git a/lib/libc/sys-minix/flock.c b/minix/lib/libc/sys/flock.c similarity index 100% rename from lib/libc/sys-minix/flock.c rename to minix/lib/libc/sys/flock.c diff --git a/lib/libc/sys-minix/fork.c b/minix/lib/libc/sys/fork.c similarity index 100% rename from lib/libc/sys-minix/fork.c rename to minix/lib/libc/sys/fork.c diff --git a/lib/libc/sys-minix/fpathconf.c b/minix/lib/libc/sys/fpathconf.c similarity index 100% rename from lib/libc/sys-minix/fpathconf.c rename to minix/lib/libc/sys/fpathconf.c diff --git a/lib/libc/sys-minix/fstatfs.c b/minix/lib/libc/sys/fstatfs.c similarity index 100% rename from lib/libc/sys-minix/fstatfs.c rename to minix/lib/libc/sys/fstatfs.c diff --git a/lib/libc/sys-minix/fstatvfs.c b/minix/lib/libc/sys/fstatvfs.c similarity index 100% rename from lib/libc/sys-minix/fstatvfs.c rename to minix/lib/libc/sys/fstatvfs.c diff --git a/lib/libc/sys-minix/fsync.c b/minix/lib/libc/sys/fsync.c similarity index 100% rename from lib/libc/sys-minix/fsync.c rename to minix/lib/libc/sys/fsync.c diff --git a/lib/libc/sys-minix/ftruncate.c b/minix/lib/libc/sys/ftruncate.c similarity index 100% rename from lib/libc/sys-minix/ftruncate.c rename to minix/lib/libc/sys/ftruncate.c diff --git a/lib/libc/sys-minix/futimens.c b/minix/lib/libc/sys/futimens.c similarity index 100% rename from lib/libc/sys-minix/futimens.c rename to minix/lib/libc/sys/futimens.c diff --git a/lib/libc/sys-minix/futimes.c b/minix/lib/libc/sys/futimes.c similarity index 100% rename from lib/libc/sys-minix/futimes.c rename to minix/lib/libc/sys/futimes.c diff --git a/lib/libc/sys-minix/gcov_flush.c b/minix/lib/libc/sys/gcov_flush.c similarity index 100% rename from lib/libc/sys-minix/gcov_flush.c rename to minix/lib/libc/sys/gcov_flush.c diff --git a/lib/libc/sys-minix/getdents.c b/minix/lib/libc/sys/getdents.c similarity index 100% rename from lib/libc/sys-minix/getdents.c rename to minix/lib/libc/sys/getdents.c diff --git a/lib/libc/sys-minix/getegid.c b/minix/lib/libc/sys/getegid.c similarity index 100% rename from lib/libc/sys-minix/getegid.c rename to minix/lib/libc/sys/getegid.c diff --git a/lib/libc/sys-minix/geteuid.c b/minix/lib/libc/sys/geteuid.c similarity index 100% rename from lib/libc/sys-minix/geteuid.c rename to minix/lib/libc/sys/geteuid.c diff --git a/lib/libc/sys-minix/getgid.c b/minix/lib/libc/sys/getgid.c similarity index 100% rename from lib/libc/sys-minix/getgid.c rename to minix/lib/libc/sys/getgid.c diff --git a/lib/libc/sys-minix/getgroups.c b/minix/lib/libc/sys/getgroups.c similarity index 100% rename from lib/libc/sys-minix/getgroups.c rename to minix/lib/libc/sys/getgroups.c diff --git a/lib/libc/sys-minix/getitimer.c b/minix/lib/libc/sys/getitimer.c similarity index 100% rename from lib/libc/sys-minix/getitimer.c rename to minix/lib/libc/sys/getitimer.c diff --git a/lib/libc/sys-minix/getpeername.c b/minix/lib/libc/sys/getpeername.c similarity index 100% rename from lib/libc/sys-minix/getpeername.c rename to minix/lib/libc/sys/getpeername.c diff --git a/lib/libc/sys-minix/getpgrp.c b/minix/lib/libc/sys/getpgrp.c similarity index 100% rename from lib/libc/sys-minix/getpgrp.c rename to minix/lib/libc/sys/getpgrp.c diff --git a/lib/libc/sys-minix/getpid.c b/minix/lib/libc/sys/getpid.c similarity index 100% rename from lib/libc/sys-minix/getpid.c rename to minix/lib/libc/sys/getpid.c diff --git a/lib/libc/sys-minix/getppid.c b/minix/lib/libc/sys/getppid.c similarity index 100% rename from lib/libc/sys-minix/getppid.c rename to minix/lib/libc/sys/getppid.c diff --git a/lib/libc/sys-minix/getrlimit.c b/minix/lib/libc/sys/getrlimit.c similarity index 100% rename from lib/libc/sys-minix/getrlimit.c rename to minix/lib/libc/sys/getrlimit.c diff --git a/lib/libc/sys-minix/getrusage.c b/minix/lib/libc/sys/getrusage.c similarity index 100% rename from lib/libc/sys-minix/getrusage.c rename to minix/lib/libc/sys/getrusage.c diff --git a/lib/libc/sys-minix/getsid.c b/minix/lib/libc/sys/getsid.c similarity index 100% rename from lib/libc/sys-minix/getsid.c rename to minix/lib/libc/sys/getsid.c diff --git a/lib/libc/sys-minix/getsockname.c b/minix/lib/libc/sys/getsockname.c similarity index 100% rename from lib/libc/sys-minix/getsockname.c rename to minix/lib/libc/sys/getsockname.c diff --git a/lib/libc/sys-minix/getsockopt.c b/minix/lib/libc/sys/getsockopt.c similarity index 100% rename from lib/libc/sys-minix/getsockopt.c rename to minix/lib/libc/sys/getsockopt.c diff --git a/lib/libc/sys-minix/gettimeofday.c b/minix/lib/libc/sys/gettimeofday.c similarity index 100% rename from lib/libc/sys-minix/gettimeofday.c rename to minix/lib/libc/sys/gettimeofday.c diff --git a/lib/libc/sys-minix/getuid.c b/minix/lib/libc/sys/getuid.c similarity index 100% rename from lib/libc/sys-minix/getuid.c rename to minix/lib/libc/sys/getuid.c diff --git a/lib/libc/sys-minix/getvfsstat.c b/minix/lib/libc/sys/getvfsstat.c similarity index 100% rename from lib/libc/sys-minix/getvfsstat.c rename to minix/lib/libc/sys/getvfsstat.c diff --git a/lib/libc/sys-minix/init.c b/minix/lib/libc/sys/init.c similarity index 100% rename from lib/libc/sys-minix/init.c rename to minix/lib/libc/sys/init.c diff --git a/lib/libc/sys-minix/ioctl.c b/minix/lib/libc/sys/ioctl.c similarity index 100% rename from lib/libc/sys-minix/ioctl.c rename to minix/lib/libc/sys/ioctl.c diff --git a/lib/libc/sys-minix/issetugid.c b/minix/lib/libc/sys/issetugid.c similarity index 100% rename from lib/libc/sys-minix/issetugid.c rename to minix/lib/libc/sys/issetugid.c diff --git a/lib/libc/sys-minix/kill.c b/minix/lib/libc/sys/kill.c similarity index 100% rename from lib/libc/sys-minix/kill.c rename to minix/lib/libc/sys/kill.c diff --git a/lib/libc/sys-minix/link.c b/minix/lib/libc/sys/link.c similarity index 100% rename from lib/libc/sys-minix/link.c rename to minix/lib/libc/sys/link.c diff --git a/lib/libc/sys-minix/listen.c b/minix/lib/libc/sys/listen.c similarity index 100% rename from lib/libc/sys-minix/listen.c rename to minix/lib/libc/sys/listen.c diff --git a/lib/libc/sys-minix/loadname.c b/minix/lib/libc/sys/loadname.c similarity index 100% rename from lib/libc/sys-minix/loadname.c rename to minix/lib/libc/sys/loadname.c diff --git a/lib/libc/sys-minix/lseek.c b/minix/lib/libc/sys/lseek.c similarity index 100% rename from lib/libc/sys-minix/lseek.c rename to minix/lib/libc/sys/lseek.c diff --git a/lib/libc/sys-minix/lutimes.c b/minix/lib/libc/sys/lutimes.c similarity index 100% rename from lib/libc/sys-minix/lutimes.c rename to minix/lib/libc/sys/lutimes.c diff --git a/lib/libc/sys-minix/m_closefrom.c b/minix/lib/libc/sys/m_closefrom.c similarity index 100% rename from lib/libc/sys-minix/m_closefrom.c rename to minix/lib/libc/sys/m_closefrom.c diff --git a/lib/libc/sys-minix/minix_rs.c b/minix/lib/libc/sys/minix_rs.c similarity index 100% rename from lib/libc/sys-minix/minix_rs.c rename to minix/lib/libc/sys/minix_rs.c diff --git a/lib/libc/sys-minix/mkdir.c b/minix/lib/libc/sys/mkdir.c similarity index 100% rename from lib/libc/sys-minix/mkdir.c rename to minix/lib/libc/sys/mkdir.c diff --git a/lib/libc/sys-minix/mkfifo.c b/minix/lib/libc/sys/mkfifo.c similarity index 100% rename from lib/libc/sys-minix/mkfifo.c rename to minix/lib/libc/sys/mkfifo.c diff --git a/lib/libc/sys-minix/mknod.c b/minix/lib/libc/sys/mknod.c similarity index 100% rename from lib/libc/sys-minix/mknod.c rename to minix/lib/libc/sys/mknod.c diff --git a/lib/libc/sys-minix/mmap.c b/minix/lib/libc/sys/mmap.c similarity index 100% rename from lib/libc/sys-minix/mmap.c rename to minix/lib/libc/sys/mmap.c diff --git a/lib/libc/sys-minix/mount.c b/minix/lib/libc/sys/mount.c similarity index 100% rename from lib/libc/sys-minix/mount.c rename to minix/lib/libc/sys/mount.c diff --git a/lib/libc/sys-minix/nanosleep.c b/minix/lib/libc/sys/nanosleep.c similarity index 100% rename from lib/libc/sys-minix/nanosleep.c rename to minix/lib/libc/sys/nanosleep.c diff --git a/lib/libc/sys-minix/open.c b/minix/lib/libc/sys/open.c similarity index 100% rename from lib/libc/sys-minix/open.c rename to minix/lib/libc/sys/open.c diff --git a/lib/libc/sys-minix/pathconf.c b/minix/lib/libc/sys/pathconf.c similarity index 100% rename from lib/libc/sys-minix/pathconf.c rename to minix/lib/libc/sys/pathconf.c diff --git a/lib/libc/sys-minix/pipe.c b/minix/lib/libc/sys/pipe.c similarity index 100% rename from lib/libc/sys-minix/pipe.c rename to minix/lib/libc/sys/pipe.c diff --git a/lib/libc/sys-minix/poll.c b/minix/lib/libc/sys/poll.c similarity index 100% rename from lib/libc/sys-minix/poll.c rename to minix/lib/libc/sys/poll.c diff --git a/lib/libc/sys-minix/pread.c b/minix/lib/libc/sys/pread.c similarity index 100% rename from lib/libc/sys-minix/pread.c rename to minix/lib/libc/sys/pread.c diff --git a/lib/libc/sys-minix/priority.c b/minix/lib/libc/sys/priority.c similarity index 100% rename from lib/libc/sys-minix/priority.c rename to minix/lib/libc/sys/priority.c diff --git a/lib/libc/sys-minix/ptrace.c b/minix/lib/libc/sys/ptrace.c similarity index 100% rename from lib/libc/sys-minix/ptrace.c rename to minix/lib/libc/sys/ptrace.c diff --git a/lib/libc/sys-minix/pwrite.c b/minix/lib/libc/sys/pwrite.c similarity index 100% rename from lib/libc/sys-minix/pwrite.c rename to minix/lib/libc/sys/pwrite.c diff --git a/lib/libc/sys-minix/read.c b/minix/lib/libc/sys/read.c similarity index 100% rename from lib/libc/sys-minix/read.c rename to minix/lib/libc/sys/read.c diff --git a/lib/libc/sys-minix/readlink.c b/minix/lib/libc/sys/readlink.c similarity index 100% rename from lib/libc/sys-minix/readlink.c rename to minix/lib/libc/sys/readlink.c diff --git a/lib/libc/sys-minix/reboot.c b/minix/lib/libc/sys/reboot.c similarity index 100% rename from lib/libc/sys-minix/reboot.c rename to minix/lib/libc/sys/reboot.c diff --git a/lib/libc/sys-minix/recvfrom.c b/minix/lib/libc/sys/recvfrom.c similarity index 100% rename from lib/libc/sys-minix/recvfrom.c rename to minix/lib/libc/sys/recvfrom.c diff --git a/lib/libc/sys-minix/recvmsg.c b/minix/lib/libc/sys/recvmsg.c similarity index 100% rename from lib/libc/sys-minix/recvmsg.c rename to minix/lib/libc/sys/recvmsg.c diff --git a/lib/libc/sys-minix/rename.c b/minix/lib/libc/sys/rename.c similarity index 100% rename from lib/libc/sys-minix/rename.c rename to minix/lib/libc/sys/rename.c diff --git a/lib/libc/sys-minix/rmdir.c b/minix/lib/libc/sys/rmdir.c similarity index 100% rename from lib/libc/sys-minix/rmdir.c rename to minix/lib/libc/sys/rmdir.c diff --git a/lib/libc/sys-minix/sbrk.c b/minix/lib/libc/sys/sbrk.c similarity index 100% rename from lib/libc/sys-minix/sbrk.c rename to minix/lib/libc/sys/sbrk.c diff --git a/lib/libc/sys-minix/select.c b/minix/lib/libc/sys/select.c similarity index 100% rename from lib/libc/sys-minix/select.c rename to minix/lib/libc/sys/select.c diff --git a/lib/libc/sys-minix/sem.c b/minix/lib/libc/sys/sem.c similarity index 100% rename from lib/libc/sys-minix/sem.c rename to minix/lib/libc/sys/sem.c diff --git a/lib/libc/sys-minix/sendmsg.c b/minix/lib/libc/sys/sendmsg.c similarity index 100% rename from lib/libc/sys-minix/sendmsg.c rename to minix/lib/libc/sys/sendmsg.c diff --git a/lib/libc/sys-minix/sendto.c b/minix/lib/libc/sys/sendto.c similarity index 100% rename from lib/libc/sys-minix/sendto.c rename to minix/lib/libc/sys/sendto.c diff --git a/lib/libc/sys-minix/setgid.c b/minix/lib/libc/sys/setgid.c similarity index 100% rename from lib/libc/sys-minix/setgid.c rename to minix/lib/libc/sys/setgid.c diff --git a/lib/libc/sys-minix/setgroups.c b/minix/lib/libc/sys/setgroups.c similarity index 100% rename from lib/libc/sys-minix/setgroups.c rename to minix/lib/libc/sys/setgroups.c diff --git a/lib/libc/sys-minix/setitimer.c b/minix/lib/libc/sys/setitimer.c similarity index 100% rename from lib/libc/sys-minix/setitimer.c rename to minix/lib/libc/sys/setitimer.c diff --git a/lib/libc/sys-minix/setpgid.c b/minix/lib/libc/sys/setpgid.c similarity index 100% rename from lib/libc/sys-minix/setpgid.c rename to minix/lib/libc/sys/setpgid.c diff --git a/lib/libc/sys-minix/setrlimit.c b/minix/lib/libc/sys/setrlimit.c similarity index 100% rename from lib/libc/sys-minix/setrlimit.c rename to minix/lib/libc/sys/setrlimit.c diff --git a/lib/libc/sys-minix/setsid.c b/minix/lib/libc/sys/setsid.c similarity index 100% rename from lib/libc/sys-minix/setsid.c rename to minix/lib/libc/sys/setsid.c diff --git a/lib/libc/sys-minix/setsockopt.c b/minix/lib/libc/sys/setsockopt.c similarity index 100% rename from lib/libc/sys-minix/setsockopt.c rename to minix/lib/libc/sys/setsockopt.c diff --git a/lib/libc/sys-minix/settimeofday.c b/minix/lib/libc/sys/settimeofday.c similarity index 100% rename from lib/libc/sys-minix/settimeofday.c rename to minix/lib/libc/sys/settimeofday.c diff --git a/lib/libc/sys-minix/setuid.c b/minix/lib/libc/sys/setuid.c similarity index 100% rename from lib/libc/sys-minix/setuid.c rename to minix/lib/libc/sys/setuid.c diff --git a/lib/libc/sys-minix/shmat.c b/minix/lib/libc/sys/shmat.c similarity index 100% rename from lib/libc/sys-minix/shmat.c rename to minix/lib/libc/sys/shmat.c diff --git a/lib/libc/sys-minix/shmctl.c b/minix/lib/libc/sys/shmctl.c similarity index 100% rename from lib/libc/sys-minix/shmctl.c rename to minix/lib/libc/sys/shmctl.c diff --git a/lib/libc/sys-minix/shmget.c b/minix/lib/libc/sys/shmget.c similarity index 100% rename from lib/libc/sys-minix/shmget.c rename to minix/lib/libc/sys/shmget.c diff --git a/lib/libc/sys-minix/shutdown.c b/minix/lib/libc/sys/shutdown.c similarity index 100% rename from lib/libc/sys-minix/shutdown.c rename to minix/lib/libc/sys/shutdown.c diff --git a/lib/libc/sys-minix/sigaction.c b/minix/lib/libc/sys/sigaction.c similarity index 100% rename from lib/libc/sys-minix/sigaction.c rename to minix/lib/libc/sys/sigaction.c diff --git a/lib/libc/sys-minix/sigpending.c b/minix/lib/libc/sys/sigpending.c similarity index 100% rename from lib/libc/sys-minix/sigpending.c rename to minix/lib/libc/sys/sigpending.c diff --git a/lib/libc/sys-minix/sigprocmask.c b/minix/lib/libc/sys/sigprocmask.c similarity index 100% rename from lib/libc/sys-minix/sigprocmask.c rename to minix/lib/libc/sys/sigprocmask.c diff --git a/lib/libc/sys-minix/sigreturn.c b/minix/lib/libc/sys/sigreturn.c similarity index 100% rename from lib/libc/sys-minix/sigreturn.c rename to minix/lib/libc/sys/sigreturn.c diff --git a/lib/libc/sys-minix/sigsuspend.c b/minix/lib/libc/sys/sigsuspend.c similarity index 100% rename from lib/libc/sys-minix/sigsuspend.c rename to minix/lib/libc/sys/sigsuspend.c diff --git a/lib/libc/sys-minix/sizeup.c b/minix/lib/libc/sys/sizeup.c similarity index 100% rename from lib/libc/sys-minix/sizeup.c rename to minix/lib/libc/sys/sizeup.c diff --git a/lib/libc/sys-minix/socket.c b/minix/lib/libc/sys/socket.c similarity index 100% rename from lib/libc/sys-minix/socket.c rename to minix/lib/libc/sys/socket.c diff --git a/lib/libc/sys-minix/socketpair.c b/minix/lib/libc/sys/socketpair.c similarity index 100% rename from lib/libc/sys-minix/socketpair.c rename to minix/lib/libc/sys/socketpair.c diff --git a/lib/libc/sys-minix/sprofile.c b/minix/lib/libc/sys/sprofile.c similarity index 100% rename from lib/libc/sys-minix/sprofile.c rename to minix/lib/libc/sys/sprofile.c diff --git a/lib/libc/sys-minix/stack_utils.c b/minix/lib/libc/sys/stack_utils.c similarity index 100% rename from lib/libc/sys-minix/stack_utils.c rename to minix/lib/libc/sys/stack_utils.c diff --git a/lib/libc/sys-minix/stat.c b/minix/lib/libc/sys/stat.c similarity index 100% rename from lib/libc/sys-minix/stat.c rename to minix/lib/libc/sys/stat.c diff --git a/lib/libc/sys-minix/statvfs.c b/minix/lib/libc/sys/statvfs.c similarity index 100% rename from lib/libc/sys-minix/statvfs.c rename to minix/lib/libc/sys/statvfs.c diff --git a/lib/libc/sys-minix/stime.c b/minix/lib/libc/sys/stime.c similarity index 100% rename from lib/libc/sys-minix/stime.c rename to minix/lib/libc/sys/stime.c diff --git a/lib/libc/sys-minix/svrctl.c b/minix/lib/libc/sys/svrctl.c similarity index 100% rename from lib/libc/sys-minix/svrctl.c rename to minix/lib/libc/sys/svrctl.c diff --git a/lib/libc/sys-minix/symlink.c b/minix/lib/libc/sys/symlink.c similarity index 100% rename from lib/libc/sys-minix/symlink.c rename to minix/lib/libc/sys/symlink.c diff --git a/lib/libc/sys-minix/sync.c b/minix/lib/libc/sys/sync.c similarity index 100% rename from lib/libc/sys-minix/sync.c rename to minix/lib/libc/sys/sync.c diff --git a/lib/libc/sys-minix/syscall.c b/minix/lib/libc/sys/syscall.c similarity index 100% rename from lib/libc/sys-minix/syscall.c rename to minix/lib/libc/sys/syscall.c diff --git a/lib/libc/sys-minix/sysuname.c b/minix/lib/libc/sys/sysuname.c similarity index 100% rename from lib/libc/sys-minix/sysuname.c rename to minix/lib/libc/sys/sysuname.c diff --git a/lib/libc/sys-minix/truncate.c b/minix/lib/libc/sys/truncate.c similarity index 100% rename from lib/libc/sys-minix/truncate.c rename to minix/lib/libc/sys/truncate.c diff --git a/lib/libc/sys-minix/umask.c b/minix/lib/libc/sys/umask.c similarity index 100% rename from lib/libc/sys-minix/umask.c rename to minix/lib/libc/sys/umask.c diff --git a/lib/libc/sys-minix/unlink.c b/minix/lib/libc/sys/unlink.c similarity index 100% rename from lib/libc/sys-minix/unlink.c rename to minix/lib/libc/sys/unlink.c diff --git a/lib/libc/sys-minix/utimensat.c b/minix/lib/libc/sys/utimensat.c similarity index 100% rename from lib/libc/sys-minix/utimensat.c rename to minix/lib/libc/sys/utimensat.c diff --git a/lib/libc/sys-minix/utimes.c b/minix/lib/libc/sys/utimes.c similarity index 100% rename from lib/libc/sys-minix/utimes.c rename to minix/lib/libc/sys/utimes.c diff --git a/lib/libc/sys-minix/vectorio.c b/minix/lib/libc/sys/vectorio.c similarity index 100% rename from lib/libc/sys-minix/vectorio.c rename to minix/lib/libc/sys/vectorio.c diff --git a/lib/libc/sys-minix/vfork.c b/minix/lib/libc/sys/vfork.c similarity index 100% rename from lib/libc/sys-minix/vfork.c rename to minix/lib/libc/sys/vfork.c diff --git a/lib/libc/sys-minix/write.c b/minix/lib/libc/sys/write.c similarity index 100% rename from lib/libc/sys-minix/write.c rename to minix/lib/libc/sys/write.c diff --git a/lib/libchardriver/Makefile b/minix/lib/libchardriver/Makefile similarity index 100% rename from lib/libchardriver/Makefile rename to minix/lib/libchardriver/Makefile diff --git a/lib/libchardriver/chardriver.c b/minix/lib/libchardriver/chardriver.c similarity index 100% rename from lib/libchardriver/chardriver.c rename to minix/lib/libchardriver/chardriver.c diff --git a/lib/libclkconf/Makefile b/minix/lib/libclkconf/Makefile similarity index 100% rename from lib/libclkconf/Makefile rename to minix/lib/libclkconf/Makefile diff --git a/lib/libclkconf/clkconf.c b/minix/lib/libclkconf/clkconf.c similarity index 100% rename from lib/libclkconf/clkconf.c rename to minix/lib/libclkconf/clkconf.c diff --git a/lib/libcompat_minix/Makefile b/minix/lib/libcompat_minix/Makefile similarity index 100% rename from lib/libcompat_minix/Makefile rename to minix/lib/libcompat_minix/Makefile diff --git a/lib/libcompat_minix/configfile.c b/minix/lib/libcompat_minix/configfile.c similarity index 100% rename from lib/libcompat_minix/configfile.c rename to minix/lib/libcompat_minix/configfile.c diff --git a/lib/libcompat_minix/include/Makefile b/minix/lib/libcompat_minix/include/Makefile similarity index 100% rename from lib/libcompat_minix/include/Makefile rename to minix/lib/libcompat_minix/include/Makefile diff --git a/lib/libcompat_minix/include/configfile.h b/minix/lib/libcompat_minix/include/configfile.h similarity index 100% rename from lib/libcompat_minix/include/configfile.h rename to minix/lib/libcompat_minix/include/configfile.h diff --git a/lib/libcompat_minix/include/earm/Makefile b/minix/lib/libcompat_minix/include/earm/Makefile similarity index 100% rename from lib/libcompat_minix/include/earm/Makefile rename to minix/lib/libcompat_minix/include/earm/Makefile diff --git a/lib/libcompat_minix/include/earm/compat_jmp_buf.h b/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h similarity index 100% rename from lib/libcompat_minix/include/earm/compat_jmp_buf.h rename to minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h diff --git a/lib/libcompat_minix/include/i386/Makefile b/minix/lib/libcompat_minix/include/i386/Makefile similarity index 100% rename from lib/libcompat_minix/include/i386/Makefile rename to minix/lib/libcompat_minix/include/i386/Makefile diff --git a/lib/libcompat_minix/include/i386/compat_jmp_buf.h b/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h similarity index 100% rename from lib/libcompat_minix/include/i386/compat_jmp_buf.h rename to minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h diff --git a/lib/libcompat_minix/include/net/Makefile b/minix/lib/libcompat_minix/include/net/Makefile similarity index 100% rename from lib/libcompat_minix/include/net/Makefile rename to minix/lib/libcompat_minix/include/net/Makefile diff --git a/lib/libcompat_minix/include/net/gen/Makefile b/minix/lib/libcompat_minix/include/net/gen/Makefile similarity index 100% rename from lib/libcompat_minix/include/net/gen/Makefile rename to minix/lib/libcompat_minix/include/net/gen/Makefile diff --git a/lib/libcompat_minix/include/net/gen/nameser.h b/minix/lib/libcompat_minix/include/net/gen/nameser.h similarity index 100% rename from lib/libcompat_minix/include/net/gen/nameser.h rename to minix/lib/libcompat_minix/include/net/gen/nameser.h diff --git a/lib/libcompat_minix/include/net/gen/netdb.h b/minix/lib/libcompat_minix/include/net/gen/netdb.h similarity index 100% rename from lib/libcompat_minix/include/net/gen/netdb.h rename to minix/lib/libcompat_minix/include/net/gen/netdb.h diff --git a/lib/libcompat_minix/include/net/gen/resolv.h b/minix/lib/libcompat_minix/include/net/gen/resolv.h similarity index 100% rename from lib/libcompat_minix/include/net/gen/resolv.h rename to minix/lib/libcompat_minix/include/net/gen/resolv.h diff --git a/lib/libcompat_minix/include/sys/Makefile b/minix/lib/libcompat_minix/include/sys/Makefile similarity index 100% rename from lib/libcompat_minix/include/sys/Makefile rename to minix/lib/libcompat_minix/include/sys/Makefile diff --git a/lib/libcompat_minix/include/sys/jmp_buf.h b/minix/lib/libcompat_minix/include/sys/jmp_buf.h similarity index 100% rename from lib/libcompat_minix/include/sys/jmp_buf.h rename to minix/lib/libcompat_minix/include/sys/jmp_buf.h diff --git a/lib/libcompat_minix/mtab.c b/minix/lib/libcompat_minix/mtab.c similarity index 100% rename from lib/libcompat_minix/mtab.c rename to minix/lib/libcompat_minix/mtab.c diff --git a/lib/libcompat_minix/pkgconfig/Makefile b/minix/lib/libcompat_minix/pkgconfig/Makefile similarity index 100% rename from lib/libcompat_minix/pkgconfig/Makefile rename to minix/lib/libcompat_minix/pkgconfig/Makefile diff --git a/lib/libcompat_minix/pkgconfig/compat_minix.pc b/minix/lib/libcompat_minix/pkgconfig/compat_minix.pc similarity index 100% rename from lib/libcompat_minix/pkgconfig/compat_minix.pc rename to minix/lib/libcompat_minix/pkgconfig/compat_minix.pc diff --git a/lib/libcompat_minix/shlib_version b/minix/lib/libcompat_minix/shlib_version similarity index 100% rename from lib/libcompat_minix/shlib_version rename to minix/lib/libcompat_minix/shlib_version diff --git a/lib/libcompat_minix/stderr.c b/minix/lib/libcompat_minix/stderr.c similarity index 100% rename from lib/libcompat_minix/stderr.c rename to minix/lib/libcompat_minix/stderr.c diff --git a/lib/libddekit/Makefile b/minix/lib/libddekit/Makefile similarity index 100% rename from lib/libddekit/Makefile rename to minix/lib/libddekit/Makefile diff --git a/lib/libddekit/build/Makefile b/minix/lib/libddekit/build/Makefile similarity index 100% rename from lib/libddekit/build/Makefile rename to minix/lib/libddekit/build/Makefile diff --git a/lib/libddekit/build/ddekit/Makefile b/minix/lib/libddekit/build/ddekit/Makefile similarity index 50% rename from lib/libddekit/build/ddekit/Makefile rename to minix/lib/libddekit/build/ddekit/Makefile index 9f789d9e0..5197f67c9 100644 --- a/lib/libddekit/build/ddekit/Makefile +++ b/minix/lib/libddekit/build/ddekit/Makefile @@ -1,11 +1,11 @@ - LIB= ddekit -SRC_DIR = ${NETBSDSRCDIR}/lib/libddekit/src +SRC_DIR = ${NETBSDSRCDIR}/minix/lib/libddekit/src -VPATH = $(SRC_DIR) +VPATH = ${SRC_DIR} -SRCS = pci.c printf.c mem.c pgtab.c dde.c initcall.c thread.c condvar.c lock.c semaphore.c timer.c panic.c irq.c resource.c msg_queue.c +SRCS = pci.c printf.c mem.c pgtab.c dde.c initcall.c thread.c condvar.c \ + lock.c semaphore.c timer.c panic.c irq.c resource.c msg_queue.c CPPFLAGS += -D_NETBSD_SOURCE -D_MINIX_SYSTEM diff --git a/lib/libddekit/build/ddekit_usb_client/Makefile b/minix/lib/libddekit/build/ddekit_usb_client/Makefile similarity index 68% rename from lib/libddekit/build/ddekit_usb_client/Makefile rename to minix/lib/libddekit/build/ddekit_usb_client/Makefile index a2684eda8..8deaec29f 100644 --- a/lib/libddekit/build/ddekit_usb_client/Makefile +++ b/minix/lib/libddekit/build/ddekit_usb_client/Makefile @@ -1,6 +1,6 @@ LIB= ddekit_usb_client -SRC_DIR = ${NETBSDSRCDIR}/lib/libddekit/src +SRC_DIR = ${NETBSDSRCDIR}/minix/lib/libddekit/src VPATH = $(SRC_DIR) diff --git a/lib/libddekit/build/ddekit_usb_server/Makefile b/minix/lib/libddekit/build/ddekit_usb_server/Makefile similarity index 66% rename from lib/libddekit/build/ddekit_usb_server/Makefile rename to minix/lib/libddekit/build/ddekit_usb_server/Makefile index aa83179fb..2d31ab0de 100644 --- a/lib/libddekit/build/ddekit_usb_server/Makefile +++ b/minix/lib/libddekit/build/ddekit_usb_server/Makefile @@ -1,8 +1,11 @@ LIB= ddekit_usb_server -SRC_DIR = ${NETBSDSRCDIR}/lib/libddekit/src + +SRC_DIR = ${NETBSDSRCDIR}/minix/lib/libddekit/src + VPATH = $(SRC_DIR) + SRCS = usb_server.c -CFLAGS += -Wall -.include +CFLAGS += -Wall +.include diff --git a/lib/libddekit/src/common.h b/minix/lib/libddekit/src/common.h similarity index 100% rename from lib/libddekit/src/common.h rename to minix/lib/libddekit/src/common.h diff --git a/lib/libddekit/src/condvar.c b/minix/lib/libddekit/src/condvar.c similarity index 100% rename from lib/libddekit/src/condvar.c rename to minix/lib/libddekit/src/condvar.c diff --git a/lib/libddekit/src/dde.c b/minix/lib/libddekit/src/dde.c similarity index 100% rename from lib/libddekit/src/dde.c rename to minix/lib/libddekit/src/dde.c diff --git a/lib/libddekit/src/dde.h b/minix/lib/libddekit/src/dde.h similarity index 100% rename from lib/libddekit/src/dde.h rename to minix/lib/libddekit/src/dde.h diff --git a/lib/libddekit/src/debug.h b/minix/lib/libddekit/src/debug.h similarity index 100% rename from lib/libddekit/src/debug.h rename to minix/lib/libddekit/src/debug.h diff --git a/lib/libddekit/src/initcall.c b/minix/lib/libddekit/src/initcall.c similarity index 100% rename from lib/libddekit/src/initcall.c rename to minix/lib/libddekit/src/initcall.c diff --git a/lib/libddekit/src/irq.c b/minix/lib/libddekit/src/irq.c similarity index 100% rename from lib/libddekit/src/irq.c rename to minix/lib/libddekit/src/irq.c diff --git a/lib/libddekit/src/irq.h b/minix/lib/libddekit/src/irq.h similarity index 100% rename from lib/libddekit/src/irq.h rename to minix/lib/libddekit/src/irq.h diff --git a/lib/libddekit/src/lock.c b/minix/lib/libddekit/src/lock.c similarity index 100% rename from lib/libddekit/src/lock.c rename to minix/lib/libddekit/src/lock.c diff --git a/lib/libddekit/src/mem.c b/minix/lib/libddekit/src/mem.c similarity index 100% rename from lib/libddekit/src/mem.c rename to minix/lib/libddekit/src/mem.c diff --git a/lib/libddekit/src/msg_queue.c b/minix/lib/libddekit/src/msg_queue.c similarity index 100% rename from lib/libddekit/src/msg_queue.c rename to minix/lib/libddekit/src/msg_queue.c diff --git a/lib/libddekit/src/panic.c b/minix/lib/libddekit/src/panic.c similarity index 100% rename from lib/libddekit/src/panic.c rename to minix/lib/libddekit/src/panic.c diff --git a/lib/libddekit/src/pci.c b/minix/lib/libddekit/src/pci.c similarity index 100% rename from lib/libddekit/src/pci.c rename to minix/lib/libddekit/src/pci.c diff --git a/lib/libddekit/src/pgtab.c b/minix/lib/libddekit/src/pgtab.c similarity index 100% rename from lib/libddekit/src/pgtab.c rename to minix/lib/libddekit/src/pgtab.c diff --git a/lib/libddekit/src/printf.c b/minix/lib/libddekit/src/printf.c similarity index 100% rename from lib/libddekit/src/printf.c rename to minix/lib/libddekit/src/printf.c diff --git a/lib/libddekit/src/resource.c b/minix/lib/libddekit/src/resource.c similarity index 100% rename from lib/libddekit/src/resource.c rename to minix/lib/libddekit/src/resource.c diff --git a/lib/libddekit/src/semaphore.c b/minix/lib/libddekit/src/semaphore.c similarity index 100% rename from lib/libddekit/src/semaphore.c rename to minix/lib/libddekit/src/semaphore.c diff --git a/lib/libddekit/src/thread.c b/minix/lib/libddekit/src/thread.c similarity index 100% rename from lib/libddekit/src/thread.c rename to minix/lib/libddekit/src/thread.c diff --git a/lib/libddekit/src/thread.h b/minix/lib/libddekit/src/thread.h similarity index 100% rename from lib/libddekit/src/thread.h rename to minix/lib/libddekit/src/thread.h diff --git a/lib/libddekit/src/timer.c b/minix/lib/libddekit/src/timer.c similarity index 100% rename from lib/libddekit/src/timer.c rename to minix/lib/libddekit/src/timer.c diff --git a/lib/libddekit/src/timer.h b/minix/lib/libddekit/src/timer.h similarity index 100% rename from lib/libddekit/src/timer.h rename to minix/lib/libddekit/src/timer.h diff --git a/lib/libddekit/src/usb_client.c b/minix/lib/libddekit/src/usb_client.c similarity index 100% rename from lib/libddekit/src/usb_client.c rename to minix/lib/libddekit/src/usb_client.c diff --git a/lib/libddekit/src/usb_server.c b/minix/lib/libddekit/src/usb_server.c similarity index 100% rename from lib/libddekit/src/usb_server.c rename to minix/lib/libddekit/src/usb_server.c diff --git a/lib/libddekit/src/util.h b/minix/lib/libddekit/src/util.h similarity index 100% rename from lib/libddekit/src/util.h rename to minix/lib/libddekit/src/util.h diff --git a/lib/libdevman/Makefile b/minix/lib/libdevman/Makefile similarity index 100% rename from lib/libdevman/Makefile rename to minix/lib/libdevman/Makefile diff --git a/lib/libdevman/generic.c b/minix/lib/libdevman/generic.c similarity index 100% rename from lib/libdevman/generic.c rename to minix/lib/libdevman/generic.c diff --git a/lib/libdevman/local.h b/minix/lib/libdevman/local.h similarity index 100% rename from lib/libdevman/local.h rename to minix/lib/libdevman/local.h diff --git a/lib/libdevman/usb.c b/minix/lib/libdevman/usb.c similarity index 100% rename from lib/libdevman/usb.c rename to minix/lib/libdevman/usb.c diff --git a/lib/libexec/Makefile b/minix/lib/libexec/Makefile similarity index 100% rename from lib/libexec/Makefile rename to minix/lib/libexec/Makefile diff --git a/lib/libexec/exec_elf.c b/minix/lib/libexec/exec_elf.c similarity index 100% rename from lib/libexec/exec_elf.c rename to minix/lib/libexec/exec_elf.c diff --git a/lib/libexec/exec_general.c b/minix/lib/libexec/exec_general.c similarity index 100% rename from lib/libexec/exec_general.c rename to minix/lib/libexec/exec_general.c diff --git a/lib/libexec/libexec.h b/minix/lib/libexec/libexec.h similarity index 100% rename from lib/libexec/libexec.h rename to minix/lib/libexec/libexec.h diff --git a/lib/libfetch/Makefile b/minix/lib/libfetch/Makefile similarity index 100% rename from lib/libfetch/Makefile rename to minix/lib/libfetch/Makefile diff --git a/lib/libfetch/common.c b/minix/lib/libfetch/common.c similarity index 100% rename from lib/libfetch/common.c rename to minix/lib/libfetch/common.c diff --git a/lib/libfetch/common.h b/minix/lib/libfetch/common.h similarity index 100% rename from lib/libfetch/common.h rename to minix/lib/libfetch/common.h diff --git a/lib/libfetch/errlist.sh b/minix/lib/libfetch/errlist.sh similarity index 100% rename from lib/libfetch/errlist.sh rename to minix/lib/libfetch/errlist.sh diff --git a/lib/libfetch/fetch.c b/minix/lib/libfetch/fetch.c similarity index 100% rename from lib/libfetch/fetch.c rename to minix/lib/libfetch/fetch.c diff --git a/lib/libfetch/fetch.cat3 b/minix/lib/libfetch/fetch.cat3 similarity index 100% rename from lib/libfetch/fetch.cat3 rename to minix/lib/libfetch/fetch.cat3 diff --git a/lib/libfetch/file.c b/minix/lib/libfetch/file.c similarity index 100% rename from lib/libfetch/file.c rename to minix/lib/libfetch/file.c diff --git a/lib/libfetch/ftp.c b/minix/lib/libfetch/ftp.c similarity index 100% rename from lib/libfetch/ftp.c rename to minix/lib/libfetch/ftp.c diff --git a/lib/libfetch/ftp.errors b/minix/lib/libfetch/ftp.errors similarity index 100% rename from lib/libfetch/ftp.errors rename to minix/lib/libfetch/ftp.errors diff --git a/lib/libfetch/ftperr.h b/minix/lib/libfetch/ftperr.h similarity index 100% rename from lib/libfetch/ftperr.h rename to minix/lib/libfetch/ftperr.h diff --git a/lib/libfetch/http.c b/minix/lib/libfetch/http.c similarity index 100% rename from lib/libfetch/http.c rename to minix/lib/libfetch/http.c diff --git a/lib/libfetch/http.errors b/minix/lib/libfetch/http.errors similarity index 100% rename from lib/libfetch/http.errors rename to minix/lib/libfetch/http.errors diff --git a/lib/libfetch/httperr.h b/minix/lib/libfetch/httperr.h similarity index 100% rename from lib/libfetch/httperr.h rename to minix/lib/libfetch/httperr.h diff --git a/lib/libgcc_s_empty/Makefile b/minix/lib/libgcc_s_empty/Makefile similarity index 100% rename from lib/libgcc_s_empty/Makefile rename to minix/lib/libgcc_s_empty/Makefile diff --git a/lib/libgcc_s_empty/empty.c b/minix/lib/libgcc_s_empty/empty.c similarity index 100% rename from lib/libgcc_s_empty/empty.c rename to minix/lib/libgcc_s_empty/empty.c diff --git a/lib/libgcc_s_empty/libgcc_s_empty.map b/minix/lib/libgcc_s_empty/libgcc_s_empty.map similarity index 100% rename from lib/libgcc_s_empty/libgcc_s_empty.map rename to minix/lib/libgcc_s_empty/libgcc_s_empty.map diff --git a/lib/libgcc_s_empty/shlib_version b/minix/lib/libgcc_s_empty/shlib_version similarity index 100% rename from lib/libgcc_s_empty/shlib_version rename to minix/lib/libgcc_s_empty/shlib_version diff --git a/lib/libgpio/Makefile b/minix/lib/libgpio/Makefile similarity index 100% rename from lib/libgpio/Makefile rename to minix/lib/libgpio/Makefile diff --git a/lib/libgpio/gpio_omap.c b/minix/lib/libgpio/gpio_omap.c similarity index 100% rename from lib/libgpio/gpio_omap.c rename to minix/lib/libgpio/gpio_omap.c diff --git a/lib/libgpio/gpio_omap.h b/minix/lib/libgpio/gpio_omap.h similarity index 100% rename from lib/libgpio/gpio_omap.h rename to minix/lib/libgpio/gpio_omap.h diff --git a/lib/libhgfs/Makefile b/minix/lib/libhgfs/Makefile similarity index 100% rename from lib/libhgfs/Makefile rename to minix/lib/libhgfs/Makefile diff --git a/lib/libhgfs/attr.c b/minix/lib/libhgfs/attr.c similarity index 100% rename from lib/libhgfs/attr.c rename to minix/lib/libhgfs/attr.c diff --git a/lib/libhgfs/backdoor.S b/minix/lib/libhgfs/backdoor.S similarity index 100% rename from lib/libhgfs/backdoor.S rename to minix/lib/libhgfs/backdoor.S diff --git a/lib/libhgfs/channel.c b/minix/lib/libhgfs/channel.c similarity index 100% rename from lib/libhgfs/channel.c rename to minix/lib/libhgfs/channel.c diff --git a/lib/libhgfs/const.h b/minix/lib/libhgfs/const.h similarity index 100% rename from lib/libhgfs/const.h rename to minix/lib/libhgfs/const.h diff --git a/lib/libhgfs/dir.c b/minix/lib/libhgfs/dir.c similarity index 100% rename from lib/libhgfs/dir.c rename to minix/lib/libhgfs/dir.c diff --git a/lib/libhgfs/error.c b/minix/lib/libhgfs/error.c similarity index 100% rename from lib/libhgfs/error.c rename to minix/lib/libhgfs/error.c diff --git a/lib/libhgfs/file.c b/minix/lib/libhgfs/file.c similarity index 100% rename from lib/libhgfs/file.c rename to minix/lib/libhgfs/file.c diff --git a/lib/libhgfs/glo.h b/minix/lib/libhgfs/glo.h similarity index 100% rename from lib/libhgfs/glo.h rename to minix/lib/libhgfs/glo.h diff --git a/lib/libhgfs/hgfs.c b/minix/lib/libhgfs/hgfs.c similarity index 100% rename from lib/libhgfs/hgfs.c rename to minix/lib/libhgfs/hgfs.c diff --git a/lib/libhgfs/inc.h b/minix/lib/libhgfs/inc.h similarity index 100% rename from lib/libhgfs/inc.h rename to minix/lib/libhgfs/inc.h diff --git a/lib/libhgfs/info.c b/minix/lib/libhgfs/info.c similarity index 100% rename from lib/libhgfs/info.c rename to minix/lib/libhgfs/info.c diff --git a/lib/libhgfs/link.c b/minix/lib/libhgfs/link.c similarity index 100% rename from lib/libhgfs/link.c rename to minix/lib/libhgfs/link.c diff --git a/lib/libhgfs/path.c b/minix/lib/libhgfs/path.c similarity index 100% rename from lib/libhgfs/path.c rename to minix/lib/libhgfs/path.c diff --git a/lib/libhgfs/proto.h b/minix/lib/libhgfs/proto.h similarity index 100% rename from lib/libhgfs/proto.h rename to minix/lib/libhgfs/proto.h diff --git a/lib/libhgfs/rpc.c b/minix/lib/libhgfs/rpc.c similarity index 100% rename from lib/libhgfs/rpc.c rename to minix/lib/libhgfs/rpc.c diff --git a/lib/libhgfs/time.c b/minix/lib/libhgfs/time.c similarity index 100% rename from lib/libhgfs/time.c rename to minix/lib/libhgfs/time.c diff --git a/lib/libhgfs/type.h b/minix/lib/libhgfs/type.h similarity index 100% rename from lib/libhgfs/type.h rename to minix/lib/libhgfs/type.h diff --git a/lib/libi2cdriver/Makefile b/minix/lib/libi2cdriver/Makefile similarity index 100% rename from lib/libi2cdriver/Makefile rename to minix/lib/libi2cdriver/Makefile diff --git a/lib/libi2cdriver/i2cdriver.c b/minix/lib/libi2cdriver/i2cdriver.c similarity index 100% rename from lib/libi2cdriver/i2cdriver.c rename to minix/lib/libi2cdriver/i2cdriver.c diff --git a/lib/libinputdriver/Makefile b/minix/lib/libinputdriver/Makefile similarity index 100% rename from lib/libinputdriver/Makefile rename to minix/lib/libinputdriver/Makefile diff --git a/lib/libinputdriver/inputdriver.c b/minix/lib/libinputdriver/inputdriver.c similarity index 100% rename from lib/libinputdriver/inputdriver.c rename to minix/lib/libinputdriver/inputdriver.c diff --git a/lib/liblwip/COPYING b/minix/lib/liblwip/COPYING similarity index 100% rename from lib/liblwip/COPYING rename to minix/lib/liblwip/COPYING diff --git a/lib/liblwip/Makefile b/minix/lib/liblwip/Makefile similarity index 100% rename from lib/liblwip/Makefile rename to minix/lib/liblwip/Makefile diff --git a/lib/liblwip/api/Makefile.inc b/minix/lib/liblwip/api/Makefile.inc similarity index 100% rename from lib/liblwip/api/Makefile.inc rename to minix/lib/liblwip/api/Makefile.inc diff --git a/lib/liblwip/api/api_lib.c b/minix/lib/liblwip/api/api_lib.c similarity index 100% rename from lib/liblwip/api/api_lib.c rename to minix/lib/liblwip/api/api_lib.c diff --git a/lib/liblwip/api/api_msg.c b/minix/lib/liblwip/api/api_msg.c similarity index 100% rename from lib/liblwip/api/api_msg.c rename to minix/lib/liblwip/api/api_msg.c diff --git a/lib/liblwip/api/err.c b/minix/lib/liblwip/api/err.c similarity index 100% rename from lib/liblwip/api/err.c rename to minix/lib/liblwip/api/err.c diff --git a/lib/liblwip/api/netbuf.c b/minix/lib/liblwip/api/netbuf.c similarity index 100% rename from lib/liblwip/api/netbuf.c rename to minix/lib/liblwip/api/netbuf.c diff --git a/lib/liblwip/api/netdb.c b/minix/lib/liblwip/api/netdb.c similarity index 100% rename from lib/liblwip/api/netdb.c rename to minix/lib/liblwip/api/netdb.c diff --git a/lib/liblwip/api/netifapi.c b/minix/lib/liblwip/api/netifapi.c similarity index 100% rename from lib/liblwip/api/netifapi.c rename to minix/lib/liblwip/api/netifapi.c diff --git a/lib/liblwip/api/sockets.c b/minix/lib/liblwip/api/sockets.c similarity index 100% rename from lib/liblwip/api/sockets.c rename to minix/lib/liblwip/api/sockets.c diff --git a/lib/liblwip/api/tcpip.c b/minix/lib/liblwip/api/tcpip.c similarity index 100% rename from lib/liblwip/api/tcpip.c rename to minix/lib/liblwip/api/tcpip.c diff --git a/lib/liblwip/core/Makefile.inc b/minix/lib/liblwip/core/Makefile.inc similarity index 100% rename from lib/liblwip/core/Makefile.inc rename to minix/lib/liblwip/core/Makefile.inc diff --git a/lib/liblwip/core/def.c b/minix/lib/liblwip/core/def.c similarity index 100% rename from lib/liblwip/core/def.c rename to minix/lib/liblwip/core/def.c diff --git a/lib/liblwip/core/dhcp.c b/minix/lib/liblwip/core/dhcp.c similarity index 100% rename from lib/liblwip/core/dhcp.c rename to minix/lib/liblwip/core/dhcp.c diff --git a/lib/liblwip/core/dns.c b/minix/lib/liblwip/core/dns.c similarity index 100% rename from lib/liblwip/core/dns.c rename to minix/lib/liblwip/core/dns.c diff --git a/lib/liblwip/core/inet_chksum.c b/minix/lib/liblwip/core/inet_chksum.c similarity index 100% rename from lib/liblwip/core/inet_chksum.c rename to minix/lib/liblwip/core/inet_chksum.c diff --git a/lib/liblwip/core/init.c b/minix/lib/liblwip/core/init.c similarity index 100% rename from lib/liblwip/core/init.c rename to minix/lib/liblwip/core/init.c diff --git a/lib/liblwip/core/ipv4/autoip.c b/minix/lib/liblwip/core/ipv4/autoip.c similarity index 100% rename from lib/liblwip/core/ipv4/autoip.c rename to minix/lib/liblwip/core/ipv4/autoip.c diff --git a/lib/liblwip/core/ipv4/icmp.c b/minix/lib/liblwip/core/ipv4/icmp.c similarity index 100% rename from lib/liblwip/core/ipv4/icmp.c rename to minix/lib/liblwip/core/ipv4/icmp.c diff --git a/lib/liblwip/core/ipv4/igmp.c b/minix/lib/liblwip/core/ipv4/igmp.c similarity index 100% rename from lib/liblwip/core/ipv4/igmp.c rename to minix/lib/liblwip/core/ipv4/igmp.c diff --git a/lib/liblwip/core/ipv4/ip4.c b/minix/lib/liblwip/core/ipv4/ip4.c similarity index 100% rename from lib/liblwip/core/ipv4/ip4.c rename to minix/lib/liblwip/core/ipv4/ip4.c diff --git a/lib/liblwip/core/ipv4/ip4_addr.c b/minix/lib/liblwip/core/ipv4/ip4_addr.c similarity index 100% rename from lib/liblwip/core/ipv4/ip4_addr.c rename to minix/lib/liblwip/core/ipv4/ip4_addr.c diff --git a/lib/liblwip/core/ipv4/ip_frag.c b/minix/lib/liblwip/core/ipv4/ip_frag.c similarity index 100% rename from lib/liblwip/core/ipv4/ip_frag.c rename to minix/lib/liblwip/core/ipv4/ip_frag.c diff --git a/lib/liblwip/core/ipv6/README b/minix/lib/liblwip/core/ipv6/README similarity index 100% rename from lib/liblwip/core/ipv6/README rename to minix/lib/liblwip/core/ipv6/README diff --git a/lib/liblwip/core/ipv6/dhcp6.c b/minix/lib/liblwip/core/ipv6/dhcp6.c similarity index 100% rename from lib/liblwip/core/ipv6/dhcp6.c rename to minix/lib/liblwip/core/ipv6/dhcp6.c diff --git a/lib/liblwip/core/ipv6/ethip6.c b/minix/lib/liblwip/core/ipv6/ethip6.c similarity index 100% rename from lib/liblwip/core/ipv6/ethip6.c rename to minix/lib/liblwip/core/ipv6/ethip6.c diff --git a/lib/liblwip/core/ipv6/icmp6.c b/minix/lib/liblwip/core/ipv6/icmp6.c similarity index 100% rename from lib/liblwip/core/ipv6/icmp6.c rename to minix/lib/liblwip/core/ipv6/icmp6.c diff --git a/lib/liblwip/core/ipv6/inet6.c b/minix/lib/liblwip/core/ipv6/inet6.c similarity index 100% rename from lib/liblwip/core/ipv6/inet6.c rename to minix/lib/liblwip/core/ipv6/inet6.c diff --git a/lib/liblwip/core/ipv6/ip6.c b/minix/lib/liblwip/core/ipv6/ip6.c similarity index 100% rename from lib/liblwip/core/ipv6/ip6.c rename to minix/lib/liblwip/core/ipv6/ip6.c diff --git a/lib/liblwip/core/ipv6/ip6_addr.c b/minix/lib/liblwip/core/ipv6/ip6_addr.c similarity index 100% rename from lib/liblwip/core/ipv6/ip6_addr.c rename to minix/lib/liblwip/core/ipv6/ip6_addr.c diff --git a/lib/liblwip/core/ipv6/ip6_frag.c b/minix/lib/liblwip/core/ipv6/ip6_frag.c similarity index 100% rename from lib/liblwip/core/ipv6/ip6_frag.c rename to minix/lib/liblwip/core/ipv6/ip6_frag.c diff --git a/lib/liblwip/core/ipv6/mld6.c b/minix/lib/liblwip/core/ipv6/mld6.c similarity index 100% rename from lib/liblwip/core/ipv6/mld6.c rename to minix/lib/liblwip/core/ipv6/mld6.c diff --git a/lib/liblwip/core/ipv6/nd6.c b/minix/lib/liblwip/core/ipv6/nd6.c similarity index 100% rename from lib/liblwip/core/ipv6/nd6.c rename to minix/lib/liblwip/core/ipv6/nd6.c diff --git a/lib/liblwip/core/mem.c b/minix/lib/liblwip/core/mem.c similarity index 100% rename from lib/liblwip/core/mem.c rename to minix/lib/liblwip/core/mem.c diff --git a/lib/liblwip/core/memp.c b/minix/lib/liblwip/core/memp.c similarity index 100% rename from lib/liblwip/core/memp.c rename to minix/lib/liblwip/core/memp.c diff --git a/lib/liblwip/core/netif.c b/minix/lib/liblwip/core/netif.c similarity index 100% rename from lib/liblwip/core/netif.c rename to minix/lib/liblwip/core/netif.c diff --git a/lib/liblwip/core/pbuf.c b/minix/lib/liblwip/core/pbuf.c similarity index 100% rename from lib/liblwip/core/pbuf.c rename to minix/lib/liblwip/core/pbuf.c diff --git a/lib/liblwip/core/raw.c b/minix/lib/liblwip/core/raw.c similarity index 100% rename from lib/liblwip/core/raw.c rename to minix/lib/liblwip/core/raw.c diff --git a/lib/liblwip/core/snmp/asn1_dec.c b/minix/lib/liblwip/core/snmp/asn1_dec.c similarity index 100% rename from lib/liblwip/core/snmp/asn1_dec.c rename to minix/lib/liblwip/core/snmp/asn1_dec.c diff --git a/lib/liblwip/core/snmp/asn1_enc.c b/minix/lib/liblwip/core/snmp/asn1_enc.c similarity index 100% rename from lib/liblwip/core/snmp/asn1_enc.c rename to minix/lib/liblwip/core/snmp/asn1_enc.c diff --git a/lib/liblwip/core/snmp/mib2.c b/minix/lib/liblwip/core/snmp/mib2.c similarity index 100% rename from lib/liblwip/core/snmp/mib2.c rename to minix/lib/liblwip/core/snmp/mib2.c diff --git a/lib/liblwip/core/snmp/mib_structs.c b/minix/lib/liblwip/core/snmp/mib_structs.c similarity index 100% rename from lib/liblwip/core/snmp/mib_structs.c rename to minix/lib/liblwip/core/snmp/mib_structs.c diff --git a/lib/liblwip/core/snmp/msg_in.c b/minix/lib/liblwip/core/snmp/msg_in.c similarity index 100% rename from lib/liblwip/core/snmp/msg_in.c rename to minix/lib/liblwip/core/snmp/msg_in.c diff --git a/lib/liblwip/core/snmp/msg_out.c b/minix/lib/liblwip/core/snmp/msg_out.c similarity index 100% rename from lib/liblwip/core/snmp/msg_out.c rename to minix/lib/liblwip/core/snmp/msg_out.c diff --git a/lib/liblwip/core/stats.c b/minix/lib/liblwip/core/stats.c similarity index 100% rename from lib/liblwip/core/stats.c rename to minix/lib/liblwip/core/stats.c diff --git a/lib/liblwip/core/sys.c b/minix/lib/liblwip/core/sys.c similarity index 100% rename from lib/liblwip/core/sys.c rename to minix/lib/liblwip/core/sys.c diff --git a/lib/liblwip/core/tcp.c b/minix/lib/liblwip/core/tcp.c similarity index 100% rename from lib/liblwip/core/tcp.c rename to minix/lib/liblwip/core/tcp.c diff --git a/lib/liblwip/core/tcp_in.c b/minix/lib/liblwip/core/tcp_in.c similarity index 100% rename from lib/liblwip/core/tcp_in.c rename to minix/lib/liblwip/core/tcp_in.c diff --git a/lib/liblwip/core/tcp_out.c b/minix/lib/liblwip/core/tcp_out.c similarity index 100% rename from lib/liblwip/core/tcp_out.c rename to minix/lib/liblwip/core/tcp_out.c diff --git a/lib/liblwip/core/timers.c b/minix/lib/liblwip/core/timers.c similarity index 100% rename from lib/liblwip/core/timers.c rename to minix/lib/liblwip/core/timers.c diff --git a/lib/liblwip/core/udp.c b/minix/lib/liblwip/core/udp.c similarity index 100% rename from lib/liblwip/core/udp.c rename to minix/lib/liblwip/core/udp.c diff --git a/lib/liblwip/include/arch/cc.h b/minix/lib/liblwip/include/arch/cc.h similarity index 100% rename from lib/liblwip/include/arch/cc.h rename to minix/lib/liblwip/include/arch/cc.h diff --git a/lib/liblwip/include/arch/perf.h b/minix/lib/liblwip/include/arch/perf.h similarity index 100% rename from lib/liblwip/include/arch/perf.h rename to minix/lib/liblwip/include/arch/perf.h diff --git a/lib/liblwip/include/arch/sys_arch.h b/minix/lib/liblwip/include/arch/sys_arch.h similarity index 100% rename from lib/liblwip/include/arch/sys_arch.h rename to minix/lib/liblwip/include/arch/sys_arch.h diff --git a/lib/liblwip/include/ipv4/lwip/autoip.h b/minix/lib/liblwip/include/ipv4/lwip/autoip.h similarity index 100% rename from lib/liblwip/include/ipv4/lwip/autoip.h rename to minix/lib/liblwip/include/ipv4/lwip/autoip.h diff --git a/lib/liblwip/include/ipv4/lwip/icmp.h b/minix/lib/liblwip/include/ipv4/lwip/icmp.h similarity index 100% rename from lib/liblwip/include/ipv4/lwip/icmp.h rename to minix/lib/liblwip/include/ipv4/lwip/icmp.h diff --git a/lib/liblwip/include/ipv4/lwip/igmp.h b/minix/lib/liblwip/include/ipv4/lwip/igmp.h similarity index 100% rename from lib/liblwip/include/ipv4/lwip/igmp.h rename to minix/lib/liblwip/include/ipv4/lwip/igmp.h diff --git a/lib/liblwip/include/ipv4/lwip/inet.h b/minix/lib/liblwip/include/ipv4/lwip/inet.h similarity index 100% rename from lib/liblwip/include/ipv4/lwip/inet.h rename to minix/lib/liblwip/include/ipv4/lwip/inet.h diff --git a/lib/liblwip/include/ipv4/lwip/ip4.h b/minix/lib/liblwip/include/ipv4/lwip/ip4.h similarity index 100% rename from lib/liblwip/include/ipv4/lwip/ip4.h rename to minix/lib/liblwip/include/ipv4/lwip/ip4.h diff --git a/lib/liblwip/include/ipv4/lwip/ip4_addr.h b/minix/lib/liblwip/include/ipv4/lwip/ip4_addr.h similarity index 100% rename from lib/liblwip/include/ipv4/lwip/ip4_addr.h rename to minix/lib/liblwip/include/ipv4/lwip/ip4_addr.h diff --git a/lib/liblwip/include/ipv4/lwip/ip_frag.h b/minix/lib/liblwip/include/ipv4/lwip/ip_frag.h similarity index 100% rename from lib/liblwip/include/ipv4/lwip/ip_frag.h rename to minix/lib/liblwip/include/ipv4/lwip/ip_frag.h diff --git a/lib/liblwip/include/ipv6/lwip/dhcp6.h b/minix/lib/liblwip/include/ipv6/lwip/dhcp6.h similarity index 100% rename from lib/liblwip/include/ipv6/lwip/dhcp6.h rename to minix/lib/liblwip/include/ipv6/lwip/dhcp6.h diff --git a/lib/liblwip/include/ipv6/lwip/ethip6.h b/minix/lib/liblwip/include/ipv6/lwip/ethip6.h similarity index 100% rename from lib/liblwip/include/ipv6/lwip/ethip6.h rename to minix/lib/liblwip/include/ipv6/lwip/ethip6.h diff --git a/lib/liblwip/include/ipv6/lwip/icmp6.h b/minix/lib/liblwip/include/ipv6/lwip/icmp6.h similarity index 100% rename from lib/liblwip/include/ipv6/lwip/icmp6.h rename to minix/lib/liblwip/include/ipv6/lwip/icmp6.h diff --git a/lib/liblwip/include/ipv6/lwip/inet6.h b/minix/lib/liblwip/include/ipv6/lwip/inet6.h similarity index 100% rename from lib/liblwip/include/ipv6/lwip/inet6.h rename to minix/lib/liblwip/include/ipv6/lwip/inet6.h diff --git a/lib/liblwip/include/ipv6/lwip/ip6.h b/minix/lib/liblwip/include/ipv6/lwip/ip6.h similarity index 100% rename from lib/liblwip/include/ipv6/lwip/ip6.h rename to minix/lib/liblwip/include/ipv6/lwip/ip6.h diff --git a/lib/liblwip/include/ipv6/lwip/ip6_addr.h b/minix/lib/liblwip/include/ipv6/lwip/ip6_addr.h similarity index 100% rename from lib/liblwip/include/ipv6/lwip/ip6_addr.h rename to minix/lib/liblwip/include/ipv6/lwip/ip6_addr.h diff --git a/lib/liblwip/include/ipv6/lwip/ip6_frag.h b/minix/lib/liblwip/include/ipv6/lwip/ip6_frag.h similarity index 100% rename from lib/liblwip/include/ipv6/lwip/ip6_frag.h rename to minix/lib/liblwip/include/ipv6/lwip/ip6_frag.h diff --git a/lib/liblwip/include/ipv6/lwip/mld6.h b/minix/lib/liblwip/include/ipv6/lwip/mld6.h similarity index 100% rename from lib/liblwip/include/ipv6/lwip/mld6.h rename to minix/lib/liblwip/include/ipv6/lwip/mld6.h diff --git a/lib/liblwip/include/ipv6/lwip/nd6.h b/minix/lib/liblwip/include/ipv6/lwip/nd6.h similarity index 100% rename from lib/liblwip/include/ipv6/lwip/nd6.h rename to minix/lib/liblwip/include/ipv6/lwip/nd6.h diff --git a/lib/liblwip/include/lwip/api.h b/minix/lib/liblwip/include/lwip/api.h similarity index 100% rename from lib/liblwip/include/lwip/api.h rename to minix/lib/liblwip/include/lwip/api.h diff --git a/lib/liblwip/include/lwip/api_msg.h b/minix/lib/liblwip/include/lwip/api_msg.h similarity index 100% rename from lib/liblwip/include/lwip/api_msg.h rename to minix/lib/liblwip/include/lwip/api_msg.h diff --git a/lib/liblwip/include/lwip/arch.h b/minix/lib/liblwip/include/lwip/arch.h similarity index 100% rename from lib/liblwip/include/lwip/arch.h rename to minix/lib/liblwip/include/lwip/arch.h diff --git a/lib/liblwip/include/lwip/debug.h b/minix/lib/liblwip/include/lwip/debug.h similarity index 100% rename from lib/liblwip/include/lwip/debug.h rename to minix/lib/liblwip/include/lwip/debug.h diff --git a/lib/liblwip/include/lwip/def.h b/minix/lib/liblwip/include/lwip/def.h similarity index 100% rename from lib/liblwip/include/lwip/def.h rename to minix/lib/liblwip/include/lwip/def.h diff --git a/lib/liblwip/include/lwip/dhcp.h b/minix/lib/liblwip/include/lwip/dhcp.h similarity index 100% rename from lib/liblwip/include/lwip/dhcp.h rename to minix/lib/liblwip/include/lwip/dhcp.h diff --git a/lib/liblwip/include/lwip/dns.h b/minix/lib/liblwip/include/lwip/dns.h similarity index 100% rename from lib/liblwip/include/lwip/dns.h rename to minix/lib/liblwip/include/lwip/dns.h diff --git a/lib/liblwip/include/lwip/err.h b/minix/lib/liblwip/include/lwip/err.h similarity index 100% rename from lib/liblwip/include/lwip/err.h rename to minix/lib/liblwip/include/lwip/err.h diff --git a/lib/liblwip/include/lwip/inet_chksum.h b/minix/lib/liblwip/include/lwip/inet_chksum.h similarity index 100% rename from lib/liblwip/include/lwip/inet_chksum.h rename to minix/lib/liblwip/include/lwip/inet_chksum.h diff --git a/lib/liblwip/include/lwip/init.h b/minix/lib/liblwip/include/lwip/init.h similarity index 100% rename from lib/liblwip/include/lwip/init.h rename to minix/lib/liblwip/include/lwip/init.h diff --git a/lib/liblwip/include/lwip/ip.h b/minix/lib/liblwip/include/lwip/ip.h similarity index 100% rename from lib/liblwip/include/lwip/ip.h rename to minix/lib/liblwip/include/lwip/ip.h diff --git a/lib/liblwip/include/lwip/ip_addr.h b/minix/lib/liblwip/include/lwip/ip_addr.h similarity index 100% rename from lib/liblwip/include/lwip/ip_addr.h rename to minix/lib/liblwip/include/lwip/ip_addr.h diff --git a/lib/liblwip/include/lwip/mem.h b/minix/lib/liblwip/include/lwip/mem.h similarity index 100% rename from lib/liblwip/include/lwip/mem.h rename to minix/lib/liblwip/include/lwip/mem.h diff --git a/lib/liblwip/include/lwip/memp.h b/minix/lib/liblwip/include/lwip/memp.h similarity index 100% rename from lib/liblwip/include/lwip/memp.h rename to minix/lib/liblwip/include/lwip/memp.h diff --git a/lib/liblwip/include/lwip/memp_std.h b/minix/lib/liblwip/include/lwip/memp_std.h similarity index 100% rename from lib/liblwip/include/lwip/memp_std.h rename to minix/lib/liblwip/include/lwip/memp_std.h diff --git a/lib/liblwip/include/lwip/netbuf.h b/minix/lib/liblwip/include/lwip/netbuf.h similarity index 100% rename from lib/liblwip/include/lwip/netbuf.h rename to minix/lib/liblwip/include/lwip/netbuf.h diff --git a/lib/liblwip/include/lwip/netdb.h b/minix/lib/liblwip/include/lwip/netdb.h similarity index 100% rename from lib/liblwip/include/lwip/netdb.h rename to minix/lib/liblwip/include/lwip/netdb.h diff --git a/lib/liblwip/include/lwip/netif.h b/minix/lib/liblwip/include/lwip/netif.h similarity index 100% rename from lib/liblwip/include/lwip/netif.h rename to minix/lib/liblwip/include/lwip/netif.h diff --git a/lib/liblwip/include/lwip/netifapi.h b/minix/lib/liblwip/include/lwip/netifapi.h similarity index 100% rename from lib/liblwip/include/lwip/netifapi.h rename to minix/lib/liblwip/include/lwip/netifapi.h diff --git a/lib/liblwip/include/lwip/opt.h b/minix/lib/liblwip/include/lwip/opt.h similarity index 100% rename from lib/liblwip/include/lwip/opt.h rename to minix/lib/liblwip/include/lwip/opt.h diff --git a/lib/liblwip/include/lwip/pbuf.h b/minix/lib/liblwip/include/lwip/pbuf.h similarity index 100% rename from lib/liblwip/include/lwip/pbuf.h rename to minix/lib/liblwip/include/lwip/pbuf.h diff --git a/lib/liblwip/include/lwip/raw.h b/minix/lib/liblwip/include/lwip/raw.h similarity index 100% rename from lib/liblwip/include/lwip/raw.h rename to minix/lib/liblwip/include/lwip/raw.h diff --git a/lib/liblwip/include/lwip/sio.h b/minix/lib/liblwip/include/lwip/sio.h similarity index 100% rename from lib/liblwip/include/lwip/sio.h rename to minix/lib/liblwip/include/lwip/sio.h diff --git a/lib/liblwip/include/lwip/snmp.h b/minix/lib/liblwip/include/lwip/snmp.h similarity index 100% rename from lib/liblwip/include/lwip/snmp.h rename to minix/lib/liblwip/include/lwip/snmp.h diff --git a/lib/liblwip/include/lwip/snmp_asn1.h b/minix/lib/liblwip/include/lwip/snmp_asn1.h similarity index 100% rename from lib/liblwip/include/lwip/snmp_asn1.h rename to minix/lib/liblwip/include/lwip/snmp_asn1.h diff --git a/lib/liblwip/include/lwip/snmp_msg.h b/minix/lib/liblwip/include/lwip/snmp_msg.h similarity index 100% rename from lib/liblwip/include/lwip/snmp_msg.h rename to minix/lib/liblwip/include/lwip/snmp_msg.h diff --git a/lib/liblwip/include/lwip/snmp_structs.h b/minix/lib/liblwip/include/lwip/snmp_structs.h similarity index 100% rename from lib/liblwip/include/lwip/snmp_structs.h rename to minix/lib/liblwip/include/lwip/snmp_structs.h diff --git a/lib/liblwip/include/lwip/sockets.h b/minix/lib/liblwip/include/lwip/sockets.h similarity index 100% rename from lib/liblwip/include/lwip/sockets.h rename to minix/lib/liblwip/include/lwip/sockets.h diff --git a/lib/liblwip/include/lwip/stats.h b/minix/lib/liblwip/include/lwip/stats.h similarity index 100% rename from lib/liblwip/include/lwip/stats.h rename to minix/lib/liblwip/include/lwip/stats.h diff --git a/lib/liblwip/include/lwip/sys.h b/minix/lib/liblwip/include/lwip/sys.h similarity index 100% rename from lib/liblwip/include/lwip/sys.h rename to minix/lib/liblwip/include/lwip/sys.h diff --git a/lib/liblwip/include/lwip/tcp.h b/minix/lib/liblwip/include/lwip/tcp.h similarity index 100% rename from lib/liblwip/include/lwip/tcp.h rename to minix/lib/liblwip/include/lwip/tcp.h diff --git a/lib/liblwip/include/lwip/tcp_impl.h b/minix/lib/liblwip/include/lwip/tcp_impl.h similarity index 100% rename from lib/liblwip/include/lwip/tcp_impl.h rename to minix/lib/liblwip/include/lwip/tcp_impl.h diff --git a/lib/liblwip/include/lwip/tcpip.h b/minix/lib/liblwip/include/lwip/tcpip.h similarity index 100% rename from lib/liblwip/include/lwip/tcpip.h rename to minix/lib/liblwip/include/lwip/tcpip.h diff --git a/lib/liblwip/include/lwip/timers.h b/minix/lib/liblwip/include/lwip/timers.h similarity index 100% rename from lib/liblwip/include/lwip/timers.h rename to minix/lib/liblwip/include/lwip/timers.h diff --git a/lib/liblwip/include/lwip/udp.h b/minix/lib/liblwip/include/lwip/udp.h similarity index 100% rename from lib/liblwip/include/lwip/udp.h rename to minix/lib/liblwip/include/lwip/udp.h diff --git a/lib/liblwip/include/lwipopts.h b/minix/lib/liblwip/include/lwipopts.h similarity index 100% rename from lib/liblwip/include/lwipopts.h rename to minix/lib/liblwip/include/lwipopts.h diff --git a/lib/liblwip/include/netif/etharp.h b/minix/lib/liblwip/include/netif/etharp.h similarity index 100% rename from lib/liblwip/include/netif/etharp.h rename to minix/lib/liblwip/include/netif/etharp.h diff --git a/lib/liblwip/include/netif/ppp_oe.h b/minix/lib/liblwip/include/netif/ppp_oe.h similarity index 100% rename from lib/liblwip/include/netif/ppp_oe.h rename to minix/lib/liblwip/include/netif/ppp_oe.h diff --git a/lib/liblwip/include/netif/slipif.h b/minix/lib/liblwip/include/netif/slipif.h similarity index 100% rename from lib/liblwip/include/netif/slipif.h rename to minix/lib/liblwip/include/netif/slipif.h diff --git a/lib/liblwip/include/posix/netdb.h b/minix/lib/liblwip/include/posix/netdb.h similarity index 100% rename from lib/liblwip/include/posix/netdb.h rename to minix/lib/liblwip/include/posix/netdb.h diff --git a/lib/liblwip/include/posix/sys/socket.h b/minix/lib/liblwip/include/posix/sys/socket.h similarity index 100% rename from lib/liblwip/include/posix/sys/socket.h rename to minix/lib/liblwip/include/posix/sys/socket.h diff --git a/lib/liblwip/netif/FILES b/minix/lib/liblwip/netif/FILES similarity index 100% rename from lib/liblwip/netif/FILES rename to minix/lib/liblwip/netif/FILES diff --git a/lib/liblwip/netif/Makefile.inc b/minix/lib/liblwip/netif/Makefile.inc similarity index 100% rename from lib/liblwip/netif/Makefile.inc rename to minix/lib/liblwip/netif/Makefile.inc diff --git a/lib/liblwip/netif/etharp.c b/minix/lib/liblwip/netif/etharp.c similarity index 100% rename from lib/liblwip/netif/etharp.c rename to minix/lib/liblwip/netif/etharp.c diff --git a/lib/liblwip/netif/ethernetif.c b/minix/lib/liblwip/netif/ethernetif.c similarity index 100% rename from lib/liblwip/netif/ethernetif.c rename to minix/lib/liblwip/netif/ethernetif.c diff --git a/lib/liblwip/netif/ppp/auth.c b/minix/lib/liblwip/netif/ppp/auth.c similarity index 100% rename from lib/liblwip/netif/ppp/auth.c rename to minix/lib/liblwip/netif/ppp/auth.c diff --git a/lib/liblwip/netif/ppp/auth.h b/minix/lib/liblwip/netif/ppp/auth.h similarity index 100% rename from lib/liblwip/netif/ppp/auth.h rename to minix/lib/liblwip/netif/ppp/auth.h diff --git a/lib/liblwip/netif/ppp/chap.c b/minix/lib/liblwip/netif/ppp/chap.c similarity index 100% rename from lib/liblwip/netif/ppp/chap.c rename to minix/lib/liblwip/netif/ppp/chap.c diff --git a/lib/liblwip/netif/ppp/chap.h b/minix/lib/liblwip/netif/ppp/chap.h similarity index 100% rename from lib/liblwip/netif/ppp/chap.h rename to minix/lib/liblwip/netif/ppp/chap.h diff --git a/lib/liblwip/netif/ppp/chpms.c b/minix/lib/liblwip/netif/ppp/chpms.c similarity index 100% rename from lib/liblwip/netif/ppp/chpms.c rename to minix/lib/liblwip/netif/ppp/chpms.c diff --git a/lib/liblwip/netif/ppp/chpms.h b/minix/lib/liblwip/netif/ppp/chpms.h similarity index 100% rename from lib/liblwip/netif/ppp/chpms.h rename to minix/lib/liblwip/netif/ppp/chpms.h diff --git a/lib/liblwip/netif/ppp/fsm.c b/minix/lib/liblwip/netif/ppp/fsm.c similarity index 100% rename from lib/liblwip/netif/ppp/fsm.c rename to minix/lib/liblwip/netif/ppp/fsm.c diff --git a/lib/liblwip/netif/ppp/fsm.h b/minix/lib/liblwip/netif/ppp/fsm.h similarity index 100% rename from lib/liblwip/netif/ppp/fsm.h rename to minix/lib/liblwip/netif/ppp/fsm.h diff --git a/lib/liblwip/netif/ppp/ipcp.c b/minix/lib/liblwip/netif/ppp/ipcp.c similarity index 100% rename from lib/liblwip/netif/ppp/ipcp.c rename to minix/lib/liblwip/netif/ppp/ipcp.c diff --git a/lib/liblwip/netif/ppp/ipcp.h b/minix/lib/liblwip/netif/ppp/ipcp.h similarity index 100% rename from lib/liblwip/netif/ppp/ipcp.h rename to minix/lib/liblwip/netif/ppp/ipcp.h diff --git a/lib/liblwip/netif/ppp/lcp.c b/minix/lib/liblwip/netif/ppp/lcp.c similarity index 100% rename from lib/liblwip/netif/ppp/lcp.c rename to minix/lib/liblwip/netif/ppp/lcp.c diff --git a/lib/liblwip/netif/ppp/lcp.h b/minix/lib/liblwip/netif/ppp/lcp.h similarity index 100% rename from lib/liblwip/netif/ppp/lcp.h rename to minix/lib/liblwip/netif/ppp/lcp.h diff --git a/lib/liblwip/netif/ppp/magic.c b/minix/lib/liblwip/netif/ppp/magic.c similarity index 100% rename from lib/liblwip/netif/ppp/magic.c rename to minix/lib/liblwip/netif/ppp/magic.c diff --git a/lib/liblwip/netif/ppp/magic.h b/minix/lib/liblwip/netif/ppp/magic.h similarity index 100% rename from lib/liblwip/netif/ppp/magic.h rename to minix/lib/liblwip/netif/ppp/magic.h diff --git a/lib/liblwip/netif/ppp/md5.c b/minix/lib/liblwip/netif/ppp/md5.c similarity index 100% rename from lib/liblwip/netif/ppp/md5.c rename to minix/lib/liblwip/netif/ppp/md5.c diff --git a/lib/liblwip/netif/ppp/md5.h b/minix/lib/liblwip/netif/ppp/md5.h similarity index 100% rename from lib/liblwip/netif/ppp/md5.h rename to minix/lib/liblwip/netif/ppp/md5.h diff --git a/lib/liblwip/netif/ppp/pap.c b/minix/lib/liblwip/netif/ppp/pap.c similarity index 100% rename from lib/liblwip/netif/ppp/pap.c rename to minix/lib/liblwip/netif/ppp/pap.c diff --git a/lib/liblwip/netif/ppp/pap.h b/minix/lib/liblwip/netif/ppp/pap.h similarity index 100% rename from lib/liblwip/netif/ppp/pap.h rename to minix/lib/liblwip/netif/ppp/pap.h diff --git a/lib/liblwip/netif/ppp/ppp.c b/minix/lib/liblwip/netif/ppp/ppp.c similarity index 100% rename from lib/liblwip/netif/ppp/ppp.c rename to minix/lib/liblwip/netif/ppp/ppp.c diff --git a/lib/liblwip/netif/ppp/ppp.h b/minix/lib/liblwip/netif/ppp/ppp.h similarity index 100% rename from lib/liblwip/netif/ppp/ppp.h rename to minix/lib/liblwip/netif/ppp/ppp.h diff --git a/lib/liblwip/netif/ppp/ppp_impl.h b/minix/lib/liblwip/netif/ppp/ppp_impl.h similarity index 100% rename from lib/liblwip/netif/ppp/ppp_impl.h rename to minix/lib/liblwip/netif/ppp/ppp_impl.h diff --git a/lib/liblwip/netif/ppp/ppp_oe.c b/minix/lib/liblwip/netif/ppp/ppp_oe.c similarity index 100% rename from lib/liblwip/netif/ppp/ppp_oe.c rename to minix/lib/liblwip/netif/ppp/ppp_oe.c diff --git a/lib/liblwip/netif/ppp/pppdebug.h b/minix/lib/liblwip/netif/ppp/pppdebug.h similarity index 100% rename from lib/liblwip/netif/ppp/pppdebug.h rename to minix/lib/liblwip/netif/ppp/pppdebug.h diff --git a/lib/liblwip/netif/ppp/randm.c b/minix/lib/liblwip/netif/ppp/randm.c similarity index 100% rename from lib/liblwip/netif/ppp/randm.c rename to minix/lib/liblwip/netif/ppp/randm.c diff --git a/lib/liblwip/netif/ppp/randm.h b/minix/lib/liblwip/netif/ppp/randm.h similarity index 100% rename from lib/liblwip/netif/ppp/randm.h rename to minix/lib/liblwip/netif/ppp/randm.h diff --git a/lib/liblwip/netif/ppp/readme.txt b/minix/lib/liblwip/netif/ppp/readme.txt similarity index 100% rename from lib/liblwip/netif/ppp/readme.txt rename to minix/lib/liblwip/netif/ppp/readme.txt diff --git a/lib/liblwip/netif/ppp/vj.c b/minix/lib/liblwip/netif/ppp/vj.c similarity index 100% rename from lib/liblwip/netif/ppp/vj.c rename to minix/lib/liblwip/netif/ppp/vj.c diff --git a/lib/liblwip/netif/ppp/vj.h b/minix/lib/liblwip/netif/ppp/vj.h similarity index 100% rename from lib/liblwip/netif/ppp/vj.h rename to minix/lib/liblwip/netif/ppp/vj.h diff --git a/lib/liblwip/netif/slipif.c b/minix/lib/liblwip/netif/slipif.c similarity index 100% rename from lib/liblwip/netif/slipif.c rename to minix/lib/liblwip/netif/slipif.c diff --git a/lib/liblwip/sys_arch.c b/minix/lib/liblwip/sys_arch.c similarity index 100% rename from lib/liblwip/sys_arch.c rename to minix/lib/liblwip/sys_arch.c diff --git a/lib/libminc/Makefile b/minix/lib/libminc/Makefile similarity index 95% rename from lib/libminc/Makefile rename to minix/lib/libminc/Makefile index 4c5a0db32..781f0cf18 100644 --- a/lib/libminc/Makefile +++ b/minix/lib/libminc/Makefile @@ -22,7 +22,9 @@ LIB= minc MKPIC= no # Never used as a dynamic library LIBSADIR= ${NETBSDSRCDIR}/sys/lib/libsa -LIBSYSDIR= ${NETBSDSRCDIR}/lib/libsys +LIBSYSDIR= ${NETBSDSRCDIR}/minix/lib/libsys +LIBMINIXCDIR= ${NETBSDSRCDIR}/minix/lib/libc +LIBMINIXCARCHDIR= ${NETBSDSRCDIR}/minix/lib/libc/arch/${MACHINE_CPU} LIBCDIR= ${NETBSDSRCDIR}/lib/libc LIBCARCHDIR= ${LIBCDIR}/arch/${MACHINE_CPU} LIBCOMMONCDIR= ${NETBSDSRCDIR}/common/lib/libc @@ -197,7 +199,7 @@ CPPFLAGS.toupper_.c+= -I${LIBCDIR}/locale .for f in \ waitpid.o -${f} ${f:C/\.o/.bc/}: ${LIBCDIR}/gen/minix/${f:C/\.o/.c/} +${f} ${f:C/\.o/.bc/}: ${LIBMINIXCDIR}/gen/${f:C/\.o/.c/} OBJS+= ${f} CLEANFILES+= ${f} @@ -271,7 +273,7 @@ CPPFLAGS.strcspn.c+= -D_LIBC select.o setuid.o sigprocmask.o stack_utils.o stat.o stime.o \ syscall.o _ucontext.o umask.o unlink.o write.o \ kill.o -${f} ${f:C/\.o/.bc/}: ${LIBCDIR}/sys-minix/${f:C/\.o/.c/} +${f} ${f:C/\.o/.bc/}: ${LIBMINIXCDIR}/sys/${f:C/\.o/.c/} OBJS+= ${f} CLEANFILES+= ${f} @@ -285,7 +287,7 @@ CPPFLAGS.malloc.c+= -D_LIBSYS .for f in \ brksize.o _do_kernel_call_intr.o get_minix_kerninfo.o _ipc.o ucontext.o -${f} ${f:C/\.o/.bc/}: ${LIBCARCHDIR}/sys-minix/${f:C/\.o/.S/} +${f} ${f:C/\.o/.bc/}: ${LIBMINIXCARCHDIR}/sys/${f:C/\.o/.S/} OBJS+= ${f} CLEANFILES+= ${f} diff --git a/lib/libminc/_snprintf.c b/minix/lib/libminc/_snprintf.c similarity index 100% rename from lib/libminc/_snprintf.c rename to minix/lib/libminc/_snprintf.c diff --git a/lib/libminc/arch/earm/Makefile.libc.inc b/minix/lib/libminc/arch/earm/Makefile.libc.inc similarity index 100% rename from lib/libminc/arch/earm/Makefile.libc.inc rename to minix/lib/libminc/arch/earm/Makefile.libc.inc diff --git a/lib/libminc/arch/i386/Makefile.libc.inc b/minix/lib/libminc/arch/i386/Makefile.libc.inc similarity index 100% rename from lib/libminc/arch/i386/Makefile.libc.inc rename to minix/lib/libminc/arch/i386/Makefile.libc.inc diff --git a/lib/libminc/atoi.c b/minix/lib/libminc/atoi.c similarity index 100% rename from lib/libminc/atoi.c rename to minix/lib/libminc/atoi.c diff --git a/lib/libminc/fputs.c b/minix/lib/libminc/fputs.c similarity index 100% rename from lib/libminc/fputs.c rename to minix/lib/libminc/fputs.c diff --git a/lib/libminc/strtol.c b/minix/lib/libminc/strtol.c similarity index 100% rename from lib/libminc/strtol.c rename to minix/lib/libminc/strtol.c diff --git a/lib/libminixfs/Makefile b/minix/lib/libminixfs/Makefile similarity index 100% rename from lib/libminixfs/Makefile rename to minix/lib/libminixfs/Makefile diff --git a/lib/libminixfs/cache.c b/minix/lib/libminixfs/cache.c similarity index 100% rename from lib/libminixfs/cache.c rename to minix/lib/libminixfs/cache.c diff --git a/lib/libminixfs/fetch_credentials.c b/minix/lib/libminixfs/fetch_credentials.c similarity index 100% rename from lib/libminixfs/fetch_credentials.c rename to minix/lib/libminixfs/fetch_credentials.c diff --git a/lib/libminixfs/minixfs.h b/minix/lib/libminixfs/minixfs.h similarity index 100% rename from lib/libminixfs/minixfs.h rename to minix/lib/libminixfs/minixfs.h diff --git a/lib/libminlib/Makefile b/minix/lib/libminlib/Makefile similarity index 84% rename from lib/libminlib/Makefile rename to minix/lib/libminlib/Makefile index 5400116e3..1eb7d2533 100644 --- a/lib/libminlib/Makefile +++ b/minix/lib/libminlib/Makefile @@ -11,8 +11,8 @@ LIB= minlib USE_SHLIBDIR= yes -CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/servers -CPPFLAGS.fsversion.c+= -I${NETBSDSRCDIR}/servers +CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/minix/fs +CPPFLAGS.fsversion.c+= -I${NETBSDSRCDIR}/minix/fs SRCS+= fslib.c fsversion.c # DHCP get/set tags. diff --git a/lib/libminlib/dhcp_gettag.c b/minix/lib/libminlib/dhcp_gettag.c similarity index 100% rename from lib/libminlib/dhcp_gettag.c rename to minix/lib/libminlib/dhcp_gettag.c diff --git a/lib/libminlib/dhcp_settag.c b/minix/lib/libminlib/dhcp_settag.c similarity index 100% rename from lib/libminlib/dhcp_settag.c rename to minix/lib/libminlib/dhcp_settag.c diff --git a/lib/libminlib/earm/Makefile.inc b/minix/lib/libminlib/earm/Makefile.inc similarity index 100% rename from lib/libminlib/earm/Makefile.inc rename to minix/lib/libminlib/earm/Makefile.inc diff --git a/lib/libminlib/earm/get_bp.S b/minix/lib/libminlib/earm/get_bp.S similarity index 100% rename from lib/libminlib/earm/get_bp.S rename to minix/lib/libminlib/earm/get_bp.S diff --git a/lib/libminlib/earm/read_tsc.c b/minix/lib/libminlib/earm/read_tsc.c similarity index 100% rename from lib/libminlib/earm/read_tsc.c rename to minix/lib/libminlib/earm/read_tsc.c diff --git a/lib/libminlib/fslib.c b/minix/lib/libminlib/fslib.c similarity index 100% rename from lib/libminlib/fslib.c rename to minix/lib/libminlib/fslib.c diff --git a/lib/libminlib/fsversion.c b/minix/lib/libminlib/fsversion.c similarity index 100% rename from lib/libminlib/fsversion.c rename to minix/lib/libminlib/fsversion.c diff --git a/lib/libminlib/gcov.c b/minix/lib/libminlib/gcov.c similarity index 100% rename from lib/libminlib/gcov.c rename to minix/lib/libminlib/gcov.c diff --git a/lib/libminlib/gcov_flush.c b/minix/lib/libminlib/gcov_flush.c similarity index 100% rename from lib/libminlib/gcov_flush.c rename to minix/lib/libminlib/gcov_flush.c diff --git a/lib/libminlib/i386/Makefile.inc b/minix/lib/libminlib/i386/Makefile.inc similarity index 100% rename from lib/libminlib/i386/Makefile.inc rename to minix/lib/libminlib/i386/Makefile.inc diff --git a/lib/libminlib/i386/_cpufeature.c b/minix/lib/libminlib/i386/_cpufeature.c similarity index 100% rename from lib/libminlib/i386/_cpufeature.c rename to minix/lib/libminlib/i386/_cpufeature.c diff --git a/lib/libminlib/i386/_cpuid.S b/minix/lib/libminlib/i386/_cpuid.S similarity index 100% rename from lib/libminlib/i386/_cpuid.S rename to minix/lib/libminlib/i386/_cpuid.S diff --git a/lib/libminlib/i386/get_bp.S b/minix/lib/libminlib/i386/get_bp.S similarity index 100% rename from lib/libminlib/i386/get_bp.S rename to minix/lib/libminlib/i386/get_bp.S diff --git a/lib/libminlib/i386/getprocessor.S b/minix/lib/libminlib/i386/getprocessor.S similarity index 100% rename from lib/libminlib/i386/getprocessor.S rename to minix/lib/libminlib/i386/getprocessor.S diff --git a/lib/libminlib/i386/read_tsc.S b/minix/lib/libminlib/i386/read_tsc.S similarity index 100% rename from lib/libminlib/i386/read_tsc.S rename to minix/lib/libminlib/i386/read_tsc.S diff --git a/lib/libminlib/itoa.c b/minix/lib/libminlib/itoa.c similarity index 100% rename from lib/libminlib/itoa.c rename to minix/lib/libminlib/itoa.c diff --git a/lib/libminlib/oneC_sum.c b/minix/lib/libminlib/oneC_sum.c similarity index 100% rename from lib/libminlib/oneC_sum.c rename to minix/lib/libminlib/oneC_sum.c diff --git a/lib/libminlib/paramvalue.c b/minix/lib/libminlib/paramvalue.c similarity index 100% rename from lib/libminlib/paramvalue.c rename to minix/lib/libminlib/paramvalue.c diff --git a/lib/libminlib/pkgconfig/Makefile b/minix/lib/libminlib/pkgconfig/Makefile similarity index 100% rename from lib/libminlib/pkgconfig/Makefile rename to minix/lib/libminlib/pkgconfig/Makefile diff --git a/lib/libminlib/pkgconfig/minlib.pc b/minix/lib/libminlib/pkgconfig/minlib.pc similarity index 100% rename from lib/libminlib/pkgconfig/minlib.pc rename to minix/lib/libminlib/pkgconfig/minlib.pc diff --git a/lib/libminlib/read_tsc_64.c b/minix/lib/libminlib/read_tsc_64.c similarity index 100% rename from lib/libminlib/read_tsc_64.c rename to minix/lib/libminlib/read_tsc_64.c diff --git a/lib/libminlib/servxcheck.c b/minix/lib/libminlib/servxcheck.c similarity index 100% rename from lib/libminlib/servxcheck.c rename to minix/lib/libminlib/servxcheck.c diff --git a/lib/libminlib/shlib_version b/minix/lib/libminlib/shlib_version similarity index 100% rename from lib/libminlib/shlib_version rename to minix/lib/libminlib/shlib_version diff --git a/lib/libmthread/Makefile b/minix/lib/libmthread/Makefile similarity index 100% rename from lib/libmthread/Makefile rename to minix/lib/libmthread/Makefile diff --git a/lib/libmthread/allocate.c b/minix/lib/libmthread/allocate.c similarity index 100% rename from lib/libmthread/allocate.c rename to minix/lib/libmthread/allocate.c diff --git a/lib/libmthread/attribute.c b/minix/lib/libmthread/attribute.c similarity index 100% rename from lib/libmthread/attribute.c rename to minix/lib/libmthread/attribute.c diff --git a/lib/libmthread/condition.c b/minix/lib/libmthread/condition.c similarity index 100% rename from lib/libmthread/condition.c rename to minix/lib/libmthread/condition.c diff --git a/lib/libmthread/event.c b/minix/lib/libmthread/event.c similarity index 100% rename from lib/libmthread/event.c rename to minix/lib/libmthread/event.c diff --git a/lib/libmthread/global.h b/minix/lib/libmthread/global.h similarity index 100% rename from lib/libmthread/global.h rename to minix/lib/libmthread/global.h diff --git a/lib/libmthread/key.c b/minix/lib/libmthread/key.c similarity index 100% rename from lib/libmthread/key.c rename to minix/lib/libmthread/key.c diff --git a/lib/libmthread/misc.c b/minix/lib/libmthread/misc.c similarity index 100% rename from lib/libmthread/misc.c rename to minix/lib/libmthread/misc.c diff --git a/lib/libmthread/mutex.c b/minix/lib/libmthread/mutex.c similarity index 100% rename from lib/libmthread/mutex.c rename to minix/lib/libmthread/mutex.c diff --git a/lib/libmthread/proto.h b/minix/lib/libmthread/proto.h similarity index 100% rename from lib/libmthread/proto.h rename to minix/lib/libmthread/proto.h diff --git a/lib/libmthread/pthread_compat.c b/minix/lib/libmthread/pthread_compat.c similarity index 100% rename from lib/libmthread/pthread_compat.c rename to minix/lib/libmthread/pthread_compat.c diff --git a/lib/libmthread/queue.c b/minix/lib/libmthread/queue.c similarity index 100% rename from lib/libmthread/queue.c rename to minix/lib/libmthread/queue.c diff --git a/lib/libmthread/rwlock.c b/minix/lib/libmthread/rwlock.c similarity index 100% rename from lib/libmthread/rwlock.c rename to minix/lib/libmthread/rwlock.c diff --git a/lib/libmthread/scheduler.c b/minix/lib/libmthread/scheduler.c similarity index 100% rename from lib/libmthread/scheduler.c rename to minix/lib/libmthread/scheduler.c diff --git a/lib/libmthread/shlib_version b/minix/lib/libmthread/shlib_version similarity index 100% rename from lib/libmthread/shlib_version rename to minix/lib/libmthread/shlib_version diff --git a/lib/libnetdriver/Makefile b/minix/lib/libnetdriver/Makefile similarity index 100% rename from lib/libnetdriver/Makefile rename to minix/lib/libnetdriver/Makefile diff --git a/lib/libnetdriver/netdriver.c b/minix/lib/libnetdriver/netdriver.c similarity index 100% rename from lib/libnetdriver/netdriver.c rename to minix/lib/libnetdriver/netdriver.c diff --git a/lib/libnetsock/Makefile b/minix/lib/libnetsock/Makefile similarity index 100% rename from lib/libnetsock/Makefile rename to minix/lib/libnetsock/Makefile diff --git a/lib/libnetsock/socket.c b/minix/lib/libnetsock/socket.c similarity index 100% rename from lib/libnetsock/socket.c rename to minix/lib/libnetsock/socket.c diff --git a/lib/libsffs/Makefile b/minix/lib/libsffs/Makefile similarity index 100% rename from lib/libsffs/Makefile rename to minix/lib/libsffs/Makefile diff --git a/lib/libsffs/const.h b/minix/lib/libsffs/const.h similarity index 100% rename from lib/libsffs/const.h rename to minix/lib/libsffs/const.h diff --git a/lib/libsffs/dentry.c b/minix/lib/libsffs/dentry.c similarity index 100% rename from lib/libsffs/dentry.c rename to minix/lib/libsffs/dentry.c diff --git a/lib/libsffs/glo.h b/minix/lib/libsffs/glo.h similarity index 100% rename from lib/libsffs/glo.h rename to minix/lib/libsffs/glo.h diff --git a/lib/libsffs/handle.c b/minix/lib/libsffs/handle.c similarity index 100% rename from lib/libsffs/handle.c rename to minix/lib/libsffs/handle.c diff --git a/lib/libsffs/inc.h b/minix/lib/libsffs/inc.h similarity index 100% rename from lib/libsffs/inc.h rename to minix/lib/libsffs/inc.h diff --git a/lib/libsffs/inode.c b/minix/lib/libsffs/inode.c similarity index 100% rename from lib/libsffs/inode.c rename to minix/lib/libsffs/inode.c diff --git a/lib/libsffs/inode.h b/minix/lib/libsffs/inode.h similarity index 100% rename from lib/libsffs/inode.h rename to minix/lib/libsffs/inode.h diff --git a/lib/libsffs/link.c b/minix/lib/libsffs/link.c similarity index 100% rename from lib/libsffs/link.c rename to minix/lib/libsffs/link.c diff --git a/lib/libsffs/lookup.c b/minix/lib/libsffs/lookup.c similarity index 100% rename from lib/libsffs/lookup.c rename to minix/lib/libsffs/lookup.c diff --git a/lib/libsffs/main.c b/minix/lib/libsffs/main.c similarity index 100% rename from lib/libsffs/main.c rename to minix/lib/libsffs/main.c diff --git a/lib/libsffs/misc.c b/minix/lib/libsffs/misc.c similarity index 100% rename from lib/libsffs/misc.c rename to minix/lib/libsffs/misc.c diff --git a/lib/libsffs/mount.c b/minix/lib/libsffs/mount.c similarity index 100% rename from lib/libsffs/mount.c rename to minix/lib/libsffs/mount.c diff --git a/lib/libsffs/name.c b/minix/lib/libsffs/name.c similarity index 100% rename from lib/libsffs/name.c rename to minix/lib/libsffs/name.c diff --git a/lib/libsffs/path.c b/minix/lib/libsffs/path.c similarity index 100% rename from lib/libsffs/path.c rename to minix/lib/libsffs/path.c diff --git a/lib/libsffs/proto.h b/minix/lib/libsffs/proto.h similarity index 100% rename from lib/libsffs/proto.h rename to minix/lib/libsffs/proto.h diff --git a/lib/libsffs/read.c b/minix/lib/libsffs/read.c similarity index 100% rename from lib/libsffs/read.c rename to minix/lib/libsffs/read.c diff --git a/lib/libsffs/stat.c b/minix/lib/libsffs/stat.c similarity index 100% rename from lib/libsffs/stat.c rename to minix/lib/libsffs/stat.c diff --git a/lib/libsffs/table.c b/minix/lib/libsffs/table.c similarity index 100% rename from lib/libsffs/table.c rename to minix/lib/libsffs/table.c diff --git a/lib/libsffs/type.h b/minix/lib/libsffs/type.h similarity index 100% rename from lib/libsffs/type.h rename to minix/lib/libsffs/type.h diff --git a/lib/libsffs/util.c b/minix/lib/libsffs/util.c similarity index 100% rename from lib/libsffs/util.c rename to minix/lib/libsffs/util.c diff --git a/lib/libsffs/verify.c b/minix/lib/libsffs/verify.c similarity index 100% rename from lib/libsffs/verify.c rename to minix/lib/libsffs/verify.c diff --git a/lib/libsffs/write.c b/minix/lib/libsffs/write.c similarity index 100% rename from lib/libsffs/write.c rename to minix/lib/libsffs/write.c diff --git a/lib/libsys/Makefile b/minix/lib/libsys/Makefile similarity index 97% rename from lib/libsys/Makefile rename to minix/lib/libsys/Makefile index c95a0b90a..e926f6906 100644 --- a/lib/libsys/Makefile +++ b/minix/lib/libsys/Makefile @@ -140,6 +140,6 @@ CPPFLAGS+= -DUSE_LIVEUPDATE CPPFLAGS+= -DUSE_SYSDEBUG .endif -CPPFLAGS.sched_start.c+= -I${NETBSDSRCDIR} +CPPFLAGS.sched_start.c+= -I${NETBSDSRCDIR}/minix .include diff --git a/lib/libsys/alloc_util.c b/minix/lib/libsys/alloc_util.c similarity index 100% rename from lib/libsys/alloc_util.c rename to minix/lib/libsys/alloc_util.c diff --git a/lib/libsys/arch/earm/Makefile.inc b/minix/lib/libsys/arch/earm/Makefile.inc similarity index 100% rename from lib/libsys/arch/earm/Makefile.inc rename to minix/lib/libsys/arch/earm/Makefile.inc diff --git a/lib/libsys/arch/earm/frclock_util.c b/minix/lib/libsys/arch/earm/frclock_util.c similarity index 100% rename from lib/libsys/arch/earm/frclock_util.c rename to minix/lib/libsys/arch/earm/frclock_util.c diff --git a/lib/libsys/arch/earm/spin.c b/minix/lib/libsys/arch/earm/spin.c similarity index 100% rename from lib/libsys/arch/earm/spin.c rename to minix/lib/libsys/arch/earm/spin.c diff --git a/lib/libsys/arch/earm/tsc_util.c b/minix/lib/libsys/arch/earm/tsc_util.c similarity index 100% rename from lib/libsys/arch/earm/tsc_util.c rename to minix/lib/libsys/arch/earm/tsc_util.c diff --git a/lib/libsys/arch/i386/Makefile.inc b/minix/lib/libsys/arch/i386/Makefile.inc similarity index 100% rename from lib/libsys/arch/i386/Makefile.inc rename to minix/lib/libsys/arch/i386/Makefile.inc diff --git a/lib/libsys/arch/i386/get_randomness.c b/minix/lib/libsys/arch/i386/get_randomness.c similarity index 100% rename from lib/libsys/arch/i386/get_randomness.c rename to minix/lib/libsys/arch/i386/get_randomness.c diff --git a/lib/libsys/arch/i386/getidle.c b/minix/lib/libsys/arch/i386/getidle.c similarity index 100% rename from lib/libsys/arch/i386/getidle.c rename to minix/lib/libsys/arch/i386/getidle.c diff --git a/lib/libsys/arch/i386/profile.c b/minix/lib/libsys/arch/i386/profile.c similarity index 100% rename from lib/libsys/arch/i386/profile.c rename to minix/lib/libsys/arch/i386/profile.c diff --git a/lib/libsys/arch/i386/profile_extern.c b/minix/lib/libsys/arch/i386/profile_extern.c similarity index 100% rename from lib/libsys/arch/i386/profile_extern.c rename to minix/lib/libsys/arch/i386/profile_extern.c diff --git a/lib/libsys/arch/i386/ser_putc.c b/minix/lib/libsys/arch/i386/ser_putc.c similarity index 100% rename from lib/libsys/arch/i386/ser_putc.c rename to minix/lib/libsys/arch/i386/ser_putc.c diff --git a/lib/libsys/arch/i386/spin.c b/minix/lib/libsys/arch/i386/spin.c similarity index 100% rename from lib/libsys/arch/i386/spin.c rename to minix/lib/libsys/arch/i386/spin.c diff --git a/lib/libsys/arch/i386/sys_eniop.c b/minix/lib/libsys/arch/i386/sys_eniop.c similarity index 100% rename from lib/libsys/arch/i386/sys_eniop.c rename to minix/lib/libsys/arch/i386/sys_eniop.c diff --git a/lib/libsys/arch/i386/sys_in.c b/minix/lib/libsys/arch/i386/sys_in.c similarity index 100% rename from lib/libsys/arch/i386/sys_in.c rename to minix/lib/libsys/arch/i386/sys_in.c diff --git a/lib/libsys/arch/i386/sys_int86.c b/minix/lib/libsys/arch/i386/sys_int86.c similarity index 100% rename from lib/libsys/arch/i386/sys_int86.c rename to minix/lib/libsys/arch/i386/sys_int86.c diff --git a/lib/libsys/arch/i386/sys_out.c b/minix/lib/libsys/arch/i386/sys_out.c similarity index 100% rename from lib/libsys/arch/i386/sys_out.c rename to minix/lib/libsys/arch/i386/sys_out.c diff --git a/lib/libsys/arch/i386/sys_readbios.c b/minix/lib/libsys/arch/i386/sys_readbios.c similarity index 100% rename from lib/libsys/arch/i386/sys_readbios.c rename to minix/lib/libsys/arch/i386/sys_readbios.c diff --git a/lib/libsys/arch/i386/sys_sdevio.c b/minix/lib/libsys/arch/i386/sys_sdevio.c similarity index 100% rename from lib/libsys/arch/i386/sys_sdevio.c rename to minix/lib/libsys/arch/i386/sys_sdevio.c diff --git a/lib/libsys/arch/i386/sys_umap_remote.c b/minix/lib/libsys/arch/i386/sys_umap_remote.c similarity index 100% rename from lib/libsys/arch/i386/sys_umap_remote.c rename to minix/lib/libsys/arch/i386/sys_umap_remote.c diff --git a/lib/libsys/arch/i386/sys_vinb.c b/minix/lib/libsys/arch/i386/sys_vinb.c similarity index 100% rename from lib/libsys/arch/i386/sys_vinb.c rename to minix/lib/libsys/arch/i386/sys_vinb.c diff --git a/lib/libsys/arch/i386/sys_vinl.c b/minix/lib/libsys/arch/i386/sys_vinl.c similarity index 100% rename from lib/libsys/arch/i386/sys_vinl.c rename to minix/lib/libsys/arch/i386/sys_vinl.c diff --git a/lib/libsys/arch/i386/sys_vinw.c b/minix/lib/libsys/arch/i386/sys_vinw.c similarity index 100% rename from lib/libsys/arch/i386/sys_vinw.c rename to minix/lib/libsys/arch/i386/sys_vinw.c diff --git a/lib/libsys/arch/i386/sys_voutb.c b/minix/lib/libsys/arch/i386/sys_voutb.c similarity index 100% rename from lib/libsys/arch/i386/sys_voutb.c rename to minix/lib/libsys/arch/i386/sys_voutb.c diff --git a/lib/libsys/arch/i386/sys_voutl.c b/minix/lib/libsys/arch/i386/sys_voutl.c similarity index 100% rename from lib/libsys/arch/i386/sys_voutl.c rename to minix/lib/libsys/arch/i386/sys_voutl.c diff --git a/lib/libsys/arch/i386/sys_voutw.c b/minix/lib/libsys/arch/i386/sys_voutw.c similarity index 100% rename from lib/libsys/arch/i386/sys_voutw.c rename to minix/lib/libsys/arch/i386/sys_voutw.c diff --git a/lib/libsys/arch/i386/timing.c b/minix/lib/libsys/arch/i386/timing.c similarity index 100% rename from lib/libsys/arch/i386/timing.c rename to minix/lib/libsys/arch/i386/timing.c diff --git a/lib/libsys/arch/i386/tsc_util.c b/minix/lib/libsys/arch/i386/tsc_util.c similarity index 100% rename from lib/libsys/arch/i386/tsc_util.c rename to minix/lib/libsys/arch/i386/tsc_util.c diff --git a/lib/libsys/arch/i386/vbox.c b/minix/lib/libsys/arch/i386/vbox.c similarity index 100% rename from lib/libsys/arch/i386/vbox.c rename to minix/lib/libsys/arch/i386/vbox.c diff --git a/lib/libsys/assert.c b/minix/lib/libsys/assert.c similarity index 100% rename from lib/libsys/assert.c rename to minix/lib/libsys/assert.c diff --git a/lib/libsys/asynsend.c b/minix/lib/libsys/asynsend.c similarity index 100% rename from lib/libsys/asynsend.c rename to minix/lib/libsys/asynsend.c diff --git a/lib/libsys/checkperms.c b/minix/lib/libsys/checkperms.c similarity index 100% rename from lib/libsys/checkperms.c rename to minix/lib/libsys/checkperms.c diff --git a/lib/libsys/copyfd.c b/minix/lib/libsys/copyfd.c similarity index 100% rename from lib/libsys/copyfd.c rename to minix/lib/libsys/copyfd.c diff --git a/lib/libsys/ds.c b/minix/lib/libsys/ds.c similarity index 100% rename from lib/libsys/ds.c rename to minix/lib/libsys/ds.c diff --git a/lib/libsys/env_get_prm.c b/minix/lib/libsys/env_get_prm.c similarity index 100% rename from lib/libsys/env_get_prm.c rename to minix/lib/libsys/env_get_prm.c diff --git a/lib/libsys/env_panic.c b/minix/lib/libsys/env_panic.c similarity index 100% rename from lib/libsys/env_panic.c rename to minix/lib/libsys/env_panic.c diff --git a/lib/libsys/env_parse.c b/minix/lib/libsys/env_parse.c similarity index 100% rename from lib/libsys/env_parse.c rename to minix/lib/libsys/env_parse.c diff --git a/lib/libsys/env_prefix.c b/minix/lib/libsys/env_prefix.c similarity index 100% rename from lib/libsys/env_prefix.c rename to minix/lib/libsys/env_prefix.c diff --git a/lib/libsys/fkey_ctl.c b/minix/lib/libsys/fkey_ctl.c similarity index 100% rename from lib/libsys/fkey_ctl.c rename to minix/lib/libsys/fkey_ctl.c diff --git a/lib/libsys/gcov.c b/minix/lib/libsys/gcov.c similarity index 100% rename from lib/libsys/gcov.c rename to minix/lib/libsys/gcov.c diff --git a/lib/libsys/getepinfo.c b/minix/lib/libsys/getepinfo.c similarity index 100% rename from lib/libsys/getepinfo.c rename to minix/lib/libsys/getepinfo.c diff --git a/lib/libsys/getprocnr.c b/minix/lib/libsys/getprocnr.c similarity index 100% rename from lib/libsys/getprocnr.c rename to minix/lib/libsys/getprocnr.c diff --git a/lib/libsys/getsysinfo.c b/minix/lib/libsys/getsysinfo.c similarity index 100% rename from lib/libsys/getsysinfo.c rename to minix/lib/libsys/getsysinfo.c diff --git a/lib/libsys/getticks.c b/minix/lib/libsys/getticks.c similarity index 100% rename from lib/libsys/getticks.c rename to minix/lib/libsys/getticks.c diff --git a/lib/libsys/getuptime.c b/minix/lib/libsys/getuptime.c similarity index 100% rename from lib/libsys/getuptime.c rename to minix/lib/libsys/getuptime.c diff --git a/lib/libsys/kernel_call.c b/minix/lib/libsys/kernel_call.c similarity index 100% rename from lib/libsys/kernel_call.c rename to minix/lib/libsys/kernel_call.c diff --git a/lib/libsys/kprintf.c b/minix/lib/libsys/kprintf.c similarity index 100% rename from lib/libsys/kprintf.c rename to minix/lib/libsys/kprintf.c diff --git a/lib/libsys/kputc.c b/minix/lib/libsys/kputc.c similarity index 100% rename from lib/libsys/kputc.c rename to minix/lib/libsys/kputc.c diff --git a/lib/libsys/kputs.c b/minix/lib/libsys/kputs.c similarity index 100% rename from lib/libsys/kputs.c rename to minix/lib/libsys/kputs.c diff --git a/lib/libsys/mapdriver.c b/minix/lib/libsys/mapdriver.c similarity index 100% rename from lib/libsys/mapdriver.c rename to minix/lib/libsys/mapdriver.c diff --git a/lib/libsys/optset.c b/minix/lib/libsys/optset.c similarity index 100% rename from lib/libsys/optset.c rename to minix/lib/libsys/optset.c diff --git a/lib/libsys/panic.c b/minix/lib/libsys/panic.c similarity index 100% rename from lib/libsys/panic.c rename to minix/lib/libsys/panic.c diff --git a/lib/libsys/pci.h b/minix/lib/libsys/pci.h similarity index 100% rename from lib/libsys/pci.h rename to minix/lib/libsys/pci.h diff --git a/lib/libsys/pci_attr_r16.c b/minix/lib/libsys/pci_attr_r16.c similarity index 100% rename from lib/libsys/pci_attr_r16.c rename to minix/lib/libsys/pci_attr_r16.c diff --git a/lib/libsys/pci_attr_r32.c b/minix/lib/libsys/pci_attr_r32.c similarity index 100% rename from lib/libsys/pci_attr_r32.c rename to minix/lib/libsys/pci_attr_r32.c diff --git a/lib/libsys/pci_attr_r8.c b/minix/lib/libsys/pci_attr_r8.c similarity index 100% rename from lib/libsys/pci_attr_r8.c rename to minix/lib/libsys/pci_attr_r8.c diff --git a/lib/libsys/pci_attr_w16.c b/minix/lib/libsys/pci_attr_w16.c similarity index 100% rename from lib/libsys/pci_attr_w16.c rename to minix/lib/libsys/pci_attr_w16.c diff --git a/lib/libsys/pci_attr_w32.c b/minix/lib/libsys/pci_attr_w32.c similarity index 100% rename from lib/libsys/pci_attr_w32.c rename to minix/lib/libsys/pci_attr_w32.c diff --git a/lib/libsys/pci_attr_w8.c b/minix/lib/libsys/pci_attr_w8.c similarity index 100% rename from lib/libsys/pci_attr_w8.c rename to minix/lib/libsys/pci_attr_w8.c diff --git a/lib/libsys/pci_del_acl.c b/minix/lib/libsys/pci_del_acl.c similarity index 100% rename from lib/libsys/pci_del_acl.c rename to minix/lib/libsys/pci_del_acl.c diff --git a/lib/libsys/pci_dev_name.c b/minix/lib/libsys/pci_dev_name.c similarity index 100% rename from lib/libsys/pci_dev_name.c rename to minix/lib/libsys/pci_dev_name.c diff --git a/lib/libsys/pci_find_dev.c b/minix/lib/libsys/pci_find_dev.c similarity index 100% rename from lib/libsys/pci_find_dev.c rename to minix/lib/libsys/pci_find_dev.c diff --git a/lib/libsys/pci_first_dev.c b/minix/lib/libsys/pci_first_dev.c similarity index 100% rename from lib/libsys/pci_first_dev.c rename to minix/lib/libsys/pci_first_dev.c diff --git a/lib/libsys/pci_get_bar.c b/minix/lib/libsys/pci_get_bar.c similarity index 100% rename from lib/libsys/pci_get_bar.c rename to minix/lib/libsys/pci_get_bar.c diff --git a/lib/libsys/pci_ids.c b/minix/lib/libsys/pci_ids.c similarity index 100% rename from lib/libsys/pci_ids.c rename to minix/lib/libsys/pci_ids.c diff --git a/lib/libsys/pci_init.c b/minix/lib/libsys/pci_init.c similarity index 100% rename from lib/libsys/pci_init.c rename to minix/lib/libsys/pci_init.c diff --git a/lib/libsys/pci_next_dev.c b/minix/lib/libsys/pci_next_dev.c similarity index 100% rename from lib/libsys/pci_next_dev.c rename to minix/lib/libsys/pci_next_dev.c diff --git a/lib/libsys/pci_rescan_bus.c b/minix/lib/libsys/pci_rescan_bus.c similarity index 100% rename from lib/libsys/pci_rescan_bus.c rename to minix/lib/libsys/pci_rescan_bus.c diff --git a/lib/libsys/pci_reserve.c b/minix/lib/libsys/pci_reserve.c similarity index 100% rename from lib/libsys/pci_reserve.c rename to minix/lib/libsys/pci_reserve.c diff --git a/lib/libsys/pci_set_acl.c b/minix/lib/libsys/pci_set_acl.c similarity index 100% rename from lib/libsys/pci_set_acl.c rename to minix/lib/libsys/pci_set_acl.c diff --git a/lib/libsys/pci_slot_name.c b/minix/lib/libsys/pci_slot_name.c similarity index 100% rename from lib/libsys/pci_slot_name.c rename to minix/lib/libsys/pci_slot_name.c diff --git a/lib/libsys/safecopies.c b/minix/lib/libsys/safecopies.c similarity index 100% rename from lib/libsys/safecopies.c rename to minix/lib/libsys/safecopies.c diff --git a/lib/libsys/sched_start.c b/minix/lib/libsys/sched_start.c similarity index 100% rename from lib/libsys/sched_start.c rename to minix/lib/libsys/sched_start.c diff --git a/lib/libsys/sched_stop.c b/minix/lib/libsys/sched_stop.c similarity index 100% rename from lib/libsys/sched_stop.c rename to minix/lib/libsys/sched_stop.c diff --git a/lib/libsys/sef.c b/minix/lib/libsys/sef.c similarity index 100% rename from lib/libsys/sef.c rename to minix/lib/libsys/sef.c diff --git a/lib/libsys/sef_fi.c b/minix/lib/libsys/sef_fi.c similarity index 100% rename from lib/libsys/sef_fi.c rename to minix/lib/libsys/sef_fi.c diff --git a/lib/libsys/sef_gcov.c b/minix/lib/libsys/sef_gcov.c similarity index 100% rename from lib/libsys/sef_gcov.c rename to minix/lib/libsys/sef_gcov.c diff --git a/lib/libsys/sef_init.c b/minix/lib/libsys/sef_init.c similarity index 100% rename from lib/libsys/sef_init.c rename to minix/lib/libsys/sef_init.c diff --git a/lib/libsys/sef_liveupdate.c b/minix/lib/libsys/sef_liveupdate.c similarity index 100% rename from lib/libsys/sef_liveupdate.c rename to minix/lib/libsys/sef_liveupdate.c diff --git a/lib/libsys/sef_ping.c b/minix/lib/libsys/sef_ping.c similarity index 100% rename from lib/libsys/sef_ping.c rename to minix/lib/libsys/sef_ping.c diff --git a/lib/libsys/sef_signal.c b/minix/lib/libsys/sef_signal.c similarity index 100% rename from lib/libsys/sef_signal.c rename to minix/lib/libsys/sef_signal.c diff --git a/lib/libsys/shlib_version b/minix/lib/libsys/shlib_version similarity index 100% rename from lib/libsys/shlib_version rename to minix/lib/libsys/shlib_version diff --git a/lib/libsys/sqrt_approx.c b/minix/lib/libsys/sqrt_approx.c similarity index 100% rename from lib/libsys/sqrt_approx.c rename to minix/lib/libsys/sqrt_approx.c diff --git a/lib/libsys/srv_fork.c b/minix/lib/libsys/srv_fork.c similarity index 100% rename from lib/libsys/srv_fork.c rename to minix/lib/libsys/srv_fork.c diff --git a/lib/libsys/srv_kill.c b/minix/lib/libsys/srv_kill.c similarity index 100% rename from lib/libsys/srv_kill.c rename to minix/lib/libsys/srv_kill.c diff --git a/lib/libsys/stacktrace.c b/minix/lib/libsys/stacktrace.c similarity index 100% rename from lib/libsys/stacktrace.c rename to minix/lib/libsys/stacktrace.c diff --git a/lib/libsys/sys_abort.c b/minix/lib/libsys/sys_abort.c similarity index 100% rename from lib/libsys/sys_abort.c rename to minix/lib/libsys/sys_abort.c diff --git a/lib/libsys/sys_clear.c b/minix/lib/libsys/sys_clear.c similarity index 100% rename from lib/libsys/sys_clear.c rename to minix/lib/libsys/sys_clear.c diff --git a/lib/libsys/sys_cprof.c b/minix/lib/libsys/sys_cprof.c similarity index 100% rename from lib/libsys/sys_cprof.c rename to minix/lib/libsys/sys_cprof.c diff --git a/lib/libsys/sys_diagctl.c b/minix/lib/libsys/sys_diagctl.c similarity index 100% rename from lib/libsys/sys_diagctl.c rename to minix/lib/libsys/sys_diagctl.c diff --git a/lib/libsys/sys_endsig.c b/minix/lib/libsys/sys_endsig.c similarity index 100% rename from lib/libsys/sys_endsig.c rename to minix/lib/libsys/sys_endsig.c diff --git a/lib/libsys/sys_exec.c b/minix/lib/libsys/sys_exec.c similarity index 100% rename from lib/libsys/sys_exec.c rename to minix/lib/libsys/sys_exec.c diff --git a/lib/libsys/sys_exit.c b/minix/lib/libsys/sys_exit.c similarity index 100% rename from lib/libsys/sys_exit.c rename to minix/lib/libsys/sys_exit.c diff --git a/lib/libsys/sys_fork.c b/minix/lib/libsys/sys_fork.c similarity index 100% rename from lib/libsys/sys_fork.c rename to minix/lib/libsys/sys_fork.c diff --git a/lib/libsys/sys_getinfo.c b/minix/lib/libsys/sys_getinfo.c similarity index 100% rename from lib/libsys/sys_getinfo.c rename to minix/lib/libsys/sys_getinfo.c diff --git a/lib/libsys/sys_getsig.c b/minix/lib/libsys/sys_getsig.c similarity index 100% rename from lib/libsys/sys_getsig.c rename to minix/lib/libsys/sys_getsig.c diff --git a/lib/libsys/sys_hz.c b/minix/lib/libsys/sys_hz.c similarity index 100% rename from lib/libsys/sys_hz.c rename to minix/lib/libsys/sys_hz.c diff --git a/lib/libsys/sys_irqctl.c b/minix/lib/libsys/sys_irqctl.c similarity index 100% rename from lib/libsys/sys_irqctl.c rename to minix/lib/libsys/sys_irqctl.c diff --git a/lib/libsys/sys_kill.c b/minix/lib/libsys/sys_kill.c similarity index 100% rename from lib/libsys/sys_kill.c rename to minix/lib/libsys/sys_kill.c diff --git a/lib/libsys/sys_mcontext.c b/minix/lib/libsys/sys_mcontext.c similarity index 100% rename from lib/libsys/sys_mcontext.c rename to minix/lib/libsys/sys_mcontext.c diff --git a/lib/libsys/sys_memset.c b/minix/lib/libsys/sys_memset.c similarity index 100% rename from lib/libsys/sys_memset.c rename to minix/lib/libsys/sys_memset.c diff --git a/lib/libsys/sys_padconf.c b/minix/lib/libsys/sys_padconf.c similarity index 100% rename from lib/libsys/sys_padconf.c rename to minix/lib/libsys/sys_padconf.c diff --git a/lib/libsys/sys_physcopy.c b/minix/lib/libsys/sys_physcopy.c similarity index 100% rename from lib/libsys/sys_physcopy.c rename to minix/lib/libsys/sys_physcopy.c diff --git a/lib/libsys/sys_privctl.c b/minix/lib/libsys/sys_privctl.c similarity index 100% rename from lib/libsys/sys_privctl.c rename to minix/lib/libsys/sys_privctl.c diff --git a/lib/libsys/sys_profbuf.c b/minix/lib/libsys/sys_profbuf.c similarity index 100% rename from lib/libsys/sys_profbuf.c rename to minix/lib/libsys/sys_profbuf.c diff --git a/lib/libsys/sys_runctl.c b/minix/lib/libsys/sys_runctl.c similarity index 100% rename from lib/libsys/sys_runctl.c rename to minix/lib/libsys/sys_runctl.c diff --git a/lib/libsys/sys_safecopy.c b/minix/lib/libsys/sys_safecopy.c similarity index 100% rename from lib/libsys/sys_safecopy.c rename to minix/lib/libsys/sys_safecopy.c diff --git a/lib/libsys/sys_safememset.c b/minix/lib/libsys/sys_safememset.c similarity index 100% rename from lib/libsys/sys_safememset.c rename to minix/lib/libsys/sys_safememset.c diff --git a/lib/libsys/sys_schedctl.c b/minix/lib/libsys/sys_schedctl.c similarity index 100% rename from lib/libsys/sys_schedctl.c rename to minix/lib/libsys/sys_schedctl.c diff --git a/lib/libsys/sys_schedule.c b/minix/lib/libsys/sys_schedule.c similarity index 100% rename from lib/libsys/sys_schedule.c rename to minix/lib/libsys/sys_schedule.c diff --git a/lib/libsys/sys_setalarm.c b/minix/lib/libsys/sys_setalarm.c similarity index 100% rename from lib/libsys/sys_setalarm.c rename to minix/lib/libsys/sys_setalarm.c diff --git a/lib/libsys/sys_setgrant.c b/minix/lib/libsys/sys_setgrant.c similarity index 100% rename from lib/libsys/sys_setgrant.c rename to minix/lib/libsys/sys_setgrant.c diff --git a/lib/libsys/sys_settime.c b/minix/lib/libsys/sys_settime.c similarity index 100% rename from lib/libsys/sys_settime.c rename to minix/lib/libsys/sys_settime.c diff --git a/lib/libsys/sys_sigreturn.c b/minix/lib/libsys/sys_sigreturn.c similarity index 100% rename from lib/libsys/sys_sigreturn.c rename to minix/lib/libsys/sys_sigreturn.c diff --git a/lib/libsys/sys_sigsend.c b/minix/lib/libsys/sys_sigsend.c similarity index 100% rename from lib/libsys/sys_sigsend.c rename to minix/lib/libsys/sys_sigsend.c diff --git a/lib/libsys/sys_sprof.c b/minix/lib/libsys/sys_sprof.c similarity index 100% rename from lib/libsys/sys_sprof.c rename to minix/lib/libsys/sys_sprof.c diff --git a/lib/libsys/sys_statectl.c b/minix/lib/libsys/sys_statectl.c similarity index 100% rename from lib/libsys/sys_statectl.c rename to minix/lib/libsys/sys_statectl.c diff --git a/lib/libsys/sys_stime.c b/minix/lib/libsys/sys_stime.c similarity index 100% rename from lib/libsys/sys_stime.c rename to minix/lib/libsys/sys_stime.c diff --git a/lib/libsys/sys_times.c b/minix/lib/libsys/sys_times.c similarity index 100% rename from lib/libsys/sys_times.c rename to minix/lib/libsys/sys_times.c diff --git a/lib/libsys/sys_trace.c b/minix/lib/libsys/sys_trace.c similarity index 100% rename from lib/libsys/sys_trace.c rename to minix/lib/libsys/sys_trace.c diff --git a/lib/libsys/sys_umap.c b/minix/lib/libsys/sys_umap.c similarity index 100% rename from lib/libsys/sys_umap.c rename to minix/lib/libsys/sys_umap.c diff --git a/lib/libsys/sys_update.c b/minix/lib/libsys/sys_update.c similarity index 100% rename from lib/libsys/sys_update.c rename to minix/lib/libsys/sys_update.c diff --git a/lib/libsys/sys_vircopy.c b/minix/lib/libsys/sys_vircopy.c similarity index 100% rename from lib/libsys/sys_vircopy.c rename to minix/lib/libsys/sys_vircopy.c diff --git a/lib/libsys/sys_vmctl.c b/minix/lib/libsys/sys_vmctl.c similarity index 100% rename from lib/libsys/sys_vmctl.c rename to minix/lib/libsys/sys_vmctl.c diff --git a/lib/libsys/sys_vsafecopy.c b/minix/lib/libsys/sys_vsafecopy.c similarity index 100% rename from lib/libsys/sys_vsafecopy.c rename to minix/lib/libsys/sys_vsafecopy.c diff --git a/lib/libsys/sys_vtimer.c b/minix/lib/libsys/sys_vtimer.c similarity index 100% rename from lib/libsys/sys_vtimer.c rename to minix/lib/libsys/sys_vtimer.c diff --git a/lib/libsys/sys_vumap.c b/minix/lib/libsys/sys_vumap.c similarity index 100% rename from lib/libsys/sys_vumap.c rename to minix/lib/libsys/sys_vumap.c diff --git a/lib/libsys/syslib.h b/minix/lib/libsys/syslib.h similarity index 100% rename from lib/libsys/syslib.h rename to minix/lib/libsys/syslib.h diff --git a/lib/libsys/sysutil.h b/minix/lib/libsys/sysutil.h similarity index 100% rename from lib/libsys/sysutil.h rename to minix/lib/libsys/sysutil.h diff --git a/lib/libsys/taskcall.c b/minix/lib/libsys/taskcall.c similarity index 100% rename from lib/libsys/taskcall.c rename to minix/lib/libsys/taskcall.c diff --git a/lib/libsys/tickdelay.c b/minix/lib/libsys/tickdelay.c similarity index 100% rename from lib/libsys/tickdelay.c rename to minix/lib/libsys/tickdelay.c diff --git a/lib/libsys/timers.c b/minix/lib/libsys/timers.c similarity index 100% rename from lib/libsys/timers.c rename to minix/lib/libsys/timers.c diff --git a/lib/libsys/vm_cache.c b/minix/lib/libsys/vm_cache.c similarity index 100% rename from lib/libsys/vm_cache.c rename to minix/lib/libsys/vm_cache.c diff --git a/lib/libsys/vm_exit.c b/minix/lib/libsys/vm_exit.c similarity index 100% rename from lib/libsys/vm_exit.c rename to minix/lib/libsys/vm_exit.c diff --git a/lib/libsys/vm_fork.c b/minix/lib/libsys/vm_fork.c similarity index 100% rename from lib/libsys/vm_fork.c rename to minix/lib/libsys/vm_fork.c diff --git a/lib/libsys/vm_info.c b/minix/lib/libsys/vm_info.c similarity index 100% rename from lib/libsys/vm_info.c rename to minix/lib/libsys/vm_info.c diff --git a/lib/libsys/vm_map_phys.c b/minix/lib/libsys/vm_map_phys.c similarity index 100% rename from lib/libsys/vm_map_phys.c rename to minix/lib/libsys/vm_map_phys.c diff --git a/lib/libsys/vm_memctl.c b/minix/lib/libsys/vm_memctl.c similarity index 100% rename from lib/libsys/vm_memctl.c rename to minix/lib/libsys/vm_memctl.c diff --git a/lib/libsys/vm_notify_sig.c b/minix/lib/libsys/vm_notify_sig.c similarity index 100% rename from lib/libsys/vm_notify_sig.c rename to minix/lib/libsys/vm_notify_sig.c diff --git a/lib/libsys/vm_procctl.c b/minix/lib/libsys/vm_procctl.c similarity index 100% rename from lib/libsys/vm_procctl.c rename to minix/lib/libsys/vm_procctl.c diff --git a/lib/libsys/vm_query_exit.c b/minix/lib/libsys/vm_query_exit.c similarity index 100% rename from lib/libsys/vm_query_exit.c rename to minix/lib/libsys/vm_query_exit.c diff --git a/lib/libsys/vm_set_priv.c b/minix/lib/libsys/vm_set_priv.c similarity index 100% rename from lib/libsys/vm_set_priv.c rename to minix/lib/libsys/vm_set_priv.c diff --git a/lib/libsys/vm_update.c b/minix/lib/libsys/vm_update.c similarity index 100% rename from lib/libsys/vm_update.c rename to minix/lib/libsys/vm_update.c diff --git a/lib/libtimers/Makefile b/minix/lib/libtimers/Makefile similarity index 100% rename from lib/libtimers/Makefile rename to minix/lib/libtimers/Makefile diff --git a/lib/libtimers/timers.h b/minix/lib/libtimers/timers.h similarity index 100% rename from lib/libtimers/timers.h rename to minix/lib/libtimers/timers.h diff --git a/lib/libtimers/tmrs_clr.c b/minix/lib/libtimers/tmrs_clr.c similarity index 100% rename from lib/libtimers/tmrs_clr.c rename to minix/lib/libtimers/tmrs_clr.c diff --git a/lib/libtimers/tmrs_exp.c b/minix/lib/libtimers/tmrs_exp.c similarity index 100% rename from lib/libtimers/tmrs_exp.c rename to minix/lib/libtimers/tmrs_exp.c diff --git a/lib/libtimers/tmrs_set.c b/minix/lib/libtimers/tmrs_set.c similarity index 100% rename from lib/libtimers/tmrs_set.c rename to minix/lib/libtimers/tmrs_set.c diff --git a/lib/libusb/Makefile b/minix/lib/libusb/Makefile similarity index 100% rename from lib/libusb/Makefile rename to minix/lib/libusb/Makefile diff --git a/lib/libusb/usb.c b/minix/lib/libusb/usb.c similarity index 100% rename from lib/libusb/usb.c rename to minix/lib/libusb/usb.c diff --git a/lib/libvassert/Makefile b/minix/lib/libvassert/Makefile similarity index 100% rename from lib/libvassert/Makefile rename to minix/lib/libvassert/Makefile diff --git a/lib/libvassert/backdoor.S b/minix/lib/libvassert/backdoor.S similarity index 100% rename from lib/libvassert/backdoor.S rename to minix/lib/libvassert/backdoor.S diff --git a/lib/libvassert/vassert.c b/minix/lib/libvassert/vassert.c similarity index 100% rename from lib/libvassert/vassert.c rename to minix/lib/libvassert/vassert.c diff --git a/lib/libvassert/vassert.h b/minix/lib/libvassert/vassert.h similarity index 100% rename from lib/libvassert/vassert.h rename to minix/lib/libvassert/vassert.h diff --git a/lib/libvboxfs/Makefile b/minix/lib/libvboxfs/Makefile similarity index 100% rename from lib/libvboxfs/Makefile rename to minix/lib/libvboxfs/Makefile diff --git a/lib/libvboxfs/attr.c b/minix/lib/libvboxfs/attr.c similarity index 100% rename from lib/libvboxfs/attr.c rename to minix/lib/libvboxfs/attr.c diff --git a/lib/libvboxfs/dir.c b/minix/lib/libvboxfs/dir.c similarity index 100% rename from lib/libvboxfs/dir.c rename to minix/lib/libvboxfs/dir.c diff --git a/lib/libvboxfs/file.c b/minix/lib/libvboxfs/file.c similarity index 100% rename from lib/libvboxfs/file.c rename to minix/lib/libvboxfs/file.c diff --git a/lib/libvboxfs/glo.h b/minix/lib/libvboxfs/glo.h similarity index 100% rename from lib/libvboxfs/glo.h rename to minix/lib/libvboxfs/glo.h diff --git a/lib/libvboxfs/handle.c b/minix/lib/libvboxfs/handle.c similarity index 100% rename from lib/libvboxfs/handle.c rename to minix/lib/libvboxfs/handle.c diff --git a/lib/libvboxfs/inc.h b/minix/lib/libvboxfs/inc.h similarity index 100% rename from lib/libvboxfs/inc.h rename to minix/lib/libvboxfs/inc.h diff --git a/lib/libvboxfs/info.c b/minix/lib/libvboxfs/info.c similarity index 100% rename from lib/libvboxfs/info.c rename to minix/lib/libvboxfs/info.c diff --git a/lib/libvboxfs/link.c b/minix/lib/libvboxfs/link.c similarity index 100% rename from lib/libvboxfs/link.c rename to minix/lib/libvboxfs/link.c diff --git a/lib/libvboxfs/path.c b/minix/lib/libvboxfs/path.c similarity index 100% rename from lib/libvboxfs/path.c rename to minix/lib/libvboxfs/path.c diff --git a/lib/libvboxfs/proto.h b/minix/lib/libvboxfs/proto.h similarity index 100% rename from lib/libvboxfs/proto.h rename to minix/lib/libvboxfs/proto.h diff --git a/lib/libvboxfs/vboxfs.c b/minix/lib/libvboxfs/vboxfs.c similarity index 100% rename from lib/libvboxfs/vboxfs.c rename to minix/lib/libvboxfs/vboxfs.c diff --git a/lib/libvboxfs/vboxfs.h b/minix/lib/libvboxfs/vboxfs.h similarity index 100% rename from lib/libvboxfs/vboxfs.h rename to minix/lib/libvboxfs/vboxfs.h diff --git a/lib/libvirtio/Makefile b/minix/lib/libvirtio/Makefile similarity index 100% rename from lib/libvirtio/Makefile rename to minix/lib/libvirtio/Makefile diff --git a/lib/libvirtio/virtio.c b/minix/lib/libvirtio/virtio.c similarity index 100% rename from lib/libvirtio/virtio.c rename to minix/lib/libvirtio/virtio.c diff --git a/lib/libvirtio/virtio_ring.h b/minix/lib/libvirtio/virtio_ring.h similarity index 100% rename from lib/libvirtio/virtio_ring.h rename to minix/lib/libvirtio/virtio_ring.h diff --git a/lib/libvtreefs/Makefile b/minix/lib/libvtreefs/Makefile similarity index 100% rename from lib/libvtreefs/Makefile rename to minix/lib/libvtreefs/Makefile diff --git a/lib/libvtreefs/glo.h b/minix/lib/libvtreefs/glo.h similarity index 100% rename from lib/libvtreefs/glo.h rename to minix/lib/libvtreefs/glo.h diff --git a/lib/libvtreefs/inc.h b/minix/lib/libvtreefs/inc.h similarity index 100% rename from lib/libvtreefs/inc.h rename to minix/lib/libvtreefs/inc.h diff --git a/lib/libvtreefs/inode.c b/minix/lib/libvtreefs/inode.c similarity index 100% rename from lib/libvtreefs/inode.c rename to minix/lib/libvtreefs/inode.c diff --git a/lib/libvtreefs/inode.h b/minix/lib/libvtreefs/inode.h similarity index 100% rename from lib/libvtreefs/inode.h rename to minix/lib/libvtreefs/inode.h diff --git a/lib/libvtreefs/link.c b/minix/lib/libvtreefs/link.c similarity index 100% rename from lib/libvtreefs/link.c rename to minix/lib/libvtreefs/link.c diff --git a/lib/libvtreefs/mount.c b/minix/lib/libvtreefs/mount.c similarity index 100% rename from lib/libvtreefs/mount.c rename to minix/lib/libvtreefs/mount.c diff --git a/lib/libvtreefs/path.c b/minix/lib/libvtreefs/path.c similarity index 100% rename from lib/libvtreefs/path.c rename to minix/lib/libvtreefs/path.c diff --git a/lib/libvtreefs/proto.h b/minix/lib/libvtreefs/proto.h similarity index 100% rename from lib/libvtreefs/proto.h rename to minix/lib/libvtreefs/proto.h diff --git a/lib/libvtreefs/read.c b/minix/lib/libvtreefs/read.c similarity index 100% rename from lib/libvtreefs/read.c rename to minix/lib/libvtreefs/read.c diff --git a/lib/libvtreefs/sdbm.c b/minix/lib/libvtreefs/sdbm.c similarity index 100% rename from lib/libvtreefs/sdbm.c rename to minix/lib/libvtreefs/sdbm.c diff --git a/lib/libvtreefs/stadir.c b/minix/lib/libvtreefs/stadir.c similarity index 100% rename from lib/libvtreefs/stadir.c rename to minix/lib/libvtreefs/stadir.c diff --git a/lib/libvtreefs/table.c b/minix/lib/libvtreefs/table.c similarity index 100% rename from lib/libvtreefs/table.c rename to minix/lib/libvtreefs/table.c diff --git a/lib/libvtreefs/utility.c b/minix/lib/libvtreefs/utility.c similarity index 100% rename from lib/libvtreefs/utility.c rename to minix/lib/libvtreefs/utility.c diff --git a/lib/libvtreefs/vtreefs.c b/minix/lib/libvtreefs/vtreefs.c similarity index 100% rename from lib/libvtreefs/vtreefs.c rename to minix/lib/libvtreefs/vtreefs.c diff --git a/minix/llvm/Makefile b/minix/llvm/Makefile index d1ef87892..2b9dd769c 100644 --- a/minix/llvm/Makefile +++ b/minix/llvm/Makefile @@ -1,2 +1 @@ - .include diff --git a/minix/llvm/Makefile.inc b/minix/llvm/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/llvm/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/minix/llvm/passes/Makefile.inc b/minix/llvm/passes/Makefile.inc index 3c153a6ba..ecc584efb 100644 --- a/minix/llvm/passes/Makefile.inc +++ b/minix/llvm/passes/Makefile.inc @@ -1 +1,3 @@ LLVMPREFIX?=../../../../../obj_llvm.i386/Release+Asserts + +.include "../Makefile.inc" diff --git a/man/Makefile b/minix/man/Makefile similarity index 84% rename from man/Makefile rename to minix/man/Makefile index 40e96eeec..ff1726c89 100644 --- a/man/Makefile +++ b/minix/man/Makefile @@ -1,6 +1,6 @@ .include -SUBDIR= man1 man1x man2 man4 man5 man6 man7 man8 man9 +SUBDIR= man1 man1x man2 man4 man5 man7 man8 man9 WHATISDBDIR?= /usr/man diff --git a/minix/man/Makefile.inc b/minix/man/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/man/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/man/man1/Makefile b/minix/man/man1/Makefile similarity index 98% rename from man/man1/Makefile rename to minix/man/man1/Makefile index b39017f58..9c6f46237 100644 --- a/man/man1/Makefile +++ b/minix/man/man1/Makefile @@ -53,4 +53,3 @@ MLINKS += svc.1 ci.1 MLINKS += svc.1 co.1 .include -.include diff --git a/man/man1/ash.1 b/minix/man/man1/ash.1 similarity index 100% rename from man/man1/ash.1 rename to minix/man/man1/ash.1 diff --git a/man/man1/at.1 b/minix/man/man1/at.1 similarity index 100% rename from man/man1/at.1 rename to minix/man/man1/at.1 diff --git a/man/man1/bsfilt.1 b/minix/man/man1/bsfilt.1 similarity index 100% rename from man/man1/bsfilt.1 rename to minix/man/man1/bsfilt.1 diff --git a/man/man1/cawf.1 b/minix/man/man1/cawf.1 similarity index 100% rename from man/man1/cawf.1 rename to minix/man/man1/cawf.1 diff --git a/man/man1/cdiff.1 b/minix/man/man1/cdiff.1 similarity index 100% rename from man/man1/cdiff.1 rename to minix/man/man1/cdiff.1 diff --git a/man/man1/chgrp.1 b/minix/man/man1/chgrp.1 similarity index 100% rename from man/man1/chgrp.1 rename to minix/man/man1/chgrp.1 diff --git a/man/man1/cmp.1 b/minix/man/man1/cmp.1 similarity index 100% rename from man/man1/cmp.1 rename to minix/man/man1/cmp.1 diff --git a/man/man1/compress.1 b/minix/man/man1/compress.1 similarity index 100% rename from man/man1/compress.1 rename to minix/man/man1/compress.1 diff --git a/man/man1/crc.1 b/minix/man/man1/crc.1 similarity index 100% rename from man/man1/crc.1 rename to minix/man/man1/crc.1 diff --git a/man/man1/crontab.1 b/minix/man/man1/crontab.1 similarity index 100% rename from man/man1/crontab.1 rename to minix/man/man1/crontab.1 diff --git a/man/man1/dd.1 b/minix/man/man1/dd.1 similarity index 100% rename from man/man1/dd.1 rename to minix/man/man1/dd.1 diff --git a/man/man1/dhrystone.1 b/minix/man/man1/dhrystone.1 similarity index 100% rename from man/man1/dhrystone.1 rename to minix/man/man1/dhrystone.1 diff --git a/man/man1/dosdir.1 b/minix/man/man1/dosdir.1 similarity index 100% rename from man/man1/dosdir.1 rename to minix/man/man1/dosdir.1 diff --git a/man/man1/dosread.1 b/minix/man/man1/dosread.1 similarity index 100% rename from man/man1/dosread.1 rename to minix/man/man1/dosread.1 diff --git a/man/man1/doswrite.1 b/minix/man/man1/doswrite.1 similarity index 100% rename from man/man1/doswrite.1 rename to minix/man/man1/doswrite.1 diff --git a/man/man1/eject.1 b/minix/man/man1/eject.1 similarity index 100% rename from man/man1/eject.1 rename to minix/man/man1/eject.1 diff --git a/man/man1/flexdoc.1 b/minix/man/man1/flexdoc.1 similarity index 100% rename from man/man1/flexdoc.1 rename to minix/man/man1/flexdoc.1 diff --git a/man/man1/format.1 b/minix/man/man1/format.1 similarity index 100% rename from man/man1/format.1 rename to minix/man/man1/format.1 diff --git a/man/man1/fsck.mfs.1 b/minix/man/man1/fsck.mfs.1 similarity index 100% rename from man/man1/fsck.mfs.1 rename to minix/man/man1/fsck.mfs.1 diff --git a/man/man1/host.1 b/minix/man/man1/host.1 similarity index 100% rename from man/man1/host.1 rename to minix/man/man1/host.1 diff --git a/man/man1/hostaddr.1 b/minix/man/man1/hostaddr.1 similarity index 100% rename from man/man1/hostaddr.1 rename to minix/man/man1/hostaddr.1 diff --git a/man/man1/ifdef.1 b/minix/man/man1/ifdef.1 similarity index 100% rename from man/man1/ifdef.1 rename to minix/man/man1/ifdef.1 diff --git a/man/man1/isodir.1 b/minix/man/man1/isodir.1 similarity index 100% rename from man/man1/isodir.1 rename to minix/man/man1/isodir.1 diff --git a/man/man1/isoinfo.1 b/minix/man/man1/isoinfo.1 similarity index 100% rename from man/man1/isoinfo.1 rename to minix/man/man1/isoinfo.1 diff --git a/man/man1/isoread.1 b/minix/man/man1/isoread.1 similarity index 100% rename from man/man1/isoread.1 rename to minix/man/man1/isoread.1 diff --git a/man/man1/linkfarm.1 b/minix/man/man1/linkfarm.1 similarity index 100% rename from man/man1/linkfarm.1 rename to minix/man/man1/linkfarm.1 diff --git a/man/man1/loadfont.1 b/minix/man/man1/loadfont.1 similarity index 100% rename from man/man1/loadfont.1 rename to minix/man/man1/loadfont.1 diff --git a/man/man1/loadkeys.1 b/minix/man/man1/loadkeys.1 similarity index 100% rename from man/man1/loadkeys.1 rename to minix/man/man1/loadkeys.1 diff --git a/man/man1/logger.1 b/minix/man/man1/logger.1 similarity index 100% rename from man/man1/logger.1 rename to minix/man/man1/logger.1 diff --git a/man/man1/look.1 b/minix/man/man1/look.1 similarity index 100% rename from man/man1/look.1 rename to minix/man/man1/look.1 diff --git a/man/man1/lp.1 b/minix/man/man1/lp.1 similarity index 100% rename from man/man1/lp.1 rename to minix/man/man1/lp.1 diff --git a/man/man1/lspci.1 b/minix/man/man1/lspci.1 similarity index 100% rename from man/man1/lspci.1 rename to minix/man/man1/lspci.1 diff --git a/man/man1/mail.1 b/minix/man/man1/mail.1 similarity index 100% rename from man/man1/mail.1 rename to minix/man/man1/mail.1 diff --git a/man/man1/mixer.1 b/minix/man/man1/mixer.1 similarity index 100% rename from man/man1/mixer.1 rename to minix/man/man1/mixer.1 diff --git a/man/man1/mkproto.1 b/minix/man/man1/mkproto.1 similarity index 100% rename from man/man1/mkproto.1 rename to minix/man/man1/mkproto.1 diff --git a/man/man1/mount.1 b/minix/man/man1/mount.1 similarity index 100% rename from man/man1/mount.1 rename to minix/man/man1/mount.1 diff --git a/man/man1/mt.1 b/minix/man/man1/mt.1 similarity index 100% rename from man/man1/mt.1 rename to minix/man/man1/mt.1 diff --git a/man/man1/ping.1 b/minix/man/man1/ping.1 similarity index 100% rename from man/man1/ping.1 rename to minix/man/man1/ping.1 diff --git a/man/man1/pkg_view.1 b/minix/man/man1/pkg_view.1 similarity index 100% rename from man/man1/pkg_view.1 rename to minix/man/man1/pkg_view.1 diff --git a/man/man1/playwave.1 b/minix/man/man1/playwave.1 similarity index 100% rename from man/man1/playwave.1 rename to minix/man/man1/playwave.1 diff --git a/man/man1/prep.1 b/minix/man/man1/prep.1 similarity index 100% rename from man/man1/prep.1 rename to minix/man/man1/prep.1 diff --git a/man/man1/profile.1 b/minix/man/man1/profile.1 similarity index 100% rename from man/man1/profile.1 rename to minix/man/man1/profile.1 diff --git a/man/man1/ps.1 b/minix/man/man1/ps.1 similarity index 100% rename from man/man1/ps.1 rename to minix/man/man1/ps.1 diff --git a/man/man1/rcp.1 b/minix/man/man1/rcp.1 similarity index 100% rename from man/man1/rcp.1 rename to minix/man/man1/rcp.1 diff --git a/man/man1/recwave.1 b/minix/man/man1/recwave.1 similarity index 100% rename from man/man1/recwave.1 rename to minix/man/man1/recwave.1 diff --git a/man/man1/remsync.1 b/minix/man/man1/remsync.1 similarity index 100% rename from man/man1/remsync.1 rename to minix/man/man1/remsync.1 diff --git a/man/man1/rget.1 b/minix/man/man1/rget.1 similarity index 100% rename from man/man1/rget.1 rename to minix/man/man1/rget.1 diff --git a/man/man1/rlogin.1 b/minix/man/man1/rlogin.1 similarity index 100% rename from man/man1/rlogin.1 rename to minix/man/man1/rlogin.1 diff --git a/man/man1/rsh.1 b/minix/man/man1/rsh.1 similarity index 100% rename from man/man1/rsh.1 rename to minix/man/man1/rsh.1 diff --git a/man/man1/rz.1 b/minix/man/man1/rz.1 similarity index 100% rename from man/man1/rz.1 rename to minix/man/man1/rz.1 diff --git a/man/man1/spell.1 b/minix/man/man1/spell.1 similarity index 100% rename from man/man1/spell.1 rename to minix/man/man1/spell.1 diff --git a/man/man1/svc.1 b/minix/man/man1/svc.1 similarity index 100% rename from man/man1/svc.1 rename to minix/man/man1/svc.1 diff --git a/man/man1/svrctl.1 b/minix/man/man1/svrctl.1 similarity index 100% rename from man/man1/svrctl.1 rename to minix/man/man1/svrctl.1 diff --git a/man/man1/synctree.1 b/minix/man/man1/synctree.1 similarity index 100% rename from man/man1/synctree.1 rename to minix/man/man1/synctree.1 diff --git a/man/man1/sysenv.1 b/minix/man/man1/sysenv.1 similarity index 100% rename from man/man1/sysenv.1 rename to minix/man/man1/sysenv.1 diff --git a/man/man1/sz.1 b/minix/man/man1/sz.1 similarity index 100% rename from man/man1/sz.1 rename to minix/man/man1/sz.1 diff --git a/man/man1/telnet.1 b/minix/man/man1/telnet.1 similarity index 100% rename from man/man1/telnet.1 rename to minix/man/man1/telnet.1 diff --git a/man/man1/template.1 b/minix/man/man1/template.1 similarity index 100% rename from man/man1/template.1 rename to minix/man/man1/template.1 diff --git a/man/man1/term.1 b/minix/man/man1/term.1 similarity index 100% rename from man/man1/term.1 rename to minix/man/man1/term.1 diff --git a/man/man1/termcap.1 b/minix/man/man1/termcap.1 similarity index 100% rename from man/man1/termcap.1 rename to minix/man/man1/termcap.1 diff --git a/man/man1/tget.1 b/minix/man/man1/tget.1 similarity index 100% rename from man/man1/tget.1 rename to minix/man/man1/tget.1 diff --git a/man/man1/time.1 b/minix/man/man1/time.1 similarity index 100% rename from man/man1/time.1 rename to minix/man/man1/time.1 diff --git a/man/man1/truncate.1 b/minix/man/man1/truncate.1 similarity index 100% rename from man/man1/truncate.1 rename to minix/man/man1/truncate.1 diff --git a/man/man1/umount.1 b/minix/man/man1/umount.1 similarity index 100% rename from man/man1/umount.1 rename to minix/man/man1/umount.1 diff --git a/man/man1/uud.1 b/minix/man/man1/uud.1 similarity index 100% rename from man/man1/uud.1 rename to minix/man/man1/uud.1 diff --git a/man/man1/uue.1 b/minix/man/man1/uue.1 similarity index 100% rename from man/man1/uue.1 rename to minix/man/man1/uue.1 diff --git a/man/man1/vol.1 b/minix/man/man1/vol.1 similarity index 100% rename from man/man1/vol.1 rename to minix/man/man1/vol.1 diff --git a/man/man1/yap.1 b/minix/man/man1/yap.1 similarity index 100% rename from man/man1/yap.1 rename to minix/man/man1/yap.1 diff --git a/man/man1x/Makefile b/minix/man/man1x/Makefile similarity index 72% rename from man/man1x/Makefile rename to minix/man/man1x/Makefile index d251e1905..4ee74995e 100644 --- a/man/man1x/Makefile +++ b/minix/man/man1x/Makefile @@ -2,4 +2,3 @@ MAN= awk.1x kermit.1x \ macros.1x mined.1x .include -.include diff --git a/man/man1x/awk.1x b/minix/man/man1x/awk.1x similarity index 100% rename from man/man1x/awk.1x rename to minix/man/man1x/awk.1x diff --git a/man/man1x/kermit.1x b/minix/man/man1x/kermit.1x similarity index 100% rename from man/man1x/kermit.1x rename to minix/man/man1x/kermit.1x diff --git a/man/man1x/macros.1x b/minix/man/man1x/macros.1x similarity index 100% rename from man/man1x/macros.1x rename to minix/man/man1x/macros.1x diff --git a/man/man1x/mined.1x b/minix/man/man1x/mined.1x similarity index 100% rename from man/man1x/mined.1x rename to minix/man/man1x/mined.1x diff --git a/man/man2/Makefile b/minix/man/man2/Makefile similarity index 97% rename from man/man2/Makefile rename to minix/man/man2/Makefile index 11ad7cf4a..12dd8d088 100644 --- a/man/man2/Makefile +++ b/minix/man/man2/Makefile @@ -18,4 +18,3 @@ MLINKS += setuid.2 seteuid.2 MLINKS += setuid.2 setgid.2 .include -.include diff --git a/man/man2/accept.2 b/minix/man/man2/accept.2 similarity index 100% rename from man/man2/accept.2 rename to minix/man/man2/accept.2 diff --git a/man/man2/access.2 b/minix/man/man2/access.2 similarity index 100% rename from man/man2/access.2 rename to minix/man/man2/access.2 diff --git a/man/man2/bind.2 b/minix/man/man2/bind.2 similarity index 100% rename from man/man2/bind.2 rename to minix/man/man2/bind.2 diff --git a/man/man2/brk.2 b/minix/man/man2/brk.2 similarity index 100% rename from man/man2/brk.2 rename to minix/man/man2/brk.2 diff --git a/man/man2/chdir.2 b/minix/man/man2/chdir.2 similarity index 100% rename from man/man2/chdir.2 rename to minix/man/man2/chdir.2 diff --git a/man/man2/chmod.2 b/minix/man/man2/chmod.2 similarity index 100% rename from man/man2/chmod.2 rename to minix/man/man2/chmod.2 diff --git a/man/man2/chown.2 b/minix/man/man2/chown.2 similarity index 100% rename from man/man2/chown.2 rename to minix/man/man2/chown.2 diff --git a/man/man2/chroot.2 b/minix/man/man2/chroot.2 similarity index 100% rename from man/man2/chroot.2 rename to minix/man/man2/chroot.2 diff --git a/man/man2/close.2 b/minix/man/man2/close.2 similarity index 100% rename from man/man2/close.2 rename to minix/man/man2/close.2 diff --git a/man/man2/connect.2 b/minix/man/man2/connect.2 similarity index 100% rename from man/man2/connect.2 rename to minix/man/man2/connect.2 diff --git a/man/man2/creat.2 b/minix/man/man2/creat.2 similarity index 100% rename from man/man2/creat.2 rename to minix/man/man2/creat.2 diff --git a/man/man2/dup.2 b/minix/man/man2/dup.2 similarity index 100% rename from man/man2/dup.2 rename to minix/man/man2/dup.2 diff --git a/man/man2/execve.2 b/minix/man/man2/execve.2 similarity index 100% rename from man/man2/execve.2 rename to minix/man/man2/execve.2 diff --git a/man/man2/exit.2 b/minix/man/man2/exit.2 similarity index 100% rename from man/man2/exit.2 rename to minix/man/man2/exit.2 diff --git a/man/man2/fcntl.2 b/minix/man/man2/fcntl.2 similarity index 100% rename from man/man2/fcntl.2 rename to minix/man/man2/fcntl.2 diff --git a/man/man2/fork.2 b/minix/man/man2/fork.2 similarity index 100% rename from man/man2/fork.2 rename to minix/man/man2/fork.2 diff --git a/man/man2/getgid.2 b/minix/man/man2/getgid.2 similarity index 100% rename from man/man2/getgid.2 rename to minix/man/man2/getgid.2 diff --git a/man/man2/getitimer.2 b/minix/man/man2/getitimer.2 similarity index 100% rename from man/man2/getitimer.2 rename to minix/man/man2/getitimer.2 diff --git a/man/man2/getnucred.2 b/minix/man/man2/getnucred.2 similarity index 100% rename from man/man2/getnucred.2 rename to minix/man/man2/getnucred.2 diff --git a/man/man2/getpeereid.2 b/minix/man/man2/getpeereid.2 similarity index 100% rename from man/man2/getpeereid.2 rename to minix/man/man2/getpeereid.2 diff --git a/man/man2/getpeername.2 b/minix/man/man2/getpeername.2 similarity index 100% rename from man/man2/getpeername.2 rename to minix/man/man2/getpeername.2 diff --git a/man/man2/getpid.2 b/minix/man/man2/getpid.2 similarity index 100% rename from man/man2/getpid.2 rename to minix/man/man2/getpid.2 diff --git a/man/man2/getpriority.2 b/minix/man/man2/getpriority.2 similarity index 100% rename from man/man2/getpriority.2 rename to minix/man/man2/getpriority.2 diff --git a/man/man2/getsockname.2 b/minix/man/man2/getsockname.2 similarity index 100% rename from man/man2/getsockname.2 rename to minix/man/man2/getsockname.2 diff --git a/man/man2/getsockopt.2 b/minix/man/man2/getsockopt.2 similarity index 100% rename from man/man2/getsockopt.2 rename to minix/man/man2/getsockopt.2 diff --git a/man/man2/gettimeofday.2 b/minix/man/man2/gettimeofday.2 similarity index 100% rename from man/man2/gettimeofday.2 rename to minix/man/man2/gettimeofday.2 diff --git a/man/man2/getuid.2 b/minix/man/man2/getuid.2 similarity index 100% rename from man/man2/getuid.2 rename to minix/man/man2/getuid.2 diff --git a/man/man2/intro.2 b/minix/man/man2/intro.2 similarity index 100% rename from man/man2/intro.2 rename to minix/man/man2/intro.2 diff --git a/man/man2/ioctl.2 b/minix/man/man2/ioctl.2 similarity index 100% rename from man/man2/ioctl.2 rename to minix/man/man2/ioctl.2 diff --git a/man/man2/kill.2 b/minix/man/man2/kill.2 similarity index 100% rename from man/man2/kill.2 rename to minix/man/man2/kill.2 diff --git a/man/man2/link.2 b/minix/man/man2/link.2 similarity index 100% rename from man/man2/link.2 rename to minix/man/man2/link.2 diff --git a/man/man2/listen.2 b/minix/man/man2/listen.2 similarity index 100% rename from man/man2/listen.2 rename to minix/man/man2/listen.2 diff --git a/man/man2/lseek.2 b/minix/man/man2/lseek.2 similarity index 100% rename from man/man2/lseek.2 rename to minix/man/man2/lseek.2 diff --git a/man/man2/mkdir.2 b/minix/man/man2/mkdir.2 similarity index 100% rename from man/man2/mkdir.2 rename to minix/man/man2/mkdir.2 diff --git a/man/man2/mknod.2 b/minix/man/man2/mknod.2 similarity index 100% rename from man/man2/mknod.2 rename to minix/man/man2/mknod.2 diff --git a/man/man2/mount.2 b/minix/man/man2/mount.2 similarity index 100% rename from man/man2/mount.2 rename to minix/man/man2/mount.2 diff --git a/man/man2/open.2 b/minix/man/man2/open.2 similarity index 100% rename from man/man2/open.2 rename to minix/man/man2/open.2 diff --git a/man/man2/ptrace.2 b/minix/man/man2/ptrace.2 similarity index 100% rename from man/man2/ptrace.2 rename to minix/man/man2/ptrace.2 diff --git a/man/man2/read.2 b/minix/man/man2/read.2 similarity index 100% rename from man/man2/read.2 rename to minix/man/man2/read.2 diff --git a/man/man2/readlink.2 b/minix/man/man2/readlink.2 similarity index 100% rename from man/man2/readlink.2 rename to minix/man/man2/readlink.2 diff --git a/man/man2/recv.2 b/minix/man/man2/recv.2 similarity index 100% rename from man/man2/recv.2 rename to minix/man/man2/recv.2 diff --git a/man/man2/recvfrom.2 b/minix/man/man2/recvfrom.2 similarity index 100% rename from man/man2/recvfrom.2 rename to minix/man/man2/recvfrom.2 diff --git a/man/man2/recvmsg.2 b/minix/man/man2/recvmsg.2 similarity index 100% rename from man/man2/recvmsg.2 rename to minix/man/man2/recvmsg.2 diff --git a/man/man2/rename.2 b/minix/man/man2/rename.2 similarity index 100% rename from man/man2/rename.2 rename to minix/man/man2/rename.2 diff --git a/man/man2/rmdir.2 b/minix/man/man2/rmdir.2 similarity index 100% rename from man/man2/rmdir.2 rename to minix/man/man2/rmdir.2 diff --git a/man/man2/select.2 b/minix/man/man2/select.2 similarity index 100% rename from man/man2/select.2 rename to minix/man/man2/select.2 diff --git a/man/man2/send.2 b/minix/man/man2/send.2 similarity index 100% rename from man/man2/send.2 rename to minix/man/man2/send.2 diff --git a/man/man2/sendmsg.2 b/minix/man/man2/sendmsg.2 similarity index 100% rename from man/man2/sendmsg.2 rename to minix/man/man2/sendmsg.2 diff --git a/man/man2/sendto.2 b/minix/man/man2/sendto.2 similarity index 100% rename from man/man2/sendto.2 rename to minix/man/man2/sendto.2 diff --git a/man/man2/setsid.2 b/minix/man/man2/setsid.2 similarity index 100% rename from man/man2/setsid.2 rename to minix/man/man2/setsid.2 diff --git a/man/man2/setsockopt.2 b/minix/man/man2/setsockopt.2 similarity index 100% rename from man/man2/setsockopt.2 rename to minix/man/man2/setsockopt.2 diff --git a/man/man2/setuid.2 b/minix/man/man2/setuid.2 similarity index 100% rename from man/man2/setuid.2 rename to minix/man/man2/setuid.2 diff --git a/man/man2/shutdown.2 b/minix/man/man2/shutdown.2 similarity index 100% rename from man/man2/shutdown.2 rename to minix/man/man2/shutdown.2 diff --git a/man/man2/sigaction.2 b/minix/man/man2/sigaction.2 similarity index 100% rename from man/man2/sigaction.2 rename to minix/man/man2/sigaction.2 diff --git a/man/man2/sigpending.2 b/minix/man/man2/sigpending.2 similarity index 100% rename from man/man2/sigpending.2 rename to minix/man/man2/sigpending.2 diff --git a/man/man2/sigprocmask.2 b/minix/man/man2/sigprocmask.2 similarity index 100% rename from man/man2/sigprocmask.2 rename to minix/man/man2/sigprocmask.2 diff --git a/man/man2/sigsuspend.2 b/minix/man/man2/sigsuspend.2 similarity index 100% rename from man/man2/sigsuspend.2 rename to minix/man/man2/sigsuspend.2 diff --git a/man/man2/socket.2 b/minix/man/man2/socket.2 similarity index 100% rename from man/man2/socket.2 rename to minix/man/man2/socket.2 diff --git a/man/man2/socketpair.2 b/minix/man/man2/socketpair.2 similarity index 100% rename from man/man2/socketpair.2 rename to minix/man/man2/socketpair.2 diff --git a/man/man2/svrctl.2 b/minix/man/man2/svrctl.2 similarity index 100% rename from man/man2/svrctl.2 rename to minix/man/man2/svrctl.2 diff --git a/man/man2/symlink.2 b/minix/man/man2/symlink.2 similarity index 100% rename from man/man2/symlink.2 rename to minix/man/man2/symlink.2 diff --git a/man/man2/sync.2 b/minix/man/man2/sync.2 similarity index 100% rename from man/man2/sync.2 rename to minix/man/man2/sync.2 diff --git a/man/man2/time.2 b/minix/man/man2/time.2 similarity index 100% rename from man/man2/time.2 rename to minix/man/man2/time.2 diff --git a/man/man2/truncate.2 b/minix/man/man2/truncate.2 similarity index 100% rename from man/man2/truncate.2 rename to minix/man/man2/truncate.2 diff --git a/man/man2/umask.2 b/minix/man/man2/umask.2 similarity index 100% rename from man/man2/umask.2 rename to minix/man/man2/umask.2 diff --git a/man/man2/uname.2 b/minix/man/man2/uname.2 similarity index 100% rename from man/man2/uname.2 rename to minix/man/man2/uname.2 diff --git a/man/man2/unlink.2 b/minix/man/man2/unlink.2 similarity index 100% rename from man/man2/unlink.2 rename to minix/man/man2/unlink.2 diff --git a/man/man2/utime.2 b/minix/man/man2/utime.2 similarity index 100% rename from man/man2/utime.2 rename to minix/man/man2/utime.2 diff --git a/man/man2/wait.2 b/minix/man/man2/wait.2 similarity index 100% rename from man/man2/wait.2 rename to minix/man/man2/wait.2 diff --git a/man/man2/write.2 b/minix/man/man2/write.2 similarity index 100% rename from man/man2/write.2 rename to minix/man/man2/write.2 diff --git a/man/man4/Makefile b/minix/man/man4/Makefile similarity index 94% rename from man/man4/Makefile rename to minix/man/man4/Makefile index 534ff766d..a2b1f0096 100644 --- a/man/man4/Makefile +++ b/minix/man/man4/Makefile @@ -14,4 +14,3 @@ MLINKS += ip.4 psip.4 MLINKS += ip.4 udp.4 .include -.include diff --git a/man/man4/console.4 b/minix/man/man4/console.4 similarity index 100% rename from man/man4/console.4 rename to minix/man/man4/console.4 diff --git a/man/man4/controller.4 b/minix/man/man4/controller.4 similarity index 100% rename from man/man4/controller.4 rename to minix/man/man4/controller.4 diff --git a/man/man4/dev.4 b/minix/man/man4/dev.4 similarity index 100% rename from man/man4/dev.4 rename to minix/man/man4/dev.4 diff --git a/man/man4/fd.4 b/minix/man/man4/fd.4 similarity index 100% rename from man/man4/fd.4 rename to minix/man/man4/fd.4 diff --git a/man/man4/ip.4 b/minix/man/man4/ip.4 similarity index 100% rename from man/man4/ip.4 rename to minix/man/man4/ip.4 diff --git a/man/man4/lp.4 b/minix/man/man4/lp.4 similarity index 100% rename from man/man4/lp.4 rename to minix/man/man4/lp.4 diff --git a/man/man4/mtio.4 b/minix/man/man4/mtio.4 similarity index 100% rename from man/man4/mtio.4 rename to minix/man/man4/mtio.4 diff --git a/man/man4/tty.4 b/minix/man/man4/tty.4 similarity index 100% rename from man/man4/tty.4 rename to minix/man/man4/tty.4 diff --git a/man/man4/uds.4 b/minix/man/man4/uds.4 similarity index 100% rename from man/man4/uds.4 rename to minix/man/man4/uds.4 diff --git a/man/man5/Makefile b/minix/man/man5/Makefile similarity index 93% rename from man/man5/Makefile rename to minix/man/man5/Makefile index 03cf2c62c..a2bbfd4b9 100644 --- a/man/man5/Makefile +++ b/minix/man/man5/Makefile @@ -7,4 +7,3 @@ MAN= boot.cfg.5 configfile.5 crontab.5 dhcp.conf.5 dir.5 ethers.5 \ MLINKS += passwd.5 group.5 .include -.include diff --git a/man/man5/TZ.5 b/minix/man/man5/TZ.5 similarity index 100% rename from man/man5/TZ.5 rename to minix/man/man5/TZ.5 diff --git a/man/man5/boot.cfg.5 b/minix/man/man5/boot.cfg.5 similarity index 100% rename from man/man5/boot.cfg.5 rename to minix/man/man5/boot.cfg.5 diff --git a/man/man5/configfile.5 b/minix/man/man5/configfile.5 similarity index 100% rename from man/man5/configfile.5 rename to minix/man/man5/configfile.5 diff --git a/man/man5/crontab.5 b/minix/man/man5/crontab.5 similarity index 100% rename from man/man5/crontab.5 rename to minix/man/man5/crontab.5 diff --git a/man/man5/dhcp.conf.5 b/minix/man/man5/dhcp.conf.5 similarity index 100% rename from man/man5/dhcp.conf.5 rename to minix/man/man5/dhcp.conf.5 diff --git a/man/man5/dir.5 b/minix/man/man5/dir.5 similarity index 100% rename from man/man5/dir.5 rename to minix/man/man5/dir.5 diff --git a/man/man5/ethers.5 b/minix/man/man5/ethers.5 similarity index 100% rename from man/man5/ethers.5 rename to minix/man/man5/ethers.5 diff --git a/man/man5/fstab.5 b/minix/man/man5/fstab.5 similarity index 100% rename from man/man5/fstab.5 rename to minix/man/man5/fstab.5 diff --git a/man/man5/hosts.5 b/minix/man/man5/hosts.5 similarity index 100% rename from man/man5/hosts.5 rename to minix/man/man5/hosts.5 diff --git a/man/man5/http_status.5 b/minix/man/man5/http_status.5 similarity index 100% rename from man/man5/http_status.5 rename to minix/man/man5/http_status.5 diff --git a/man/man5/httpd.conf.5 b/minix/man/man5/httpd.conf.5 similarity index 100% rename from man/man5/httpd.conf.5 rename to minix/man/man5/httpd.conf.5 diff --git a/man/man5/keymap.5 b/minix/man/man5/keymap.5 similarity index 100% rename from man/man5/keymap.5 rename to minix/man/man5/keymap.5 diff --git a/man/man5/passwd.5 b/minix/man/man5/passwd.5 similarity index 100% rename from man/man5/passwd.5 rename to minix/man/man5/passwd.5 diff --git a/man/man5/pkg_install.conf.5 b/minix/man/man5/pkg_install.conf.5 similarity index 100% rename from man/man5/pkg_install.conf.5 rename to minix/man/man5/pkg_install.conf.5 diff --git a/man/man5/pkg_summary.5 b/minix/man/man5/pkg_summary.5 similarity index 100% rename from man/man5/pkg_summary.5 rename to minix/man/man5/pkg_summary.5 diff --git a/man/man5/resolv.conf.5 b/minix/man/man5/resolv.conf.5 similarity index 100% rename from man/man5/resolv.conf.5 rename to minix/man/man5/resolv.conf.5 diff --git a/man/man5/resolver.5 b/minix/man/man5/resolver.5 similarity index 100% rename from man/man5/resolver.5 rename to minix/man/man5/resolver.5 diff --git a/man/man5/rhosts.5 b/minix/man/man5/rhosts.5 similarity index 100% rename from man/man5/rhosts.5 rename to minix/man/man5/rhosts.5 diff --git a/man/man5/serv.access.5 b/minix/man/man5/serv.access.5 similarity index 100% rename from man/man5/serv.access.5 rename to minix/man/man5/serv.access.5 diff --git a/man/man5/statvfs.5 b/minix/man/man5/statvfs.5 similarity index 100% rename from man/man5/statvfs.5 rename to minix/man/man5/statvfs.5 diff --git a/man/man5/syslog.conf.5 b/minix/man/man5/syslog.conf.5 similarity index 100% rename from man/man5/syslog.conf.5 rename to minix/man/man5/syslog.conf.5 diff --git a/man/man5/system.conf.5 b/minix/man/man5/system.conf.5 similarity index 100% rename from man/man5/system.conf.5 rename to minix/man/man5/system.conf.5 diff --git a/man/man5/termcap.5 b/minix/man/man5/termcap.5 similarity index 100% rename from man/man5/termcap.5 rename to minix/man/man5/termcap.5 diff --git a/man/man5/ttytab.5 b/minix/man/man5/ttytab.5 similarity index 100% rename from man/man5/ttytab.5 rename to minix/man/man5/ttytab.5 diff --git a/man/man5/utmp.5 b/minix/man/man5/utmp.5 similarity index 100% rename from man/man5/utmp.5 rename to minix/man/man5/utmp.5 diff --git a/man/man7/Makefile b/minix/man/man7/Makefile similarity index 81% rename from man/man7/Makefile rename to minix/man/man7/Makefile index cb8684d89..648f604e4 100644 --- a/man/man7/Makefile +++ b/minix/man/man7/Makefile @@ -7,4 +7,3 @@ MAN= ascii.7 environ.7 hier.7 man.7 \ pkgsrc.7 .include -.include diff --git a/man/man7/ascii.7 b/minix/man/man7/ascii.7 similarity index 100% rename from man/man7/ascii.7 rename to minix/man/man7/ascii.7 diff --git a/man/man7/environ.7 b/minix/man/man7/environ.7 similarity index 100% rename from man/man7/environ.7 rename to minix/man/man7/environ.7 diff --git a/man/man7/hier.7 b/minix/man/man7/hier.7 similarity index 100% rename from man/man7/hier.7 rename to minix/man/man7/hier.7 diff --git a/man/man7/man.7 b/minix/man/man7/man.7 similarity index 100% rename from man/man7/man.7 rename to minix/man/man7/man.7 diff --git a/man/man7/pkgsrc.7 b/minix/man/man7/pkgsrc.7 similarity index 100% rename from man/man7/pkgsrc.7 rename to minix/man/man7/pkgsrc.7 diff --git a/man/man8/Makefile b/minix/man/man8/Makefile similarity index 95% rename from man/man8/Makefile rename to minix/man/man8/Makefile index b8ca9ead2..ed7214cdc 100644 --- a/man/man8/Makefile +++ b/minix/man/man8/Makefile @@ -14,4 +14,3 @@ MAN= add_route.8 backup.8 boot.8 btrace.8 \ MLINKS += httpd.8 in.httpd.8 .include -.include diff --git a/man/man8/add_route.8 b/minix/man/man8/add_route.8 similarity index 100% rename from man/man8/add_route.8 rename to minix/man/man8/add_route.8 diff --git a/man/man8/backup.8 b/minix/man/man8/backup.8 similarity index 100% rename from man/man8/backup.8 rename to minix/man/man8/backup.8 diff --git a/man/man8/boot.8 b/minix/man/man8/boot.8 similarity index 100% rename from man/man8/boot.8 rename to minix/man/man8/boot.8 diff --git a/man/man8/btrace.8 b/minix/man/man8/btrace.8 similarity index 100% rename from man/man8/btrace.8 rename to minix/man/man8/btrace.8 diff --git a/man/man8/cdprobe.8 b/minix/man/man8/cdprobe.8 similarity index 100% rename from man/man8/cdprobe.8 rename to minix/man/man8/cdprobe.8 diff --git a/man/man8/cleantmp.8 b/minix/man/man8/cleantmp.8 similarity index 100% rename from man/man8/cleantmp.8 rename to minix/man/man8/cleantmp.8 diff --git a/man/man8/config.8 b/minix/man/man8/config.8 similarity index 100% rename from man/man8/config.8 rename to minix/man/man8/config.8 diff --git a/man/man8/cron.8 b/minix/man/man8/cron.8 similarity index 100% rename from man/man8/cron.8 rename to minix/man/man8/cron.8 diff --git a/man/man8/dhcpd.8 b/minix/man/man8/dhcpd.8 similarity index 100% rename from man/man8/dhcpd.8 rename to minix/man/man8/dhcpd.8 diff --git a/man/man8/diskctl.8 b/minix/man/man8/diskctl.8 similarity index 100% rename from man/man8/diskctl.8 rename to minix/man/man8/diskctl.8 diff --git a/man/man8/fbdctl.8 b/minix/man/man8/fbdctl.8 similarity index 100% rename from man/man8/fbdctl.8 rename to minix/man/man8/fbdctl.8 diff --git a/man/man8/fdisk.8 b/minix/man/man8/fdisk.8 similarity index 100% rename from man/man8/fdisk.8 rename to minix/man/man8/fdisk.8 diff --git a/man/man8/getty.8 b/minix/man/man8/getty.8 similarity index 100% rename from man/man8/getty.8 rename to minix/man/man8/getty.8 diff --git a/man/man8/halt.8 b/minix/man/man8/halt.8 similarity index 100% rename from man/man8/halt.8 rename to minix/man/man8/halt.8 diff --git a/man/man8/hgfs.8 b/minix/man/man8/hgfs.8 similarity index 100% rename from man/man8/hgfs.8 rename to minix/man/man8/hgfs.8 diff --git a/man/man8/httpd.8 b/minix/man/man8/httpd.8 similarity index 100% rename from man/man8/httpd.8 rename to minix/man/man8/httpd.8 diff --git a/man/man8/ifconfig.8 b/minix/man/man8/ifconfig.8 similarity index 100% rename from man/man8/ifconfig.8 rename to minix/man/man8/ifconfig.8 diff --git a/man/man8/inet.8 b/minix/man/man8/inet.8 similarity index 100% rename from man/man8/inet.8 rename to minix/man/man8/inet.8 diff --git a/man/man8/init.8 b/minix/man/man8/init.8 similarity index 100% rename from man/man8/init.8 rename to minix/man/man8/init.8 diff --git a/man/man8/intr.8 b/minix/man/man8/intr.8 similarity index 100% rename from man/man8/intr.8 rename to minix/man/man8/intr.8 diff --git a/man/man8/irdpd.8 b/minix/man/man8/irdpd.8 similarity index 100% rename from man/man8/irdpd.8 rename to minix/man/man8/irdpd.8 diff --git a/man/man8/loadramdisk.8 b/minix/man/man8/loadramdisk.8 similarity index 100% rename from man/man8/loadramdisk.8 rename to minix/man/man8/loadramdisk.8 diff --git a/man/man8/netconf.8 b/minix/man/man8/netconf.8 similarity index 100% rename from man/man8/netconf.8 rename to minix/man/man8/netconf.8 diff --git a/man/man8/newroot.8 b/minix/man/man8/newroot.8 similarity index 100% rename from man/man8/newroot.8 rename to minix/man/man8/newroot.8 diff --git a/man/man8/nonamed.8 b/minix/man/man8/nonamed.8 similarity index 100% rename from man/man8/nonamed.8 rename to minix/man/man8/nonamed.8 diff --git a/man/man8/ossdevlinks.8 b/minix/man/man8/ossdevlinks.8 similarity index 100% rename from man/man8/ossdevlinks.8 rename to minix/man/man8/ossdevlinks.8 diff --git a/man/man8/part.8 b/minix/man/man8/part.8 similarity index 100% rename from man/man8/part.8 rename to minix/man/man8/part.8 diff --git a/man/man8/partition.8 b/minix/man/man8/partition.8 similarity index 100% rename from man/man8/partition.8 rename to minix/man/man8/partition.8 diff --git a/man/man8/pr_routes.8 b/minix/man/man8/pr_routes.8 similarity index 100% rename from man/man8/pr_routes.8 rename to minix/man/man8/pr_routes.8 diff --git a/man/man8/printroot.8 b/minix/man/man8/printroot.8 similarity index 100% rename from man/man8/printroot.8 rename to minix/man/man8/printroot.8 diff --git a/man/man8/pwdauth.8 b/minix/man/man8/pwdauth.8 similarity index 100% rename from man/man8/pwdauth.8 rename to minix/man/man8/pwdauth.8 diff --git a/man/man8/rarpd.8 b/minix/man/man8/rarpd.8 similarity index 100% rename from man/man8/rarpd.8 rename to minix/man/man8/rarpd.8 diff --git a/man/man8/readclock.8 b/minix/man/man8/readclock.8 similarity index 100% rename from man/man8/readclock.8 rename to minix/man/man8/readclock.8 diff --git a/man/man8/repartition.8 b/minix/man/man8/repartition.8 similarity index 100% rename from man/man8/repartition.8 rename to minix/man/man8/repartition.8 diff --git a/man/man8/rshd.8 b/minix/man/man8/rshd.8 similarity index 100% rename from man/man8/rshd.8 rename to minix/man/man8/rshd.8 diff --git a/man/man8/screendump.8 b/minix/man/man8/screendump.8 similarity index 100% rename from man/man8/screendump.8 rename to minix/man/man8/screendump.8 diff --git a/man/man8/serial-ip.8 b/minix/man/man8/serial-ip.8 similarity index 100% rename from man/man8/serial-ip.8 rename to minix/man/man8/serial-ip.8 diff --git a/man/man8/setup.8 b/minix/man/man8/setup.8 similarity index 100% rename from man/man8/setup.8 rename to minix/man/man8/setup.8 diff --git a/man/man8/shutdown.8 b/minix/man/man8/shutdown.8 similarity index 100% rename from man/man8/shutdown.8 rename to minix/man/man8/shutdown.8 diff --git a/man/man8/slip.8 b/minix/man/man8/slip.8 similarity index 100% rename from man/man8/slip.8 rename to minix/man/man8/slip.8 diff --git a/man/man8/srccrc.8 b/minix/man/man8/srccrc.8 similarity index 100% rename from man/man8/srccrc.8 rename to minix/man/man8/srccrc.8 diff --git a/man/man8/syslogd.8 b/minix/man/man8/syslogd.8 similarity index 100% rename from man/man8/syslogd.8 rename to minix/man/man8/syslogd.8 diff --git a/man/man8/tcpd.8 b/minix/man/man8/tcpd.8 similarity index 100% rename from man/man8/tcpd.8 rename to minix/man/man8/tcpd.8 diff --git a/man/man8/unix.8 b/minix/man/man8/unix.8 similarity index 100% rename from man/man8/unix.8 rename to minix/man/man8/unix.8 diff --git a/man/man8/update.8 b/minix/man/man8/update.8 similarity index 100% rename from man/man8/update.8 rename to minix/man/man8/update.8 diff --git a/man/man8/usage.8 b/minix/man/man8/usage.8 similarity index 100% rename from man/man8/usage.8 rename to minix/man/man8/usage.8 diff --git a/man/man8/vbfs.8 b/minix/man/man8/vbfs.8 similarity index 100% rename from man/man8/vbfs.8 rename to minix/man/man8/vbfs.8 diff --git a/man/man9/Makefile b/minix/man/man9/Makefile similarity index 59% rename from man/man9/Makefile rename to minix/man/man9/Makefile index da000493c..b347df95f 100644 --- a/man/man9/Makefile +++ b/minix/man/man9/Makefile @@ -1,4 +1,3 @@ MAN= macros.9 .include -.include diff --git a/man/man9/macros.9 b/minix/man/man9/macros.9 similarity index 100% rename from man/man9/macros.9 rename to minix/man/man9/macros.9 diff --git a/minix/net/Makefile b/minix/net/Makefile new file mode 100644 index 000000000..3a589825b --- /dev/null +++ b/minix/net/Makefile @@ -0,0 +1,11 @@ +.include + +.if ${MKIMAGEONLY} == "no" +SUBDIR+= inet + +. if ${MKLWIP} == "yes" +SUBDIR+= lwip +. endif # ${MKLWIP} == "yes" +.endif # ${MKIMAGEONLY} == "no" + +.include diff --git a/minix/net/Makefile.inc b/minix/net/Makefile.inc new file mode 100644 index 000000000..5c329c729 --- /dev/null +++ b/minix/net/Makefile.inc @@ -0,0 +1,7 @@ +BINDIR?=/usr/sbin +MAN?= + +LDADD+= -lminlib -lcompat_minix +DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} + +.include "../Makefile.inc" diff --git a/servers/inet/Makefile b/minix/net/inet/Makefile similarity index 92% rename from servers/inet/Makefile rename to minix/net/inet/Makefile index cc04b0eee..fa8ec057c 100644 --- a/servers/inet/Makefile +++ b/minix/net/inet/Makefile @@ -17,14 +17,9 @@ WARNS= DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys +DPADD+= ${LIBC} LDADD+= -lc -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${.CURDIR} -D'ARGS(a)=a' -WARNS?= 5 - .include diff --git a/servers/inet/buf.c b/minix/net/inet/buf.c similarity index 100% rename from servers/inet/buf.c rename to minix/net/inet/buf.c diff --git a/servers/inet/clock.c b/minix/net/inet/clock.c similarity index 100% rename from servers/inet/clock.c rename to minix/net/inet/clock.c diff --git a/servers/inet/const.h b/minix/net/inet/const.h similarity index 100% rename from servers/inet/const.h rename to minix/net/inet/const.h diff --git a/servers/inet/generic/arp.c b/minix/net/inet/generic/arp.c similarity index 100% rename from servers/inet/generic/arp.c rename to minix/net/inet/generic/arp.c diff --git a/servers/inet/generic/arp.h b/minix/net/inet/generic/arp.h similarity index 100% rename from servers/inet/generic/arp.h rename to minix/net/inet/generic/arp.h diff --git a/servers/inet/generic/assert.h b/minix/net/inet/generic/assert.h similarity index 100% rename from servers/inet/generic/assert.h rename to minix/net/inet/generic/assert.h diff --git a/servers/inet/generic/buf.h b/minix/net/inet/generic/buf.h similarity index 100% rename from servers/inet/generic/buf.h rename to minix/net/inet/generic/buf.h diff --git a/servers/inet/generic/clock.h b/minix/net/inet/generic/clock.h similarity index 100% rename from servers/inet/generic/clock.h rename to minix/net/inet/generic/clock.h diff --git a/servers/inet/generic/eth.c b/minix/net/inet/generic/eth.c similarity index 100% rename from servers/inet/generic/eth.c rename to minix/net/inet/generic/eth.c diff --git a/servers/inet/generic/eth.h b/minix/net/inet/generic/eth.h similarity index 100% rename from servers/inet/generic/eth.h rename to minix/net/inet/generic/eth.h diff --git a/servers/inet/generic/eth_int.h b/minix/net/inet/generic/eth_int.h similarity index 100% rename from servers/inet/generic/eth_int.h rename to minix/net/inet/generic/eth_int.h diff --git a/servers/inet/generic/event.c b/minix/net/inet/generic/event.c similarity index 100% rename from servers/inet/generic/event.c rename to minix/net/inet/generic/event.c diff --git a/servers/inet/generic/event.h b/minix/net/inet/generic/event.h similarity index 100% rename from servers/inet/generic/event.h rename to minix/net/inet/generic/event.h diff --git a/servers/inet/generic/icmp.c b/minix/net/inet/generic/icmp.c similarity index 100% rename from servers/inet/generic/icmp.c rename to minix/net/inet/generic/icmp.c diff --git a/servers/inet/generic/icmp.h b/minix/net/inet/generic/icmp.h similarity index 100% rename from servers/inet/generic/icmp.h rename to minix/net/inet/generic/icmp.h diff --git a/servers/inet/generic/icmp_lib.h b/minix/net/inet/generic/icmp_lib.h similarity index 100% rename from servers/inet/generic/icmp_lib.h rename to minix/net/inet/generic/icmp_lib.h diff --git a/servers/inet/generic/io.c b/minix/net/inet/generic/io.c similarity index 100% rename from servers/inet/generic/io.c rename to minix/net/inet/generic/io.c diff --git a/servers/inet/generic/io.h b/minix/net/inet/generic/io.h similarity index 100% rename from servers/inet/generic/io.h rename to minix/net/inet/generic/io.h diff --git a/servers/inet/generic/ip.c b/minix/net/inet/generic/ip.c similarity index 100% rename from servers/inet/generic/ip.c rename to minix/net/inet/generic/ip.c diff --git a/servers/inet/generic/ip.h b/minix/net/inet/generic/ip.h similarity index 100% rename from servers/inet/generic/ip.h rename to minix/net/inet/generic/ip.h diff --git a/servers/inet/generic/ip_eth.c b/minix/net/inet/generic/ip_eth.c similarity index 100% rename from servers/inet/generic/ip_eth.c rename to minix/net/inet/generic/ip_eth.c diff --git a/servers/inet/generic/ip_int.h b/minix/net/inet/generic/ip_int.h similarity index 100% rename from servers/inet/generic/ip_int.h rename to minix/net/inet/generic/ip_int.h diff --git a/servers/inet/generic/ip_ioctl.c b/minix/net/inet/generic/ip_ioctl.c similarity index 100% rename from servers/inet/generic/ip_ioctl.c rename to minix/net/inet/generic/ip_ioctl.c diff --git a/servers/inet/generic/ip_lib.c b/minix/net/inet/generic/ip_lib.c similarity index 100% rename from servers/inet/generic/ip_lib.c rename to minix/net/inet/generic/ip_lib.c diff --git a/servers/inet/generic/ip_ps.c b/minix/net/inet/generic/ip_ps.c similarity index 100% rename from servers/inet/generic/ip_ps.c rename to minix/net/inet/generic/ip_ps.c diff --git a/servers/inet/generic/ip_read.c b/minix/net/inet/generic/ip_read.c similarity index 100% rename from servers/inet/generic/ip_read.c rename to minix/net/inet/generic/ip_read.c diff --git a/servers/inet/generic/ip_write.c b/minix/net/inet/generic/ip_write.c similarity index 100% rename from servers/inet/generic/ip_write.c rename to minix/net/inet/generic/ip_write.c diff --git a/servers/inet/generic/ipr.c b/minix/net/inet/generic/ipr.c similarity index 100% rename from servers/inet/generic/ipr.c rename to minix/net/inet/generic/ipr.c diff --git a/servers/inet/generic/ipr.h b/minix/net/inet/generic/ipr.h similarity index 100% rename from servers/inet/generic/ipr.h rename to minix/net/inet/generic/ipr.h diff --git a/servers/inet/generic/psip.c b/minix/net/inet/generic/psip.c similarity index 100% rename from servers/inet/generic/psip.c rename to minix/net/inet/generic/psip.c diff --git a/servers/inet/generic/psip.h b/minix/net/inet/generic/psip.h similarity index 100% rename from servers/inet/generic/psip.h rename to minix/net/inet/generic/psip.h diff --git a/servers/inet/generic/rand256.c b/minix/net/inet/generic/rand256.c similarity index 100% rename from servers/inet/generic/rand256.c rename to minix/net/inet/generic/rand256.c diff --git a/servers/inet/generic/rand256.h b/minix/net/inet/generic/rand256.h similarity index 100% rename from servers/inet/generic/rand256.h rename to minix/net/inet/generic/rand256.h diff --git a/servers/inet/generic/sr.h b/minix/net/inet/generic/sr.h similarity index 100% rename from servers/inet/generic/sr.h rename to minix/net/inet/generic/sr.h diff --git a/servers/inet/generic/tcp.c b/minix/net/inet/generic/tcp.c similarity index 100% rename from servers/inet/generic/tcp.c rename to minix/net/inet/generic/tcp.c diff --git a/servers/inet/generic/tcp.h b/minix/net/inet/generic/tcp.h similarity index 100% rename from servers/inet/generic/tcp.h rename to minix/net/inet/generic/tcp.h diff --git a/servers/inet/generic/tcp_int.h b/minix/net/inet/generic/tcp_int.h similarity index 100% rename from servers/inet/generic/tcp_int.h rename to minix/net/inet/generic/tcp_int.h diff --git a/servers/inet/generic/tcp_lib.c b/minix/net/inet/generic/tcp_lib.c similarity index 100% rename from servers/inet/generic/tcp_lib.c rename to minix/net/inet/generic/tcp_lib.c diff --git a/servers/inet/generic/tcp_recv.c b/minix/net/inet/generic/tcp_recv.c similarity index 100% rename from servers/inet/generic/tcp_recv.c rename to minix/net/inet/generic/tcp_recv.c diff --git a/servers/inet/generic/tcp_send.c b/minix/net/inet/generic/tcp_send.c similarity index 100% rename from servers/inet/generic/tcp_send.c rename to minix/net/inet/generic/tcp_send.c diff --git a/servers/inet/generic/type.h b/minix/net/inet/generic/type.h similarity index 100% rename from servers/inet/generic/type.h rename to minix/net/inet/generic/type.h diff --git a/servers/inet/generic/udp.c b/minix/net/inet/generic/udp.c similarity index 100% rename from servers/inet/generic/udp.c rename to minix/net/inet/generic/udp.c diff --git a/servers/inet/generic/udp.h b/minix/net/inet/generic/udp.h similarity index 100% rename from servers/inet/generic/udp.h rename to minix/net/inet/generic/udp.h diff --git a/servers/inet/generic/udp_int.h b/minix/net/inet/generic/udp_int.h similarity index 100% rename from servers/inet/generic/udp_int.h rename to minix/net/inet/generic/udp_int.h diff --git a/servers/inet/inet.c b/minix/net/inet/inet.c similarity index 100% rename from servers/inet/inet.c rename to minix/net/inet/inet.c diff --git a/servers/inet/inet.h b/minix/net/inet/inet.h similarity index 100% rename from servers/inet/inet.h rename to minix/net/inet/inet.h diff --git a/servers/inet/inet_config.c b/minix/net/inet/inet_config.c similarity index 100% rename from servers/inet/inet_config.c rename to minix/net/inet/inet_config.c diff --git a/servers/inet/inet_config.h b/minix/net/inet/inet_config.h similarity index 100% rename from servers/inet/inet_config.h rename to minix/net/inet/inet_config.h diff --git a/servers/inet/mnx_eth.c b/minix/net/inet/mnx_eth.c similarity index 100% rename from servers/inet/mnx_eth.c rename to minix/net/inet/mnx_eth.c diff --git a/servers/inet/mq.c b/minix/net/inet/mq.c similarity index 100% rename from servers/inet/mq.c rename to minix/net/inet/mq.c diff --git a/servers/inet/mq.h b/minix/net/inet/mq.h similarity index 100% rename from servers/inet/mq.h rename to minix/net/inet/mq.h diff --git a/servers/inet/osdep_eth.h b/minix/net/inet/osdep_eth.h similarity index 100% rename from servers/inet/osdep_eth.h rename to minix/net/inet/osdep_eth.h diff --git a/servers/inet/proto.h b/minix/net/inet/proto.h similarity index 100% rename from servers/inet/proto.h rename to minix/net/inet/proto.h diff --git a/servers/inet/qp.c b/minix/net/inet/qp.c similarity index 100% rename from servers/inet/qp.c rename to minix/net/inet/qp.c diff --git a/servers/inet/qp.h b/minix/net/inet/qp.h similarity index 100% rename from servers/inet/qp.h rename to minix/net/inet/qp.h diff --git a/servers/inet/queryparam.c b/minix/net/inet/queryparam.c similarity index 100% rename from servers/inet/queryparam.c rename to minix/net/inet/queryparam.c diff --git a/servers/inet/queryparam.h b/minix/net/inet/queryparam.h similarity index 100% rename from servers/inet/queryparam.h rename to minix/net/inet/queryparam.h diff --git a/servers/inet/sr.c b/minix/net/inet/sr.c similarity index 100% rename from servers/inet/sr.c rename to minix/net/inet/sr.c diff --git a/servers/inet/sr_int.h b/minix/net/inet/sr_int.h similarity index 100% rename from servers/inet/sr_int.h rename to minix/net/inet/sr_int.h diff --git a/servers/inet/version.c b/minix/net/inet/version.c similarity index 100% rename from servers/inet/version.c rename to minix/net/inet/version.c diff --git a/servers/lwip/Makefile b/minix/net/lwip/Makefile similarity index 67% rename from servers/lwip/Makefile rename to minix/net/lwip/Makefile index 3cb2bed9a..2eb0102e5 100644 --- a/servers/lwip/Makefile +++ b/minix/net/lwip/Makefile @@ -15,15 +15,11 @@ SRCS= lwip.c \ DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBLWIP} ${LIBNETSOCK} LDADD+= -lchardriver -lsys -ltimers -llwip -lnetsock -MAN= - -BINDIR?= /usr/sbin - WARNS?=2 -CPPFLAGS+= -I${NETBSDSRCDIR}/lib/liblwip/include -CPPFLAGS+= -I${NETBSDSRCDIR}/lib/liblwip/include/ipv4 -CPPFLAGS+= -I${NETBSDSRCDIR}/lib/liblwip/include/ipv6 +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/lib/liblwip/include +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/lib/liblwip/include/ipv4 +CPPFLAGS+= -I${NETBSDSRCDIR}/minix/lib/liblwip/include/ipv6 CPPFLAGS+= -D_SYSTEM=1 CFLAGS+= -std=c99 diff --git a/servers/lwip/driver.c b/minix/net/lwip/driver.c similarity index 100% rename from servers/lwip/driver.c rename to minix/net/lwip/driver.c diff --git a/servers/lwip/driver.h b/minix/net/lwip/driver.h similarity index 100% rename from servers/lwip/driver.h rename to minix/net/lwip/driver.h diff --git a/servers/lwip/eth.c b/minix/net/lwip/eth.c similarity index 100% rename from servers/lwip/eth.c rename to minix/net/lwip/eth.c diff --git a/servers/lwip/inet_config.c b/minix/net/lwip/inet_config.c similarity index 100% rename from servers/lwip/inet_config.c rename to minix/net/lwip/inet_config.c diff --git a/servers/lwip/inet_config.h b/minix/net/lwip/inet_config.h similarity index 100% rename from servers/lwip/inet_config.h rename to minix/net/lwip/inet_config.h diff --git a/servers/lwip/lwip.c b/minix/net/lwip/lwip.c similarity index 100% rename from servers/lwip/lwip.c rename to minix/net/lwip/lwip.c diff --git a/servers/lwip/proto.h b/minix/net/lwip/proto.h similarity index 100% rename from servers/lwip/proto.h rename to minix/net/lwip/proto.h diff --git a/servers/lwip/raw_ip.c b/minix/net/lwip/raw_ip.c similarity index 100% rename from servers/lwip/raw_ip.c rename to minix/net/lwip/raw_ip.c diff --git a/servers/lwip/tcp.c b/minix/net/lwip/tcp.c similarity index 100% rename from servers/lwip/tcp.c rename to minix/net/lwip/tcp.c diff --git a/servers/lwip/udp.c b/minix/net/lwip/udp.c similarity index 100% rename from servers/lwip/udp.c rename to minix/net/lwip/udp.c diff --git a/minix/sbin/Makefile b/minix/sbin/Makefile new file mode 100644 index 000000000..2b9dd769c --- /dev/null +++ b/minix/sbin/Makefile @@ -0,0 +1 @@ +.include diff --git a/minix/sbin/Makefile.inc b/minix/sbin/Makefile.inc new file mode 100644 index 000000000..0b7e6036a --- /dev/null +++ b/minix/sbin/Makefile.inc @@ -0,0 +1,4 @@ +BINDIR?=/sbin +MAN?= + +.include "../Makefile.inc" diff --git a/minix/servers/Makefile b/minix/servers/Makefile new file mode 100644 index 000000000..a39b2bdab --- /dev/null +++ b/minix/servers/Makefile @@ -0,0 +1,9 @@ +.include + +SUBDIR+= ds input pm rs sched vfs vm + +.if ${MKIMAGEONLY} == "no" +SUBDIR+= ipc is devman +.endif + +.include diff --git a/drivers/Makefile.inc b/minix/servers/Makefile.inc similarity index 75% rename from drivers/Makefile.inc rename to minix/servers/Makefile.inc index b423a45c8..86c4d21a5 100644 --- a/drivers/Makefile.inc +++ b/minix/servers/Makefile.inc @@ -1,3 +1,6 @@ +BINDIR?=/usr/sbin + LDADD+= -lminlib -lcompat_minix DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} -BINDIR?=/usr/sbin + +.include "../Makefile.inc" diff --git a/servers/devman/Makefile b/minix/servers/devman/Makefile similarity index 100% rename from servers/devman/Makefile rename to minix/servers/devman/Makefile diff --git a/servers/devman/bind.c b/minix/servers/devman/bind.c similarity index 100% rename from servers/devman/bind.c rename to minix/servers/devman/bind.c diff --git a/servers/devman/buf.c b/minix/servers/devman/buf.c similarity index 100% rename from servers/devman/buf.c rename to minix/servers/devman/buf.c diff --git a/servers/devman/device.c b/minix/servers/devman/device.c similarity index 100% rename from servers/devman/device.c rename to minix/servers/devman/device.c diff --git a/servers/devman/devinfo.h b/minix/servers/devman/devinfo.h similarity index 100% rename from servers/devman/devinfo.h rename to minix/servers/devman/devinfo.h diff --git a/servers/devman/devman.h b/minix/servers/devman/devman.h similarity index 100% rename from servers/devman/devman.h rename to minix/servers/devman/devman.h diff --git a/servers/devman/main.c b/minix/servers/devman/main.c similarity index 100% rename from servers/devman/main.c rename to minix/servers/devman/main.c diff --git a/servers/devman/proto.h b/minix/servers/devman/proto.h similarity index 100% rename from servers/devman/proto.h rename to minix/servers/devman/proto.h diff --git a/servers/ds/Makefile b/minix/servers/ds/Makefile similarity index 100% rename from servers/ds/Makefile rename to minix/servers/ds/Makefile diff --git a/servers/ds/inc.h b/minix/servers/ds/inc.h similarity index 100% rename from servers/ds/inc.h rename to minix/servers/ds/inc.h diff --git a/servers/ds/main.c b/minix/servers/ds/main.c similarity index 100% rename from servers/ds/main.c rename to minix/servers/ds/main.c diff --git a/servers/ds/proto.h b/minix/servers/ds/proto.h similarity index 100% rename from servers/ds/proto.h rename to minix/servers/ds/proto.h diff --git a/servers/ds/store.c b/minix/servers/ds/store.c similarity index 100% rename from servers/ds/store.c rename to minix/servers/ds/store.c diff --git a/servers/ds/store.h b/minix/servers/ds/store.h similarity index 100% rename from servers/ds/store.h rename to minix/servers/ds/store.h diff --git a/servers/input/Makefile b/minix/servers/input/Makefile similarity index 100% rename from servers/input/Makefile rename to minix/servers/input/Makefile diff --git a/servers/input/input.c b/minix/servers/input/input.c similarity index 100% rename from servers/input/input.c rename to minix/servers/input/input.c diff --git a/servers/input/input.h b/minix/servers/input/input.h similarity index 100% rename from servers/input/input.h rename to minix/servers/input/input.h diff --git a/servers/ipc/Makefile b/minix/servers/ipc/Makefile similarity index 100% rename from servers/ipc/Makefile rename to minix/servers/ipc/Makefile diff --git a/servers/ipc/inc.h b/minix/servers/ipc/inc.h similarity index 100% rename from servers/ipc/inc.h rename to minix/servers/ipc/inc.h diff --git a/servers/ipc/ipc.conf b/minix/servers/ipc/ipc.conf similarity index 100% rename from servers/ipc/ipc.conf rename to minix/servers/ipc/ipc.conf diff --git a/servers/ipc/main.c b/minix/servers/ipc/main.c similarity index 100% rename from servers/ipc/main.c rename to minix/servers/ipc/main.c diff --git a/servers/ipc/sem.c b/minix/servers/ipc/sem.c similarity index 100% rename from servers/ipc/sem.c rename to minix/servers/ipc/sem.c diff --git a/servers/ipc/shm.c b/minix/servers/ipc/shm.c similarity index 100% rename from servers/ipc/shm.c rename to minix/servers/ipc/shm.c diff --git a/servers/ipc/utility.c b/minix/servers/ipc/utility.c similarity index 100% rename from servers/ipc/utility.c rename to minix/servers/ipc/utility.c diff --git a/servers/is/Makefile b/minix/servers/is/Makefile similarity index 62% rename from servers/is/Makefile rename to minix/servers/is/Makefile index cde8c7ac4..74dd9cf44 100644 --- a/servers/is/Makefile +++ b/minix/servers/is/Makefile @@ -13,9 +13,11 @@ MAN= BINDIR?= /sbin -CPPFLAGS.dmp_kernel.c+= -I${NETBSDSRCDIR} -CPPFLAGS.dmp_rs.c+= -I${NETBSDSRCDIR} -CPPFLAGS.dmp_vm.c+= -I${NETBSDSRCDIR} +CPPFLAGS.dmp_fs.c+= -I${NETBSDSRCDIR}/minix/servers \ + -I${NETBSDSRCDIR}/minix/fs +CPPFLAGS.dmp_kernel.c+= -I${NETBSDSRCDIR}/minix +CPPFLAGS.dmp_rs.c+= -I${NETBSDSRCDIR}/minix +CPPFLAGS.dmp_vm.c+= -I${NETBSDSRCDIR}/minix # This setting must match the kernel's, as it affects the IRQ hooks table size. .if ${USE_APIC} != "no" diff --git a/servers/is/dmp.c b/minix/servers/is/dmp.c similarity index 100% rename from servers/is/dmp.c rename to minix/servers/is/dmp.c diff --git a/servers/is/dmp_ds.c b/minix/servers/is/dmp_ds.c similarity index 100% rename from servers/is/dmp_ds.c rename to minix/servers/is/dmp_ds.c diff --git a/servers/is/dmp_fs.c b/minix/servers/is/dmp_fs.c similarity index 95% rename from servers/is/dmp_fs.c rename to minix/servers/is/dmp_fs.c index d4aa92a50..e30489cc9 100644 --- a/servers/is/dmp_fs.c +++ b/minix/servers/is/dmp_fs.c @@ -9,10 +9,10 @@ */ #include "inc.h" -#include "../mfs/const.h" -#include "../vfs/const.h" -#include "../vfs/fproc.h" -#include "../vfs/dmap.h" +#include "mfs/const.h" +#include "vfs/const.h" +#include "vfs/fproc.h" +#include "vfs/dmap.h" #include struct fproc fproc[NR_PROCS]; diff --git a/servers/is/dmp_kernel.c b/minix/servers/is/dmp_kernel.c similarity index 100% rename from servers/is/dmp_kernel.c rename to minix/servers/is/dmp_kernel.c diff --git a/servers/is/dmp_pm.c b/minix/servers/is/dmp_pm.c similarity index 100% rename from servers/is/dmp_pm.c rename to minix/servers/is/dmp_pm.c diff --git a/servers/is/dmp_rs.c b/minix/servers/is/dmp_rs.c similarity index 100% rename from servers/is/dmp_rs.c rename to minix/servers/is/dmp_rs.c diff --git a/servers/is/dmp_vm.c b/minix/servers/is/dmp_vm.c similarity index 100% rename from servers/is/dmp_vm.c rename to minix/servers/is/dmp_vm.c diff --git a/servers/is/glo.h b/minix/servers/is/glo.h similarity index 100% rename from servers/is/glo.h rename to minix/servers/is/glo.h diff --git a/servers/is/inc.h b/minix/servers/is/inc.h similarity index 100% rename from servers/is/inc.h rename to minix/servers/is/inc.h diff --git a/servers/is/main.c b/minix/servers/is/main.c similarity index 100% rename from servers/is/main.c rename to minix/servers/is/main.c diff --git a/servers/is/proto.h b/minix/servers/is/proto.h similarity index 100% rename from servers/is/proto.h rename to minix/servers/is/proto.h diff --git a/servers/pm/Makefile b/minix/servers/pm/Makefile similarity index 64% rename from servers/pm/Makefile rename to minix/servers/pm/Makefile index 3bfe93751..7d4fe60ea 100644 --- a/servers/pm/Makefile +++ b/minix/servers/pm/Makefile @@ -13,9 +13,9 @@ MAN= BINDIR?= /usr/sbin -CPPFLAGS.main.c+= -I${NETBSDSRCDIR} -CPPFLAGS.misc.c+= -I${NETBSDSRCDIR} -CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR} -CPPFLAGS.utility.c+= -I${NETBSDSRCDIR} +CPPFLAGS.main.c+= -I${NETBSDSRCDIR}/minix +CPPFLAGS.misc.c+= -I${NETBSDSRCDIR}/minix +CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR}/minix +CPPFLAGS.utility.c+= -I${NETBSDSRCDIR}/minix .include diff --git a/servers/pm/alarm.c b/minix/servers/pm/alarm.c similarity index 100% rename from servers/pm/alarm.c rename to minix/servers/pm/alarm.c diff --git a/servers/pm/const.h b/minix/servers/pm/const.h similarity index 100% rename from servers/pm/const.h rename to minix/servers/pm/const.h diff --git a/servers/pm/exec.c b/minix/servers/pm/exec.c similarity index 100% rename from servers/pm/exec.c rename to minix/servers/pm/exec.c diff --git a/servers/pm/forkexit.c b/minix/servers/pm/forkexit.c similarity index 100% rename from servers/pm/forkexit.c rename to minix/servers/pm/forkexit.c diff --git a/servers/pm/getset.c b/minix/servers/pm/getset.c similarity index 100% rename from servers/pm/getset.c rename to minix/servers/pm/getset.c diff --git a/servers/pm/glo.h b/minix/servers/pm/glo.h similarity index 100% rename from servers/pm/glo.h rename to minix/servers/pm/glo.h diff --git a/servers/pm/main.c b/minix/servers/pm/main.c similarity index 100% rename from servers/pm/main.c rename to minix/servers/pm/main.c diff --git a/servers/pm/mcontext.c b/minix/servers/pm/mcontext.c similarity index 100% rename from servers/pm/mcontext.c rename to minix/servers/pm/mcontext.c diff --git a/servers/pm/misc.c b/minix/servers/pm/misc.c similarity index 100% rename from servers/pm/misc.c rename to minix/servers/pm/misc.c diff --git a/servers/pm/mproc.h b/minix/servers/pm/mproc.h similarity index 100% rename from servers/pm/mproc.h rename to minix/servers/pm/mproc.h diff --git a/servers/pm/pm.h b/minix/servers/pm/pm.h similarity index 100% rename from servers/pm/pm.h rename to minix/servers/pm/pm.h diff --git a/servers/pm/profile.c b/minix/servers/pm/profile.c similarity index 100% rename from servers/pm/profile.c rename to minix/servers/pm/profile.c diff --git a/servers/pm/proto.h b/minix/servers/pm/proto.h similarity index 100% rename from servers/pm/proto.h rename to minix/servers/pm/proto.h diff --git a/servers/pm/schedule.c b/minix/servers/pm/schedule.c similarity index 100% rename from servers/pm/schedule.c rename to minix/servers/pm/schedule.c diff --git a/servers/pm/signal.c b/minix/servers/pm/signal.c similarity index 100% rename from servers/pm/signal.c rename to minix/servers/pm/signal.c diff --git a/servers/pm/table.c b/minix/servers/pm/table.c similarity index 100% rename from servers/pm/table.c rename to minix/servers/pm/table.c diff --git a/servers/pm/time.c b/minix/servers/pm/time.c similarity index 100% rename from servers/pm/time.c rename to minix/servers/pm/time.c diff --git a/servers/pm/trace.c b/minix/servers/pm/trace.c similarity index 100% rename from servers/pm/trace.c rename to minix/servers/pm/trace.c diff --git a/servers/pm/type.h b/minix/servers/pm/type.h similarity index 100% rename from servers/pm/type.h rename to minix/servers/pm/type.h diff --git a/servers/pm/utility.c b/minix/servers/pm/utility.c similarity index 100% rename from servers/pm/utility.c rename to minix/servers/pm/utility.c diff --git a/servers/rs/Makefile b/minix/servers/rs/Makefile similarity index 89% rename from servers/rs/Makefile rename to minix/servers/rs/Makefile index fc6804dbf..4fcd87852 100644 --- a/servers/rs/Makefile +++ b/minix/servers/rs/Makefile @@ -15,6 +15,6 @@ MAN= BINDIR?= /usr/sbin -CPPFLAGS+= -I${NETBSDSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR}/minix .include diff --git a/servers/rs/const.h b/minix/servers/rs/const.h similarity index 100% rename from servers/rs/const.h rename to minix/servers/rs/const.h diff --git a/servers/rs/error.c b/minix/servers/rs/error.c similarity index 100% rename from servers/rs/error.c rename to minix/servers/rs/error.c diff --git a/servers/rs/exec.c b/minix/servers/rs/exec.c similarity index 100% rename from servers/rs/exec.c rename to minix/servers/rs/exec.c diff --git a/servers/rs/glo.h b/minix/servers/rs/glo.h similarity index 100% rename from servers/rs/glo.h rename to minix/servers/rs/glo.h diff --git a/servers/rs/inc.h b/minix/servers/rs/inc.h similarity index 100% rename from servers/rs/inc.h rename to minix/servers/rs/inc.h diff --git a/servers/rs/main.c b/minix/servers/rs/main.c similarity index 100% rename from servers/rs/main.c rename to minix/servers/rs/main.c diff --git a/servers/rs/manager.c b/minix/servers/rs/manager.c similarity index 100% rename from servers/rs/manager.c rename to minix/servers/rs/manager.c diff --git a/servers/rs/memory.c b/minix/servers/rs/memory.c similarity index 100% rename from servers/rs/memory.c rename to minix/servers/rs/memory.c diff --git a/servers/rs/proto.h b/minix/servers/rs/proto.h similarity index 100% rename from servers/rs/proto.h rename to minix/servers/rs/proto.h diff --git a/servers/rs/request.c b/minix/servers/rs/request.c similarity index 100% rename from servers/rs/request.c rename to minix/servers/rs/request.c diff --git a/servers/rs/table.c b/minix/servers/rs/table.c similarity index 100% rename from servers/rs/table.c rename to minix/servers/rs/table.c diff --git a/servers/rs/type.h b/minix/servers/rs/type.h similarity index 100% rename from servers/rs/type.h rename to minix/servers/rs/type.h diff --git a/servers/rs/utility.c b/minix/servers/rs/utility.c similarity index 100% rename from servers/rs/utility.c rename to minix/servers/rs/utility.c diff --git a/servers/sched/Makefile b/minix/servers/sched/Makefile similarity index 58% rename from servers/sched/Makefile rename to minix/servers/sched/Makefile index 72f1b2003..f5f53df57 100644 --- a/servers/sched/Makefile +++ b/minix/servers/sched/Makefile @@ -9,8 +9,8 @@ MAN= BINDIR?= /usr/sbin -CPPFLAGS.main.c+= -I${NETBSDSRCDIR} -CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR} -CPPFLAGS.utility.c+= -I${NETBSDSRCDIR} +CPPFLAGS.main.c+= -I${NETBSDSRCDIR}/minix +CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR}/minix +CPPFLAGS.utility.c+= -I${NETBSDSRCDIR}/minix .include diff --git a/servers/sched/main.c b/minix/servers/sched/main.c similarity index 100% rename from servers/sched/main.c rename to minix/servers/sched/main.c diff --git a/servers/sched/proto.h b/minix/servers/sched/proto.h similarity index 100% rename from servers/sched/proto.h rename to minix/servers/sched/proto.h diff --git a/servers/sched/sched.h b/minix/servers/sched/sched.h similarity index 100% rename from servers/sched/sched.h rename to minix/servers/sched/sched.h diff --git a/servers/sched/schedproc.h b/minix/servers/sched/schedproc.h similarity index 100% rename from servers/sched/schedproc.h rename to minix/servers/sched/schedproc.h diff --git a/servers/sched/schedule.c b/minix/servers/sched/schedule.c similarity index 100% rename from servers/sched/schedule.c rename to minix/servers/sched/schedule.c diff --git a/servers/sched/utility.c b/minix/servers/sched/utility.c similarity index 100% rename from servers/sched/utility.c rename to minix/servers/sched/utility.c diff --git a/servers/vfs/Makefile b/minix/servers/vfs/Makefile similarity index 100% rename from servers/vfs/Makefile rename to minix/servers/vfs/Makefile diff --git a/servers/vfs/README b/minix/servers/vfs/README similarity index 100% rename from servers/vfs/README rename to minix/servers/vfs/README diff --git a/servers/vfs/comm.c b/minix/servers/vfs/comm.c similarity index 100% rename from servers/vfs/comm.c rename to minix/servers/vfs/comm.c diff --git a/servers/vfs/const.h b/minix/servers/vfs/const.h similarity index 100% rename from servers/vfs/const.h rename to minix/servers/vfs/const.h diff --git a/servers/vfs/coredump.c b/minix/servers/vfs/coredump.c similarity index 100% rename from servers/vfs/coredump.c rename to minix/servers/vfs/coredump.c diff --git a/servers/vfs/device.c b/minix/servers/vfs/device.c similarity index 100% rename from servers/vfs/device.c rename to minix/servers/vfs/device.c diff --git a/servers/vfs/dmap.c b/minix/servers/vfs/dmap.c similarity index 100% rename from servers/vfs/dmap.c rename to minix/servers/vfs/dmap.c diff --git a/servers/vfs/dmap.h b/minix/servers/vfs/dmap.h similarity index 100% rename from servers/vfs/dmap.h rename to minix/servers/vfs/dmap.h diff --git a/servers/vfs/exec.c b/minix/servers/vfs/exec.c similarity index 99% rename from servers/vfs/exec.c rename to minix/servers/vfs/exec.c index 14c36a172..3a7a5c5d2 100644 --- a/servers/vfs/exec.c +++ b/minix/servers/vfs/exec.c @@ -400,8 +400,8 @@ pm_execfinal: return(r); } -/* This is a copy-paste of the same macro in libc/sys-minix/stack_utils.c. Keep it - * synchronized. */ +/* This is a copy-paste of the same macro in minix/lib/libc/sys/stack_utils.c. + * Keep it synchronized. */ #define STACK_MIN_SZ \ ( \ sizeof(int) + sizeof(void *) * 2 + \ diff --git a/servers/vfs/file.h b/minix/servers/vfs/file.h similarity index 100% rename from servers/vfs/file.h rename to minix/servers/vfs/file.h diff --git a/servers/vfs/filedes.c b/minix/servers/vfs/filedes.c similarity index 100% rename from servers/vfs/filedes.c rename to minix/servers/vfs/filedes.c diff --git a/servers/vfs/fproc.h b/minix/servers/vfs/fproc.h similarity index 100% rename from servers/vfs/fproc.h rename to minix/servers/vfs/fproc.h diff --git a/servers/vfs/fs.h b/minix/servers/vfs/fs.h similarity index 100% rename from servers/vfs/fs.h rename to minix/servers/vfs/fs.h diff --git a/servers/vfs/gcov.c b/minix/servers/vfs/gcov.c similarity index 100% rename from servers/vfs/gcov.c rename to minix/servers/vfs/gcov.c diff --git a/servers/vfs/glo.h b/minix/servers/vfs/glo.h similarity index 100% rename from servers/vfs/glo.h rename to minix/servers/vfs/glo.h diff --git a/servers/vfs/link.c b/minix/servers/vfs/link.c similarity index 100% rename from servers/vfs/link.c rename to minix/servers/vfs/link.c diff --git a/servers/vfs/lock.c b/minix/servers/vfs/lock.c similarity index 100% rename from servers/vfs/lock.c rename to minix/servers/vfs/lock.c diff --git a/servers/vfs/lock.h b/minix/servers/vfs/lock.h similarity index 100% rename from servers/vfs/lock.h rename to minix/servers/vfs/lock.h diff --git a/servers/vfs/main.c b/minix/servers/vfs/main.c similarity index 100% rename from servers/vfs/main.c rename to minix/servers/vfs/main.c diff --git a/servers/vfs/misc.c b/minix/servers/vfs/misc.c similarity index 100% rename from servers/vfs/misc.c rename to minix/servers/vfs/misc.c diff --git a/servers/vfs/mount.c b/minix/servers/vfs/mount.c similarity index 100% rename from servers/vfs/mount.c rename to minix/servers/vfs/mount.c diff --git a/servers/vfs/open.c b/minix/servers/vfs/open.c similarity index 100% rename from servers/vfs/open.c rename to minix/servers/vfs/open.c diff --git a/servers/vfs/path.c b/minix/servers/vfs/path.c similarity index 100% rename from servers/vfs/path.c rename to minix/servers/vfs/path.c diff --git a/servers/vfs/path.h b/minix/servers/vfs/path.h similarity index 100% rename from servers/vfs/path.h rename to minix/servers/vfs/path.h diff --git a/servers/vfs/pipe.c b/minix/servers/vfs/pipe.c similarity index 100% rename from servers/vfs/pipe.c rename to minix/servers/vfs/pipe.c diff --git a/servers/vfs/protect.c b/minix/servers/vfs/protect.c similarity index 100% rename from servers/vfs/protect.c rename to minix/servers/vfs/protect.c diff --git a/servers/vfs/proto.h b/minix/servers/vfs/proto.h similarity index 100% rename from servers/vfs/proto.h rename to minix/servers/vfs/proto.h diff --git a/servers/vfs/read.c b/minix/servers/vfs/read.c similarity index 100% rename from servers/vfs/read.c rename to minix/servers/vfs/read.c diff --git a/servers/vfs/request.c b/minix/servers/vfs/request.c similarity index 100% rename from servers/vfs/request.c rename to minix/servers/vfs/request.c diff --git a/servers/vfs/request.h b/minix/servers/vfs/request.h similarity index 100% rename from servers/vfs/request.h rename to minix/servers/vfs/request.h diff --git a/servers/vfs/scratchpad.h b/minix/servers/vfs/scratchpad.h similarity index 100% rename from servers/vfs/scratchpad.h rename to minix/servers/vfs/scratchpad.h diff --git a/servers/vfs/select.c b/minix/servers/vfs/select.c similarity index 100% rename from servers/vfs/select.c rename to minix/servers/vfs/select.c diff --git a/servers/vfs/stadir.c b/minix/servers/vfs/stadir.c similarity index 100% rename from servers/vfs/stadir.c rename to minix/servers/vfs/stadir.c diff --git a/servers/vfs/table.c b/minix/servers/vfs/table.c similarity index 100% rename from servers/vfs/table.c rename to minix/servers/vfs/table.c diff --git a/servers/vfs/threads.h b/minix/servers/vfs/threads.h similarity index 100% rename from servers/vfs/threads.h rename to minix/servers/vfs/threads.h diff --git a/servers/vfs/time.c b/minix/servers/vfs/time.c similarity index 100% rename from servers/vfs/time.c rename to minix/servers/vfs/time.c diff --git a/servers/vfs/tll.c b/minix/servers/vfs/tll.c similarity index 100% rename from servers/vfs/tll.c rename to minix/servers/vfs/tll.c diff --git a/servers/vfs/tll.h b/minix/servers/vfs/tll.h similarity index 100% rename from servers/vfs/tll.h rename to minix/servers/vfs/tll.h diff --git a/servers/vfs/type.h b/minix/servers/vfs/type.h similarity index 100% rename from servers/vfs/type.h rename to minix/servers/vfs/type.h diff --git a/servers/vfs/utility.c b/minix/servers/vfs/utility.c similarity index 100% rename from servers/vfs/utility.c rename to minix/servers/vfs/utility.c diff --git a/servers/vfs/vmnt.c b/minix/servers/vfs/vmnt.c similarity index 100% rename from servers/vfs/vmnt.c rename to minix/servers/vfs/vmnt.c diff --git a/servers/vfs/vmnt.h b/minix/servers/vfs/vmnt.h similarity index 100% rename from servers/vfs/vmnt.h rename to minix/servers/vfs/vmnt.h diff --git a/servers/vfs/vnode.c b/minix/servers/vfs/vnode.c similarity index 100% rename from servers/vfs/vnode.c rename to minix/servers/vfs/vnode.c diff --git a/servers/vfs/vnode.h b/minix/servers/vfs/vnode.h similarity index 100% rename from servers/vfs/vnode.h rename to minix/servers/vfs/vnode.h diff --git a/servers/vfs/worker.c b/minix/servers/vfs/worker.c similarity index 100% rename from servers/vfs/worker.c rename to minix/servers/vfs/worker.c diff --git a/servers/vfs/write.c b/minix/servers/vfs/write.c similarity index 100% rename from servers/vfs/write.c rename to minix/servers/vfs/write.c diff --git a/servers/vm/Makefile b/minix/servers/vm/Makefile similarity index 94% rename from servers/vm/Makefile rename to minix/servers/vm/Makefile index fa81bca61..c084a068f 100644 --- a/servers/vm/Makefile +++ b/minix/servers/vm/Makefile @@ -22,7 +22,7 @@ MAN= BINDIR?= /usr/sbin CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} -CPPFLAGS+= -I${NETBSDSRCDIR} +CPPFLAGS+= -I${NETBSDSRCDIR}/minix .include "arch/${MACHINE_ARCH}/Makefile.inc" .include diff --git a/servers/vm/acl.c b/minix/servers/vm/acl.c similarity index 100% rename from servers/vm/acl.c rename to minix/servers/vm/acl.c diff --git a/servers/vm/alloc.c b/minix/servers/vm/alloc.c similarity index 100% rename from servers/vm/alloc.c rename to minix/servers/vm/alloc.c diff --git a/servers/vm/arch/i386/Makefile.inc b/minix/servers/vm/arch/earm/Makefile.inc similarity index 100% rename from servers/vm/arch/i386/Makefile.inc rename to minix/servers/vm/arch/earm/Makefile.inc diff --git a/servers/vm/arch/earm/pagetable.h b/minix/servers/vm/arch/earm/pagetable.h similarity index 100% rename from servers/vm/arch/earm/pagetable.h rename to minix/servers/vm/arch/earm/pagetable.h diff --git a/servers/vm/arch/earm/vm.lds b/minix/servers/vm/arch/earm/vm.lds similarity index 100% rename from servers/vm/arch/earm/vm.lds rename to minix/servers/vm/arch/earm/vm.lds diff --git a/servers/vm/arch/earm/Makefile.inc b/minix/servers/vm/arch/i386/Makefile.inc similarity index 54% rename from servers/vm/arch/earm/Makefile.inc rename to minix/servers/vm/arch/i386/Makefile.inc index bbd115b05..27456c4b8 100644 --- a/servers/vm/arch/earm/Makefile.inc +++ b/minix/servers/vm/arch/i386/Makefile.inc @@ -1,3 +1,4 @@ .include #Arch-specific sources +.PATH: ${.CURDIR}/arch/${MACHINE_ARCH} diff --git a/servers/vm/arch/i386/pagetable.h b/minix/servers/vm/arch/i386/pagetable.h similarity index 100% rename from servers/vm/arch/i386/pagetable.h rename to minix/servers/vm/arch/i386/pagetable.h diff --git a/servers/vm/break.c b/minix/servers/vm/break.c similarity index 100% rename from servers/vm/break.c rename to minix/servers/vm/break.c diff --git a/servers/vm/cache.c b/minix/servers/vm/cache.c similarity index 100% rename from servers/vm/cache.c rename to minix/servers/vm/cache.c diff --git a/servers/vm/cache.h b/minix/servers/vm/cache.h similarity index 100% rename from servers/vm/cache.h rename to minix/servers/vm/cache.h diff --git a/servers/vm/cavl_if.h b/minix/servers/vm/cavl_if.h similarity index 100% rename from servers/vm/cavl_if.h rename to minix/servers/vm/cavl_if.h diff --git a/servers/vm/cavl_impl.h b/minix/servers/vm/cavl_impl.h similarity index 100% rename from servers/vm/cavl_impl.h rename to minix/servers/vm/cavl_impl.h diff --git a/servers/vm/exit.c b/minix/servers/vm/exit.c similarity index 100% rename from servers/vm/exit.c rename to minix/servers/vm/exit.c diff --git a/servers/vm/fdref.c b/minix/servers/vm/fdref.c similarity index 100% rename from servers/vm/fdref.c rename to minix/servers/vm/fdref.c diff --git a/servers/vm/fdref.h b/minix/servers/vm/fdref.h similarity index 100% rename from servers/vm/fdref.h rename to minix/servers/vm/fdref.h diff --git a/servers/vm/fork.c b/minix/servers/vm/fork.c similarity index 100% rename from servers/vm/fork.c rename to minix/servers/vm/fork.c diff --git a/servers/vm/glo.h b/minix/servers/vm/glo.h similarity index 100% rename from servers/vm/glo.h rename to minix/servers/vm/glo.h diff --git a/servers/vm/main.c b/minix/servers/vm/main.c similarity index 100% rename from servers/vm/main.c rename to minix/servers/vm/main.c diff --git a/servers/vm/mem_anon.c b/minix/servers/vm/mem_anon.c similarity index 100% rename from servers/vm/mem_anon.c rename to minix/servers/vm/mem_anon.c diff --git a/servers/vm/mem_anon_contig.c b/minix/servers/vm/mem_anon_contig.c similarity index 100% rename from servers/vm/mem_anon_contig.c rename to minix/servers/vm/mem_anon_contig.c diff --git a/servers/vm/mem_cache.c b/minix/servers/vm/mem_cache.c similarity index 100% rename from servers/vm/mem_cache.c rename to minix/servers/vm/mem_cache.c diff --git a/servers/vm/mem_directphys.c b/minix/servers/vm/mem_directphys.c similarity index 100% rename from servers/vm/mem_directphys.c rename to minix/servers/vm/mem_directphys.c diff --git a/servers/vm/mem_file.c b/minix/servers/vm/mem_file.c similarity index 100% rename from servers/vm/mem_file.c rename to minix/servers/vm/mem_file.c diff --git a/servers/vm/mem_shared.c b/minix/servers/vm/mem_shared.c similarity index 100% rename from servers/vm/mem_shared.c rename to minix/servers/vm/mem_shared.c diff --git a/servers/vm/memlist.h b/minix/servers/vm/memlist.h similarity index 100% rename from servers/vm/memlist.h rename to minix/servers/vm/memlist.h diff --git a/servers/vm/memtype.h b/minix/servers/vm/memtype.h similarity index 100% rename from servers/vm/memtype.h rename to minix/servers/vm/memtype.h diff --git a/servers/vm/mmap.c b/minix/servers/vm/mmap.c similarity index 100% rename from servers/vm/mmap.c rename to minix/servers/vm/mmap.c diff --git a/servers/vm/pagefaults.c b/minix/servers/vm/pagefaults.c similarity index 100% rename from servers/vm/pagefaults.c rename to minix/servers/vm/pagefaults.c diff --git a/servers/vm/pagetable.c b/minix/servers/vm/pagetable.c similarity index 100% rename from servers/vm/pagetable.c rename to minix/servers/vm/pagetable.c diff --git a/servers/vm/pb.c b/minix/servers/vm/pb.c similarity index 100% rename from servers/vm/pb.c rename to minix/servers/vm/pb.c diff --git a/servers/vm/phys_region.h b/minix/servers/vm/phys_region.h similarity index 100% rename from servers/vm/phys_region.h rename to minix/servers/vm/phys_region.h diff --git a/servers/vm/proto.h b/minix/servers/vm/proto.h similarity index 100% rename from servers/vm/proto.h rename to minix/servers/vm/proto.h diff --git a/servers/vm/pt.h b/minix/servers/vm/pt.h similarity index 100% rename from servers/vm/pt.h rename to minix/servers/vm/pt.h diff --git a/servers/vm/queryexit.c b/minix/servers/vm/queryexit.c similarity index 100% rename from servers/vm/queryexit.c rename to minix/servers/vm/queryexit.c diff --git a/servers/vm/region.c b/minix/servers/vm/region.c similarity index 100% rename from servers/vm/region.c rename to minix/servers/vm/region.c diff --git a/servers/vm/region.h b/minix/servers/vm/region.h similarity index 100% rename from servers/vm/region.h rename to minix/servers/vm/region.h diff --git a/servers/vm/regionavl.c b/minix/servers/vm/regionavl.c similarity index 100% rename from servers/vm/regionavl.c rename to minix/servers/vm/regionavl.c diff --git a/servers/vm/regionavl.h b/minix/servers/vm/regionavl.h similarity index 100% rename from servers/vm/regionavl.h rename to minix/servers/vm/regionavl.h diff --git a/servers/vm/regionavl_defs.h b/minix/servers/vm/regionavl_defs.h similarity index 100% rename from servers/vm/regionavl_defs.h rename to minix/servers/vm/regionavl_defs.h diff --git a/servers/vm/rs.c b/minix/servers/vm/rs.c similarity index 100% rename from servers/vm/rs.c rename to minix/servers/vm/rs.c diff --git a/servers/vm/sanitycheck.h b/minix/servers/vm/sanitycheck.h similarity index 100% rename from servers/vm/sanitycheck.h rename to minix/servers/vm/sanitycheck.h diff --git a/servers/vm/slaballoc.c b/minix/servers/vm/slaballoc.c similarity index 100% rename from servers/vm/slaballoc.c rename to minix/servers/vm/slaballoc.c diff --git a/servers/vm/unavl.h b/minix/servers/vm/unavl.h similarity index 100% rename from servers/vm/unavl.h rename to minix/servers/vm/unavl.h diff --git a/servers/vm/util.h b/minix/servers/vm/util.h similarity index 100% rename from servers/vm/util.h rename to minix/servers/vm/util.h diff --git a/servers/vm/utility.c b/minix/servers/vm/utility.c similarity index 100% rename from servers/vm/utility.c rename to minix/servers/vm/utility.c diff --git a/servers/vm/vfs.c b/minix/servers/vm/vfs.c similarity index 100% rename from servers/vm/vfs.c rename to minix/servers/vm/vfs.c diff --git a/servers/vm/vm.h b/minix/servers/vm/vm.h similarity index 100% rename from servers/vm/vm.h rename to minix/servers/vm/vm.h diff --git a/servers/vm/vmproc.h b/minix/servers/vm/vmproc.h similarity index 100% rename from servers/vm/vmproc.h rename to minix/servers/vm/vmproc.h diff --git a/minix/share/Makefile b/minix/share/Makefile new file mode 100644 index 000000000..df43d38bb --- /dev/null +++ b/minix/share/Makefile @@ -0,0 +1,7 @@ +# $NetBSD: Makefile,v 1.18 2012/06/14 04:14:36 riz Exp $ + +.if ${MACHINE_ARCH} == "earm" +SUBDIR+= beaglebone +.endif # ${MACHINE_ARCH} == "earm" + +.include diff --git a/minix/share/Makefile.inc b/minix/share/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/share/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/share/beaglebone/Makefile b/minix/share/beaglebone/Makefile similarity index 100% rename from share/beaglebone/Makefile rename to minix/share/beaglebone/Makefile diff --git a/minix/share/beaglebone/Makefile.inc b/minix/share/beaglebone/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/share/beaglebone/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/share/beaglebone/weather/LICENSE b/minix/share/beaglebone/weather/LICENSE similarity index 100% rename from share/beaglebone/weather/LICENSE rename to minix/share/beaglebone/weather/LICENSE diff --git a/share/beaglebone/weather/Makefile b/minix/share/beaglebone/weather/Makefile similarity index 99% rename from share/beaglebone/weather/Makefile rename to minix/share/beaglebone/weather/Makefile index b8c4c9348..19c530d81 100644 --- a/share/beaglebone/weather/Makefile +++ b/minix/share/beaglebone/weather/Makefile @@ -1,5 +1,4 @@ # BeagleBone Weather Cape Demo - .include NOOBJ= # defined diff --git a/share/beaglebone/weather/README.txt b/minix/share/beaglebone/weather/README.txt similarity index 100% rename from share/beaglebone/weather/README.txt rename to minix/share/beaglebone/weather/README.txt diff --git a/share/beaglebone/weather/index.html b/minix/share/beaglebone/weather/index.html similarity index 100% rename from share/beaglebone/weather/index.html rename to minix/share/beaglebone/weather/index.html diff --git a/share/beaglebone/weather/jquery.js b/minix/share/beaglebone/weather/jquery.js similarity index 100% rename from share/beaglebone/weather/jquery.js rename to minix/share/beaglebone/weather/jquery.js diff --git a/share/beaglebone/weather/processing.js b/minix/share/beaglebone/weather/processing.js similarity index 100% rename from share/beaglebone/weather/processing.js rename to minix/share/beaglebone/weather/processing.js diff --git a/share/beaglebone/weather/spin.js b/minix/share/beaglebone/weather/spin.js similarity index 100% rename from share/beaglebone/weather/spin.js rename to minix/share/beaglebone/weather/spin.js diff --git a/share/beaglebone/weather/style.css b/minix/share/beaglebone/weather/style.css similarity index 100% rename from share/beaglebone/weather/style.css rename to minix/share/beaglebone/weather/style.css diff --git a/share/beaglebone/weather/weatherstation.js b/minix/share/beaglebone/weather/weatherstation.js similarity index 100% rename from share/beaglebone/weather/weatherstation.js rename to minix/share/beaglebone/weather/weatherstation.js diff --git a/share/beaglebone/weather/weatherstation.lua b/minix/share/beaglebone/weather/weatherstation.lua similarity index 100% rename from share/beaglebone/weather/weatherstation.lua rename to minix/share/beaglebone/weather/weatherstation.lua diff --git a/test/Makefile b/minix/tests/Makefile similarity index 100% rename from test/Makefile rename to minix/tests/Makefile diff --git a/minix/tests/Makefile.inc b/minix/tests/Makefile.inc new file mode 100644 index 000000000..01b5f2341 --- /dev/null +++ b/minix/tests/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/test/blocktest/Makefile b/minix/tests/blocktest/Makefile similarity index 100% rename from test/blocktest/Makefile rename to minix/tests/blocktest/Makefile diff --git a/test/blocktest/Makefile.inc b/minix/tests/blocktest/Makefile.inc similarity index 100% rename from test/blocktest/Makefile.inc rename to minix/tests/blocktest/Makefile.inc diff --git a/test/blocktest/README b/minix/tests/blocktest/README similarity index 100% rename from test/blocktest/README rename to minix/tests/blocktest/README diff --git a/test/blocktest/blocktest.c b/minix/tests/blocktest/blocktest.c similarity index 100% rename from test/blocktest/blocktest.c rename to minix/tests/blocktest/blocktest.c diff --git a/test/blocktest/support.sh b/minix/tests/blocktest/support.sh similarity index 100% rename from test/blocktest/support.sh rename to minix/tests/blocktest/support.sh diff --git a/test/blocktest/system.conf b/minix/tests/blocktest/system.conf similarity index 100% rename from test/blocktest/system.conf rename to minix/tests/blocktest/system.conf diff --git a/test/blocktest/test.sh b/minix/tests/blocktest/test.sh similarity index 100% rename from test/blocktest/test.sh rename to minix/tests/blocktest/test.sh diff --git a/test/common.c b/minix/tests/common.c similarity index 100% rename from test/common.c rename to minix/tests/common.c diff --git a/test/common.h b/minix/tests/common.h similarity index 100% rename from test/common.h rename to minix/tests/common.h diff --git a/test/ddekit/Makefile b/minix/tests/ddekit/Makefile similarity index 100% rename from test/ddekit/Makefile rename to minix/tests/ddekit/Makefile diff --git a/test/ddekit/ddekittest.sh b/minix/tests/ddekit/ddekittest.sh similarity index 100% rename from test/ddekit/ddekittest.sh rename to minix/tests/ddekit/ddekittest.sh diff --git a/test/ddekit/ddekittest_driver.c b/minix/tests/ddekit/ddekittest_driver.c similarity index 100% rename from test/ddekit/ddekittest_driver.c rename to minix/tests/ddekit/ddekittest_driver.c diff --git a/test/ddekit/system.conf b/minix/tests/ddekit/system.conf similarity index 100% rename from test/ddekit/system.conf rename to minix/tests/ddekit/system.conf diff --git a/test/ds/Makefile b/minix/tests/ds/Makefile similarity index 100% rename from test/ds/Makefile rename to minix/tests/ds/Makefile diff --git a/test/ds/Makefile.inc b/minix/tests/ds/Makefile.inc similarity index 100% rename from test/ds/Makefile.inc rename to minix/tests/ds/Makefile.inc diff --git a/test/ds/README b/minix/tests/ds/README similarity index 100% rename from test/ds/README rename to minix/tests/ds/README diff --git a/test/ds/dstest.c b/minix/tests/ds/dstest.c similarity index 100% rename from test/ds/dstest.c rename to minix/tests/ds/dstest.c diff --git a/test/ds/inc.h b/minix/tests/ds/inc.h similarity index 100% rename from test/ds/inc.h rename to minix/tests/ds/inc.h diff --git a/test/ds/run b/minix/tests/ds/run similarity index 100% rename from test/ds/run rename to minix/tests/ds/run diff --git a/test/ds/subs.c b/minix/tests/ds/subs.c similarity index 100% rename from test/ds/subs.c rename to minix/tests/ds/subs.c diff --git a/test/ds/system.conf b/minix/tests/ds/system.conf similarity index 100% rename from test/ds/system.conf rename to minix/tests/ds/system.conf diff --git a/test/fbdtest/Makefile b/minix/tests/fbdtest/Makefile similarity index 100% rename from test/fbdtest/Makefile rename to minix/tests/fbdtest/Makefile diff --git a/test/fbdtest/rwblocks.c b/minix/tests/fbdtest/rwblocks.c similarity index 100% rename from test/fbdtest/rwblocks.c rename to minix/tests/fbdtest/rwblocks.c diff --git a/test/fbdtest/test.sh b/minix/tests/fbdtest/test.sh similarity index 100% rename from test/fbdtest/test.sh rename to minix/tests/fbdtest/test.sh diff --git a/test/ipc/Makefile b/minix/tests/ipc/Makefile similarity index 100% rename from test/ipc/Makefile rename to minix/tests/ipc/Makefile diff --git a/test/ipc/lib/Makefile b/minix/tests/ipc/lib/Makefile similarity index 100% rename from test/ipc/lib/Makefile rename to minix/tests/ipc/lib/Makefile diff --git a/test/ipc/lib/ipcmsg.h b/minix/tests/ipc/lib/ipcmsg.h similarity index 100% rename from test/ipc/lib/ipcmsg.h rename to minix/tests/ipc/lib/ipcmsg.h diff --git a/test/ipc/lib/ipcsem.h b/minix/tests/ipc/lib/ipcsem.h similarity index 100% rename from test/ipc/lib/ipcsem.h rename to minix/tests/ipc/lib/ipcsem.h diff --git a/test/ipc/lib/ipcshm.h b/minix/tests/ipc/lib/ipcshm.h similarity index 100% rename from test/ipc/lib/ipcshm.h rename to minix/tests/ipc/lib/ipcshm.h diff --git a/test/ipc/lib/libipc.c b/minix/tests/ipc/lib/libipc.c similarity index 100% rename from test/ipc/lib/libipc.c rename to minix/tests/ipc/lib/libipc.c diff --git a/test/ipc/lib/parse_opts.c b/minix/tests/ipc/lib/parse_opts.c similarity index 100% rename from test/ipc/lib/parse_opts.c rename to minix/tests/ipc/lib/parse_opts.c diff --git a/test/ipc/lib/rmobj.c b/minix/tests/ipc/lib/rmobj.c similarity index 100% rename from test/ipc/lib/rmobj.c rename to minix/tests/ipc/lib/rmobj.c diff --git a/test/ipc/lib/rmobj.h b/minix/tests/ipc/lib/rmobj.h similarity index 100% rename from test/ipc/lib/rmobj.h rename to minix/tests/ipc/lib/rmobj.h diff --git a/test/ipc/lib/test.h b/minix/tests/ipc/lib/test.h similarity index 100% rename from test/ipc/lib/test.h rename to minix/tests/ipc/lib/test.h diff --git a/test/ipc/lib/tst_res.c b/minix/tests/ipc/lib/tst_res.c similarity index 100% rename from test/ipc/lib/tst_res.c rename to minix/tests/ipc/lib/tst_res.c diff --git a/test/ipc/lib/tst_sig.c b/minix/tests/ipc/lib/tst_sig.c similarity index 100% rename from test/ipc/lib/tst_sig.c rename to minix/tests/ipc/lib/tst_sig.c diff --git a/test/ipc/lib/tst_tmpdir.c b/minix/tests/ipc/lib/tst_tmpdir.c similarity index 100% rename from test/ipc/lib/tst_tmpdir.c rename to minix/tests/ipc/lib/tst_tmpdir.c diff --git a/test/ipc/lib/usctest.h b/minix/tests/ipc/lib/usctest.h similarity index 100% rename from test/ipc/lib/usctest.h rename to minix/tests/ipc/lib/usctest.h diff --git a/test/ipc/semctl/Makefile b/minix/tests/ipc/semctl/Makefile similarity index 100% rename from test/ipc/semctl/Makefile rename to minix/tests/ipc/semctl/Makefile diff --git a/test/ipc/semctl/semctl01.c b/minix/tests/ipc/semctl/semctl01.c similarity index 100% rename from test/ipc/semctl/semctl01.c rename to minix/tests/ipc/semctl/semctl01.c diff --git a/test/ipc/semctl/semctl02.c b/minix/tests/ipc/semctl/semctl02.c similarity index 100% rename from test/ipc/semctl/semctl02.c rename to minix/tests/ipc/semctl/semctl02.c diff --git a/test/ipc/semctl/semctl03.c b/minix/tests/ipc/semctl/semctl03.c similarity index 100% rename from test/ipc/semctl/semctl03.c rename to minix/tests/ipc/semctl/semctl03.c diff --git a/test/ipc/semctl/semctl04.c b/minix/tests/ipc/semctl/semctl04.c similarity index 100% rename from test/ipc/semctl/semctl04.c rename to minix/tests/ipc/semctl/semctl04.c diff --git a/test/ipc/semctl/semctl05.c b/minix/tests/ipc/semctl/semctl05.c similarity index 100% rename from test/ipc/semctl/semctl05.c rename to minix/tests/ipc/semctl/semctl05.c diff --git a/test/ipc/semctl/semctl06.c b/minix/tests/ipc/semctl/semctl06.c similarity index 100% rename from test/ipc/semctl/semctl06.c rename to minix/tests/ipc/semctl/semctl06.c diff --git a/test/ipc/semctl/semctl07.c b/minix/tests/ipc/semctl/semctl07.c similarity index 100% rename from test/ipc/semctl/semctl07.c rename to minix/tests/ipc/semctl/semctl07.c diff --git a/test/ipc/semctl/test.sh b/minix/tests/ipc/semctl/test.sh similarity index 100% rename from test/ipc/semctl/test.sh rename to minix/tests/ipc/semctl/test.sh diff --git a/test/ipc/semget/Makefile b/minix/tests/ipc/semget/Makefile similarity index 100% rename from test/ipc/semget/Makefile rename to minix/tests/ipc/semget/Makefile diff --git a/test/ipc/semget/semget01.c b/minix/tests/ipc/semget/semget01.c similarity index 100% rename from test/ipc/semget/semget01.c rename to minix/tests/ipc/semget/semget01.c diff --git a/test/ipc/semget/semget02.c b/minix/tests/ipc/semget/semget02.c similarity index 100% rename from test/ipc/semget/semget02.c rename to minix/tests/ipc/semget/semget02.c diff --git a/test/ipc/semget/semget03.c b/minix/tests/ipc/semget/semget03.c similarity index 100% rename from test/ipc/semget/semget03.c rename to minix/tests/ipc/semget/semget03.c diff --git a/test/ipc/semget/semget05.c b/minix/tests/ipc/semget/semget05.c similarity index 100% rename from test/ipc/semget/semget05.c rename to minix/tests/ipc/semget/semget05.c diff --git a/test/ipc/semget/semget06.c b/minix/tests/ipc/semget/semget06.c similarity index 100% rename from test/ipc/semget/semget06.c rename to minix/tests/ipc/semget/semget06.c diff --git a/test/ipc/semget/test.sh b/minix/tests/ipc/semget/test.sh similarity index 100% rename from test/ipc/semget/test.sh rename to minix/tests/ipc/semget/test.sh diff --git a/test/ipc/semop/Makefile b/minix/tests/ipc/semop/Makefile similarity index 100% rename from test/ipc/semop/Makefile rename to minix/tests/ipc/semop/Makefile diff --git a/test/ipc/semop/semop01.c b/minix/tests/ipc/semop/semop01.c similarity index 100% rename from test/ipc/semop/semop01.c rename to minix/tests/ipc/semop/semop01.c diff --git a/test/ipc/semop/semop02.c b/minix/tests/ipc/semop/semop02.c similarity index 100% rename from test/ipc/semop/semop02.c rename to minix/tests/ipc/semop/semop02.c diff --git a/test/ipc/semop/semop03.c b/minix/tests/ipc/semop/semop03.c similarity index 100% rename from test/ipc/semop/semop03.c rename to minix/tests/ipc/semop/semop03.c diff --git a/test/ipc/semop/semop04.c b/minix/tests/ipc/semop/semop04.c similarity index 100% rename from test/ipc/semop/semop04.c rename to minix/tests/ipc/semop/semop04.c diff --git a/test/ipc/semop/semop05.c b/minix/tests/ipc/semop/semop05.c similarity index 100% rename from test/ipc/semop/semop05.c rename to minix/tests/ipc/semop/semop05.c diff --git a/test/ipc/semop/test.sh b/minix/tests/ipc/semop/test.sh similarity index 100% rename from test/ipc/semop/test.sh rename to minix/tests/ipc/semop/test.sh diff --git a/test/ipc/shmat/Makefile b/minix/tests/ipc/shmat/Makefile similarity index 100% rename from test/ipc/shmat/Makefile rename to minix/tests/ipc/shmat/Makefile diff --git a/test/ipc/shmat/shmat01.c b/minix/tests/ipc/shmat/shmat01.c similarity index 100% rename from test/ipc/shmat/shmat01.c rename to minix/tests/ipc/shmat/shmat01.c diff --git a/test/ipc/shmat/shmat02.c b/minix/tests/ipc/shmat/shmat02.c similarity index 100% rename from test/ipc/shmat/shmat02.c rename to minix/tests/ipc/shmat/shmat02.c diff --git a/test/ipc/shmat/shmat03.c b/minix/tests/ipc/shmat/shmat03.c similarity index 100% rename from test/ipc/shmat/shmat03.c rename to minix/tests/ipc/shmat/shmat03.c diff --git a/test/ipc/shmat/test.sh b/minix/tests/ipc/shmat/test.sh similarity index 100% rename from test/ipc/shmat/test.sh rename to minix/tests/ipc/shmat/test.sh diff --git a/test/ipc/shmctl/Makefile b/minix/tests/ipc/shmctl/Makefile similarity index 100% rename from test/ipc/shmctl/Makefile rename to minix/tests/ipc/shmctl/Makefile diff --git a/test/ipc/shmctl/shmctl01.c b/minix/tests/ipc/shmctl/shmctl01.c similarity index 100% rename from test/ipc/shmctl/shmctl01.c rename to minix/tests/ipc/shmctl/shmctl01.c diff --git a/test/ipc/shmctl/shmctl02.c b/minix/tests/ipc/shmctl/shmctl02.c similarity index 100% rename from test/ipc/shmctl/shmctl02.c rename to minix/tests/ipc/shmctl/shmctl02.c diff --git a/test/ipc/shmctl/shmctl03.c b/minix/tests/ipc/shmctl/shmctl03.c similarity index 100% rename from test/ipc/shmctl/shmctl03.c rename to minix/tests/ipc/shmctl/shmctl03.c diff --git a/test/ipc/shmctl/shmctl04.c b/minix/tests/ipc/shmctl/shmctl04.c similarity index 100% rename from test/ipc/shmctl/shmctl04.c rename to minix/tests/ipc/shmctl/shmctl04.c diff --git a/test/ipc/shmctl/test.sh b/minix/tests/ipc/shmctl/test.sh similarity index 100% rename from test/ipc/shmctl/test.sh rename to minix/tests/ipc/shmctl/test.sh diff --git a/test/ipc/shmdt/Makefile b/minix/tests/ipc/shmdt/Makefile similarity index 100% rename from test/ipc/shmdt/Makefile rename to minix/tests/ipc/shmdt/Makefile diff --git a/test/ipc/shmdt/shmdt01.c b/minix/tests/ipc/shmdt/shmdt01.c similarity index 100% rename from test/ipc/shmdt/shmdt01.c rename to minix/tests/ipc/shmdt/shmdt01.c diff --git a/test/ipc/shmdt/shmdt02.c b/minix/tests/ipc/shmdt/shmdt02.c similarity index 100% rename from test/ipc/shmdt/shmdt02.c rename to minix/tests/ipc/shmdt/shmdt02.c diff --git a/test/ipc/shmdt/test.sh b/minix/tests/ipc/shmdt/test.sh similarity index 100% rename from test/ipc/shmdt/test.sh rename to minix/tests/ipc/shmdt/test.sh diff --git a/test/ipc/shmget/Makefile b/minix/tests/ipc/shmget/Makefile similarity index 100% rename from test/ipc/shmget/Makefile rename to minix/tests/ipc/shmget/Makefile diff --git a/test/ipc/shmget/shmget01.c b/minix/tests/ipc/shmget/shmget01.c similarity index 100% rename from test/ipc/shmget/shmget01.c rename to minix/tests/ipc/shmget/shmget01.c diff --git a/test/ipc/shmget/shmget02.c b/minix/tests/ipc/shmget/shmget02.c similarity index 100% rename from test/ipc/shmget/shmget02.c rename to minix/tests/ipc/shmget/shmget02.c diff --git a/test/ipc/shmget/shmget04.c b/minix/tests/ipc/shmget/shmget04.c similarity index 100% rename from test/ipc/shmget/shmget04.c rename to minix/tests/ipc/shmget/shmget04.c diff --git a/test/ipc/shmget/shmget05.c b/minix/tests/ipc/shmget/shmget05.c similarity index 100% rename from test/ipc/shmget/shmget05.c rename to minix/tests/ipc/shmget/shmget05.c diff --git a/test/ipc/shmget/test.sh b/minix/tests/ipc/shmget/test.sh similarity index 100% rename from test/ipc/shmget/test.sh rename to minix/tests/ipc/shmget/test.sh diff --git a/test/ipc/shmt/Makefile b/minix/tests/ipc/shmt/Makefile similarity index 100% rename from test/ipc/shmt/Makefile rename to minix/tests/ipc/shmt/Makefile diff --git a/test/ipc/shmt/shmt01.c b/minix/tests/ipc/shmt/shmt01.c similarity index 100% rename from test/ipc/shmt/shmt01.c rename to minix/tests/ipc/shmt/shmt01.c diff --git a/test/ipc/shmt/shmt02.c b/minix/tests/ipc/shmt/shmt02.c similarity index 100% rename from test/ipc/shmt/shmt02.c rename to minix/tests/ipc/shmt/shmt02.c diff --git a/test/ipc/shmt/shmt03.c b/minix/tests/ipc/shmt/shmt03.c similarity index 100% rename from test/ipc/shmt/shmt03.c rename to minix/tests/ipc/shmt/shmt03.c diff --git a/test/ipc/shmt/shmt04.c b/minix/tests/ipc/shmt/shmt04.c similarity index 100% rename from test/ipc/shmt/shmt04.c rename to minix/tests/ipc/shmt/shmt04.c diff --git a/test/ipc/shmt/shmt05.c b/minix/tests/ipc/shmt/shmt05.c similarity index 100% rename from test/ipc/shmt/shmt05.c rename to minix/tests/ipc/shmt/shmt05.c diff --git a/test/ipc/shmt/shmt06.c b/minix/tests/ipc/shmt/shmt06.c similarity index 100% rename from test/ipc/shmt/shmt06.c rename to minix/tests/ipc/shmt/shmt06.c diff --git a/test/ipc/shmt/shmt07.c b/minix/tests/ipc/shmt/shmt07.c similarity index 100% rename from test/ipc/shmt/shmt07.c rename to minix/tests/ipc/shmt/shmt07.c diff --git a/test/ipc/shmt/shmt08.c b/minix/tests/ipc/shmt/shmt08.c similarity index 100% rename from test/ipc/shmt/shmt08.c rename to minix/tests/ipc/shmt/shmt08.c diff --git a/test/ipc/shmt/shmt10.c b/minix/tests/ipc/shmt/shmt10.c similarity index 100% rename from test/ipc/shmt/shmt10.c rename to minix/tests/ipc/shmt/shmt10.c diff --git a/test/ipc/shmt/test.sh b/minix/tests/ipc/shmt/test.sh similarity index 100% rename from test/ipc/shmt/test.sh rename to minix/tests/ipc/shmt/test.sh diff --git a/test/ipc/test.sh b/minix/tests/ipc/test.sh similarity index 100% rename from test/ipc/test.sh rename to minix/tests/ipc/test.sh diff --git a/test/kernel/run b/minix/tests/kernel/run similarity index 100% rename from test/kernel/run rename to minix/tests/kernel/run diff --git a/test/kernel/sys_padconf/Makefile b/minix/tests/kernel/sys_padconf/Makefile similarity index 100% rename from test/kernel/sys_padconf/Makefile rename to minix/tests/kernel/sys_padconf/Makefile diff --git a/test/kernel/sys_padconf/padconftest.c b/minix/tests/kernel/sys_padconf/padconftest.c similarity index 100% rename from test/kernel/sys_padconf/padconftest.c rename to minix/tests/kernel/sys_padconf/padconftest.c diff --git a/test/kernel/sys_padconf/run b/minix/tests/kernel/sys_padconf/run similarity index 100% rename from test/kernel/sys_padconf/run rename to minix/tests/kernel/sys_padconf/run diff --git a/test/kernel/sys_padconf/system.conf b/minix/tests/kernel/sys_padconf/system.conf similarity index 100% rename from test/kernel/sys_padconf/system.conf rename to minix/tests/kernel/sys_padconf/system.conf diff --git a/test/kernel/sys_vumap/Makefile b/minix/tests/kernel/sys_vumap/Makefile similarity index 100% rename from test/kernel/sys_vumap/Makefile rename to minix/tests/kernel/sys_vumap/Makefile diff --git a/test/kernel/sys_vumap/Makefile.inc b/minix/tests/kernel/sys_vumap/Makefile.inc similarity index 100% rename from test/kernel/sys_vumap/Makefile.inc rename to minix/tests/kernel/sys_vumap/Makefile.inc diff --git a/test/kernel/sys_vumap/com.h b/minix/tests/kernel/sys_vumap/com.h similarity index 100% rename from test/kernel/sys_vumap/com.h rename to minix/tests/kernel/sys_vumap/com.h diff --git a/test/kernel/sys_vumap/run b/minix/tests/kernel/sys_vumap/run similarity index 100% rename from test/kernel/sys_vumap/run rename to minix/tests/kernel/sys_vumap/run diff --git a/test/kernel/sys_vumap/system.conf b/minix/tests/kernel/sys_vumap/system.conf similarity index 100% rename from test/kernel/sys_vumap/system.conf rename to minix/tests/kernel/sys_vumap/system.conf diff --git a/test/kernel/sys_vumap/vumaprelay.c b/minix/tests/kernel/sys_vumap/vumaprelay.c similarity index 100% rename from test/kernel/sys_vumap/vumaprelay.c rename to minix/tests/kernel/sys_vumap/vumaprelay.c diff --git a/test/kernel/sys_vumap/vumaptest.c b/minix/tests/kernel/sys_vumap/vumaptest.c similarity index 100% rename from test/kernel/sys_vumap/vumaptest.c rename to minix/tests/kernel/sys_vumap/vumaptest.c diff --git a/test/magic.h b/minix/tests/magic.h similarity index 100% rename from test/magic.h rename to minix/tests/magic.h diff --git a/test/mod.c b/minix/tests/mod.c similarity index 100% rename from test/mod.c rename to minix/tests/mod.c diff --git a/test/run b/minix/tests/run similarity index 100% rename from test/run rename to minix/tests/run diff --git a/test/safecopy/Makefile b/minix/tests/safecopy/Makefile similarity index 100% rename from test/safecopy/Makefile rename to minix/tests/safecopy/Makefile diff --git a/test/safecopy/README b/minix/tests/safecopy/README similarity index 100% rename from test/safecopy/README rename to minix/tests/safecopy/README diff --git a/test/safecopy/down b/minix/tests/safecopy/down similarity index 100% rename from test/safecopy/down rename to minix/tests/safecopy/down diff --git a/test/safecopy/grantor.c b/minix/tests/safecopy/grantor.c similarity index 100% rename from test/safecopy/grantor.c rename to minix/tests/safecopy/grantor.c diff --git a/test/safecopy/inc.h b/minix/tests/safecopy/inc.h similarity index 100% rename from test/safecopy/inc.h rename to minix/tests/safecopy/inc.h diff --git a/test/safecopy/requestor.c b/minix/tests/safecopy/requestor.c similarity index 100% rename from test/safecopy/requestor.c rename to minix/tests/safecopy/requestor.c diff --git a/test/safecopy/run b/minix/tests/safecopy/run similarity index 100% rename from test/safecopy/run rename to minix/tests/safecopy/run diff --git a/test/safecopy/system.conf b/minix/tests/safecopy/system.conf similarity index 100% rename from test/safecopy/system.conf rename to minix/tests/safecopy/system.conf diff --git a/test/t10a.c b/minix/tests/t10a.c similarity index 100% rename from test/t10a.c rename to minix/tests/t10a.c diff --git a/test/t11a.c b/minix/tests/t11a.c similarity index 100% rename from test/t11a.c rename to minix/tests/t11a.c diff --git a/test/t11b.c b/minix/tests/t11b.c similarity index 100% rename from test/t11b.c rename to minix/tests/t11b.c diff --git a/test/t40a.c b/minix/tests/t40a.c similarity index 100% rename from test/t40a.c rename to minix/tests/t40a.c diff --git a/test/t40b.c b/minix/tests/t40b.c similarity index 100% rename from test/t40b.c rename to minix/tests/t40b.c diff --git a/test/t40c.c b/minix/tests/t40c.c similarity index 100% rename from test/t40c.c rename to minix/tests/t40c.c diff --git a/test/t40d.c b/minix/tests/t40d.c similarity index 100% rename from test/t40d.c rename to minix/tests/t40d.c diff --git a/test/t40e.c b/minix/tests/t40e.c similarity index 100% rename from test/t40e.c rename to minix/tests/t40e.c diff --git a/test/t40f.c b/minix/tests/t40f.c similarity index 100% rename from test/t40f.c rename to minix/tests/t40f.c diff --git a/test/t40g.c b/minix/tests/t40g.c similarity index 100% rename from test/t40g.c rename to minix/tests/t40g.c diff --git a/test/t60a.c b/minix/tests/t60a.c similarity index 100% rename from test/t60a.c rename to minix/tests/t60a.c diff --git a/test/t60b.c b/minix/tests/t60b.c similarity index 100% rename from test/t60b.c rename to minix/tests/t60b.c diff --git a/test/t67a.c b/minix/tests/t67a.c similarity index 100% rename from test/t67a.c rename to minix/tests/t67a.c diff --git a/test/t67b.c b/minix/tests/t67b.c similarity index 100% rename from test/t67b.c rename to minix/tests/t67b.c diff --git a/test/t68a.c b/minix/tests/t68a.c similarity index 100% rename from test/t68a.c rename to minix/tests/t68a.c diff --git a/test/t68b.c b/minix/tests/t68b.c similarity index 100% rename from test/t68b.c rename to minix/tests/t68b.c diff --git a/test/test1.c b/minix/tests/test1.c similarity index 100% rename from test/test1.c rename to minix/tests/test1.c diff --git a/test/test10.c b/minix/tests/test10.c similarity index 100% rename from test/test10.c rename to minix/tests/test10.c diff --git a/test/test11.c b/minix/tests/test11.c similarity index 100% rename from test/test11.c rename to minix/tests/test11.c diff --git a/test/test12.c b/minix/tests/test12.c similarity index 100% rename from test/test12.c rename to minix/tests/test12.c diff --git a/test/test13.c b/minix/tests/test13.c similarity index 100% rename from test/test13.c rename to minix/tests/test13.c diff --git a/test/test14.c b/minix/tests/test14.c similarity index 100% rename from test/test14.c rename to minix/tests/test14.c diff --git a/test/test15.c b/minix/tests/test15.c similarity index 100% rename from test/test15.c rename to minix/tests/test15.c diff --git a/test/test16.c b/minix/tests/test16.c similarity index 100% rename from test/test16.c rename to minix/tests/test16.c diff --git a/test/test17.c b/minix/tests/test17.c similarity index 100% rename from test/test17.c rename to minix/tests/test17.c diff --git a/test/test18.c b/minix/tests/test18.c similarity index 100% rename from test/test18.c rename to minix/tests/test18.c diff --git a/test/test19.c b/minix/tests/test19.c similarity index 100% rename from test/test19.c rename to minix/tests/test19.c diff --git a/test/test2.c b/minix/tests/test2.c similarity index 100% rename from test/test2.c rename to minix/tests/test2.c diff --git a/test/test20.c b/minix/tests/test20.c similarity index 100% rename from test/test20.c rename to minix/tests/test20.c diff --git a/test/test21.c b/minix/tests/test21.c similarity index 100% rename from test/test21.c rename to minix/tests/test21.c diff --git a/test/test22.c b/minix/tests/test22.c similarity index 100% rename from test/test22.c rename to minix/tests/test22.c diff --git a/test/test23.c b/minix/tests/test23.c similarity index 100% rename from test/test23.c rename to minix/tests/test23.c diff --git a/test/test24.c b/minix/tests/test24.c similarity index 100% rename from test/test24.c rename to minix/tests/test24.c diff --git a/test/test25.c b/minix/tests/test25.c similarity index 100% rename from test/test25.c rename to minix/tests/test25.c diff --git a/test/test26.c b/minix/tests/test26.c similarity index 100% rename from test/test26.c rename to minix/tests/test26.c diff --git a/test/test27.c b/minix/tests/test27.c similarity index 100% rename from test/test27.c rename to minix/tests/test27.c diff --git a/test/test28.c b/minix/tests/test28.c similarity index 100% rename from test/test28.c rename to minix/tests/test28.c diff --git a/test/test29.c b/minix/tests/test29.c similarity index 100% rename from test/test29.c rename to minix/tests/test29.c diff --git a/test/test3.c b/minix/tests/test3.c similarity index 100% rename from test/test3.c rename to minix/tests/test3.c diff --git a/test/test30.c b/minix/tests/test30.c similarity index 100% rename from test/test30.c rename to minix/tests/test30.c diff --git a/test/test31.c b/minix/tests/test31.c similarity index 100% rename from test/test31.c rename to minix/tests/test31.c diff --git a/test/test32.c b/minix/tests/test32.c similarity index 100% rename from test/test32.c rename to minix/tests/test32.c diff --git a/test/test33.c b/minix/tests/test33.c similarity index 100% rename from test/test33.c rename to minix/tests/test33.c diff --git a/test/test34.c b/minix/tests/test34.c similarity index 100% rename from test/test34.c rename to minix/tests/test34.c diff --git a/test/test35.c b/minix/tests/test35.c similarity index 100% rename from test/test35.c rename to minix/tests/test35.c diff --git a/test/test36.c b/minix/tests/test36.c similarity index 100% rename from test/test36.c rename to minix/tests/test36.c diff --git a/test/test37.c b/minix/tests/test37.c similarity index 100% rename from test/test37.c rename to minix/tests/test37.c diff --git a/test/test38.c b/minix/tests/test38.c similarity index 100% rename from test/test38.c rename to minix/tests/test38.c diff --git a/test/test39.c b/minix/tests/test39.c similarity index 100% rename from test/test39.c rename to minix/tests/test39.c diff --git a/test/test4.c b/minix/tests/test4.c similarity index 100% rename from test/test4.c rename to minix/tests/test4.c diff --git a/test/test40.c b/minix/tests/test40.c similarity index 100% rename from test/test40.c rename to minix/tests/test40.c diff --git a/test/test41.c b/minix/tests/test41.c similarity index 100% rename from test/test41.c rename to minix/tests/test41.c diff --git a/test/test42.c b/minix/tests/test42.c similarity index 100% rename from test/test42.c rename to minix/tests/test42.c diff --git a/test/test43.c b/minix/tests/test43.c similarity index 100% rename from test/test43.c rename to minix/tests/test43.c diff --git a/test/test44.c b/minix/tests/test44.c similarity index 100% rename from test/test44.c rename to minix/tests/test44.c diff --git a/test/test45.c b/minix/tests/test45.c similarity index 100% rename from test/test45.c rename to minix/tests/test45.c diff --git a/test/test45.h b/minix/tests/test45.h similarity index 100% rename from test/test45.h rename to minix/tests/test45.h diff --git a/test/test46.c b/minix/tests/test46.c similarity index 100% rename from test/test46.c rename to minix/tests/test46.c diff --git a/test/test47.c b/minix/tests/test47.c similarity index 100% rename from test/test47.c rename to minix/tests/test47.c diff --git a/test/test48.c b/minix/tests/test48.c similarity index 100% rename from test/test48.c rename to minix/tests/test48.c diff --git a/test/test49.c b/minix/tests/test49.c similarity index 100% rename from test/test49.c rename to minix/tests/test49.c diff --git a/test/test5.c b/minix/tests/test5.c similarity index 100% rename from test/test5.c rename to minix/tests/test5.c diff --git a/test/test50.c b/minix/tests/test50.c similarity index 100% rename from test/test50.c rename to minix/tests/test50.c diff --git a/test/test51.c b/minix/tests/test51.c similarity index 100% rename from test/test51.c rename to minix/tests/test51.c diff --git a/test/test52.c b/minix/tests/test52.c similarity index 100% rename from test/test52.c rename to minix/tests/test52.c diff --git a/test/test53.c b/minix/tests/test53.c similarity index 100% rename from test/test53.c rename to minix/tests/test53.c diff --git a/test/test54.c b/minix/tests/test54.c similarity index 100% rename from test/test54.c rename to minix/tests/test54.c diff --git a/test/test55.c b/minix/tests/test55.c similarity index 100% rename from test/test55.c rename to minix/tests/test55.c diff --git a/test/test56.c b/minix/tests/test56.c similarity index 100% rename from test/test56.c rename to minix/tests/test56.c diff --git a/test/test57.c b/minix/tests/test57.c similarity index 100% rename from test/test57.c rename to minix/tests/test57.c diff --git a/test/test57loop.S b/minix/tests/test57loop.S similarity index 100% rename from test/test57loop.S rename to minix/tests/test57loop.S diff --git a/test/test58.c b/minix/tests/test58.c similarity index 100% rename from test/test58.c rename to minix/tests/test58.c diff --git a/test/test59.c b/minix/tests/test59.c similarity index 100% rename from test/test59.c rename to minix/tests/test59.c diff --git a/test/test6.c b/minix/tests/test6.c similarity index 100% rename from test/test6.c rename to minix/tests/test6.c diff --git a/test/test60.c b/minix/tests/test60.c similarity index 100% rename from test/test60.c rename to minix/tests/test60.c diff --git a/test/test61.c b/minix/tests/test61.c similarity index 100% rename from test/test61.c rename to minix/tests/test61.c diff --git a/test/test62.c b/minix/tests/test62.c similarity index 100% rename from test/test62.c rename to minix/tests/test62.c diff --git a/test/test63.c b/minix/tests/test63.c similarity index 100% rename from test/test63.c rename to minix/tests/test63.c diff --git a/test/test64.c b/minix/tests/test64.c similarity index 100% rename from test/test64.c rename to minix/tests/test64.c diff --git a/test/test65.c b/minix/tests/test65.c similarity index 100% rename from test/test65.c rename to minix/tests/test65.c diff --git a/test/test66.c b/minix/tests/test66.c similarity index 100% rename from test/test66.c rename to minix/tests/test66.c diff --git a/test/test66expected.h b/minix/tests/test66expected.h similarity index 100% rename from test/test66expected.h rename to minix/tests/test66expected.h diff --git a/test/test67.c b/minix/tests/test67.c similarity index 100% rename from test/test67.c rename to minix/tests/test67.c diff --git a/test/test68.c b/minix/tests/test68.c similarity index 100% rename from test/test68.c rename to minix/tests/test68.c diff --git a/test/test69.c b/minix/tests/test69.c similarity index 100% rename from test/test69.c rename to minix/tests/test69.c diff --git a/test/test7.c b/minix/tests/test7.c similarity index 100% rename from test/test7.c rename to minix/tests/test7.c diff --git a/test/test70.c b/minix/tests/test70.c similarity index 100% rename from test/test70.c rename to minix/tests/test70.c diff --git a/test/test71.c b/minix/tests/test71.c similarity index 100% rename from test/test71.c rename to minix/tests/test71.c diff --git a/test/test72.c b/minix/tests/test72.c similarity index 100% rename from test/test72.c rename to minix/tests/test72.c diff --git a/test/test73.c b/minix/tests/test73.c similarity index 100% rename from test/test73.c rename to minix/tests/test73.c diff --git a/test/test74.c b/minix/tests/test74.c similarity index 100% rename from test/test74.c rename to minix/tests/test74.c diff --git a/test/test75.c b/minix/tests/test75.c similarity index 100% rename from test/test75.c rename to minix/tests/test75.c diff --git a/test/test76.c b/minix/tests/test76.c similarity index 100% rename from test/test76.c rename to minix/tests/test76.c diff --git a/test/test77.c b/minix/tests/test77.c similarity index 100% rename from test/test77.c rename to minix/tests/test77.c diff --git a/test/test78.c b/minix/tests/test78.c similarity index 100% rename from test/test78.c rename to minix/tests/test78.c diff --git a/test/test79.c b/minix/tests/test79.c similarity index 100% rename from test/test79.c rename to minix/tests/test79.c diff --git a/test/test8.c b/minix/tests/test8.c similarity index 100% rename from test/test8.c rename to minix/tests/test8.c diff --git a/test/test9.c b/minix/tests/test9.c similarity index 100% rename from test/test9.c rename to minix/tests/test9.c diff --git a/test/testcache.c b/minix/tests/testcache.c similarity index 100% rename from test/testcache.c rename to minix/tests/testcache.c diff --git a/test/testcache.h b/minix/tests/testcache.h similarity index 100% rename from test/testcache.h rename to minix/tests/testcache.h diff --git a/test/testinterp.sh b/minix/tests/testinterp.sh similarity index 100% rename from test/testinterp.sh rename to minix/tests/testinterp.sh diff --git a/test/testisofs.sh b/minix/tests/testisofs.sh similarity index 100% rename from test/testisofs.sh rename to minix/tests/testisofs.sh diff --git a/test/testkyua.sh b/minix/tests/testkyua.sh similarity index 100% rename from test/testkyua.sh rename to minix/tests/testkyua.sh diff --git a/test/testmfs.sh b/minix/tests/testmfs.sh similarity index 100% rename from test/testmfs.sh rename to minix/tests/testmfs.sh diff --git a/test/testsh1.sh b/minix/tests/testsh1.sh similarity index 100% rename from test/testsh1.sh rename to minix/tests/testsh1.sh diff --git a/test/testsh2.sh b/minix/tests/testsh2.sh similarity index 100% rename from test/testsh2.sh rename to minix/tests/testsh2.sh diff --git a/test/testvm.c b/minix/tests/testvm.c similarity index 100% rename from test/testvm.c rename to minix/tests/testvm.c diff --git a/test/testvm.conf b/minix/tests/testvm.conf similarity index 100% rename from test/testvm.conf rename to minix/tests/testvm.conf diff --git a/test/testvm.h b/minix/tests/testvm.h similarity index 100% rename from test/testvm.h rename to minix/tests/testvm.h diff --git a/test/testvnd.sh b/minix/tests/testvnd.sh similarity index 100% rename from test/testvnd.sh rename to minix/tests/testvnd.sh diff --git a/test/tvnd.c b/minix/tests/tvnd.c similarity index 100% rename from test/tvnd.c rename to minix/tests/tvnd.c diff --git a/minix/usr.bin/Makefile b/minix/usr.bin/Makefile new file mode 100644 index 000000000..1757d02b0 --- /dev/null +++ b/minix/usr.bin/Makefile @@ -0,0 +1,11 @@ +.include + +.if ${MACHINE_ARCH} == "earm" +SUBDIR+= eepromread +.endif # ${MACHINE_ARCH} == "earm" + +SUBDIR+= ministat +SUBDIR+= top +SUBDIR+= toproto + +.include diff --git a/minix/usr.bin/Makefile.inc b/minix/usr.bin/Makefile.inc new file mode 100644 index 000000000..554f1c377 --- /dev/null +++ b/minix/usr.bin/Makefile.inc @@ -0,0 +1,3 @@ +BINDIR?=/usr/bin + +.include "../Makefile.inc" diff --git a/commands/eepromread/Makefile b/minix/usr.bin/eepromread/Makefile similarity index 82% rename from commands/eepromread/Makefile rename to minix/usr.bin/eepromread/Makefile index 66c0b43cc..bf495bc60 100644 --- a/commands/eepromread/Makefile +++ b/minix/usr.bin/eepromread/Makefile @@ -1,5 +1,4 @@ PROG= eepromread SRCS= eepromread.c eepromread.h board_info.c -MAN= eepromread.1 .include diff --git a/commands/eepromread/board_info.c b/minix/usr.bin/eepromread/board_info.c similarity index 100% rename from commands/eepromread/board_info.c rename to minix/usr.bin/eepromread/board_info.c diff --git a/commands/eepromread/eepromread.1 b/minix/usr.bin/eepromread/eepromread.1 similarity index 100% rename from commands/eepromread/eepromread.1 rename to minix/usr.bin/eepromread/eepromread.1 diff --git a/commands/eepromread/eepromread.c b/minix/usr.bin/eepromread/eepromread.c similarity index 100% rename from commands/eepromread/eepromread.c rename to minix/usr.bin/eepromread/eepromread.c diff --git a/commands/eepromread/eepromread.h b/minix/usr.bin/eepromread/eepromread.h similarity index 100% rename from commands/eepromread/eepromread.h rename to minix/usr.bin/eepromread/eepromread.h diff --git a/usr.bin/ministat/Makefile b/minix/usr.bin/ministat/Makefile similarity index 99% rename from usr.bin/ministat/Makefile rename to minix/usr.bin/ministat/Makefile index 18faf3e9c..1168d558b 100644 --- a/usr.bin/ministat/Makefile +++ b/minix/usr.bin/ministat/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ PROG= ministat + DPADD= ${LIBM} LDADD= -lm diff --git a/usr.bin/ministat/README b/minix/usr.bin/ministat/README similarity index 100% rename from usr.bin/ministat/README rename to minix/usr.bin/ministat/README diff --git a/usr.bin/ministat/chameleon b/minix/usr.bin/ministat/chameleon similarity index 100% rename from usr.bin/ministat/chameleon rename to minix/usr.bin/ministat/chameleon diff --git a/usr.bin/ministat/iguana b/minix/usr.bin/ministat/iguana similarity index 100% rename from usr.bin/ministat/iguana rename to minix/usr.bin/ministat/iguana diff --git a/usr.bin/ministat/ministat.1 b/minix/usr.bin/ministat/ministat.1 similarity index 100% rename from usr.bin/ministat/ministat.1 rename to minix/usr.bin/ministat/ministat.1 diff --git a/usr.bin/ministat/ministat.c b/minix/usr.bin/ministat/ministat.c similarity index 100% rename from usr.bin/ministat/ministat.c rename to minix/usr.bin/ministat/ministat.c diff --git a/usr.bin/top/Makefile b/minix/usr.bin/top/Makefile similarity index 100% rename from usr.bin/top/Makefile rename to minix/usr.bin/top/Makefile diff --git a/usr.bin/top/top.c b/minix/usr.bin/top/top.c similarity index 100% rename from usr.bin/top/top.c rename to minix/usr.bin/top/top.c diff --git a/usr.bin/toproto/Makefile b/minix/usr.bin/toproto/Makefile similarity index 100% rename from usr.bin/toproto/Makefile rename to minix/usr.bin/toproto/Makefile diff --git a/usr.bin/toproto/toproto.c b/minix/usr.bin/toproto/toproto.c similarity index 100% rename from usr.bin/toproto/toproto.c rename to minix/usr.bin/toproto/toproto.c diff --git a/minix/usr.sbin/Makefile b/minix/usr.sbin/Makefile new file mode 100644 index 000000000..858722d6d --- /dev/null +++ b/minix/usr.sbin/Makefile @@ -0,0 +1,6 @@ +.include + +SUBDIR+= mkfs.mfs +SUBDIR+= mkproto + +.include diff --git a/minix/usr.sbin/Makefile.inc b/minix/usr.sbin/Makefile.inc new file mode 100644 index 000000000..9b2922093 --- /dev/null +++ b/minix/usr.sbin/Makefile.inc @@ -0,0 +1,4 @@ +BINDIR?=/usr/sbin +MAN?= + +.include "../Makefile.inc" diff --git a/usr.sbin/mkfs.mfs/Makefile b/minix/usr.sbin/mkfs.mfs/Makefile similarity index 100% rename from usr.sbin/mkfs.mfs/Makefile rename to minix/usr.sbin/mkfs.mfs/Makefile diff --git a/usr.sbin/mkfs.mfs/Makefile.mkfs b/minix/usr.sbin/mkfs.mfs/Makefile.mkfs similarity index 100% rename from usr.sbin/mkfs.mfs/Makefile.mkfs rename to minix/usr.sbin/mkfs.mfs/Makefile.mkfs diff --git a/usr.sbin/mkfs.mfs/mfs3v2/Makefile b/minix/usr.sbin/mkfs.mfs/mfs3v2/Makefile similarity index 100% rename from usr.sbin/mkfs.mfs/mfs3v2/Makefile rename to minix/usr.sbin/mkfs.mfs/mfs3v2/Makefile diff --git a/usr.sbin/mkfs.mfs/mfs3v2/const.h b/minix/usr.sbin/mkfs.mfs/mfs3v2/const.h similarity index 100% rename from usr.sbin/mkfs.mfs/mfs3v2/const.h rename to minix/usr.sbin/mkfs.mfs/mfs3v2/const.h diff --git a/usr.sbin/mkfs.mfs/mfs3v2/mfsdir.h b/minix/usr.sbin/mkfs.mfs/mfs3v2/mfsdir.h similarity index 100% rename from usr.sbin/mkfs.mfs/mfs3v2/mfsdir.h rename to minix/usr.sbin/mkfs.mfs/mfs3v2/mfsdir.h diff --git a/usr.sbin/mkfs.mfs/mfs3v2/super.h b/minix/usr.sbin/mkfs.mfs/mfs3v2/super.h similarity index 100% rename from usr.sbin/mkfs.mfs/mfs3v2/super.h rename to minix/usr.sbin/mkfs.mfs/mfs3v2/super.h diff --git a/usr.sbin/mkfs.mfs/mfs3v2/type.h b/minix/usr.sbin/mkfs.mfs/mfs3v2/type.h similarity index 100% rename from usr.sbin/mkfs.mfs/mfs3v2/type.h rename to minix/usr.sbin/mkfs.mfs/mfs3v2/type.h diff --git a/usr.sbin/mkfs.mfs/mkfs.c b/minix/usr.sbin/mkfs.mfs/mkfs.c similarity index 100% rename from usr.sbin/mkfs.mfs/mkfs.c rename to minix/usr.sbin/mkfs.mfs/mkfs.c diff --git a/usr.sbin/mkfs.mfs/v1/Makefile b/minix/usr.sbin/mkfs.mfs/v1/Makefile similarity index 100% rename from usr.sbin/mkfs.mfs/v1/Makefile rename to minix/usr.sbin/mkfs.mfs/v1/Makefile diff --git a/usr.sbin/mkfs.mfs/v1/const.h b/minix/usr.sbin/mkfs.mfs/v1/const.h similarity index 100% rename from usr.sbin/mkfs.mfs/v1/const.h rename to minix/usr.sbin/mkfs.mfs/v1/const.h diff --git a/usr.sbin/mkfs.mfs/v1/mfsdir.h b/minix/usr.sbin/mkfs.mfs/v1/mfsdir.h similarity index 100% rename from usr.sbin/mkfs.mfs/v1/mfsdir.h rename to minix/usr.sbin/mkfs.mfs/v1/mfsdir.h diff --git a/usr.sbin/mkfs.mfs/v1/super.h b/minix/usr.sbin/mkfs.mfs/v1/super.h similarity index 100% rename from usr.sbin/mkfs.mfs/v1/super.h rename to minix/usr.sbin/mkfs.mfs/v1/super.h diff --git a/usr.sbin/mkfs.mfs/v1/type.h b/minix/usr.sbin/mkfs.mfs/v1/type.h similarity index 100% rename from usr.sbin/mkfs.mfs/v1/type.h rename to minix/usr.sbin/mkfs.mfs/v1/type.h diff --git a/usr.sbin/mkfs.mfs/v1l/Makefile b/minix/usr.sbin/mkfs.mfs/v1l/Makefile similarity index 100% rename from usr.sbin/mkfs.mfs/v1l/Makefile rename to minix/usr.sbin/mkfs.mfs/v1l/Makefile diff --git a/usr.sbin/mkfs.mfs/v1l/const.h b/minix/usr.sbin/mkfs.mfs/v1l/const.h similarity index 100% rename from usr.sbin/mkfs.mfs/v1l/const.h rename to minix/usr.sbin/mkfs.mfs/v1l/const.h diff --git a/usr.sbin/mkfs.mfs/v1l/mfsdir.h b/minix/usr.sbin/mkfs.mfs/v1l/mfsdir.h similarity index 100% rename from usr.sbin/mkfs.mfs/v1l/mfsdir.h rename to minix/usr.sbin/mkfs.mfs/v1l/mfsdir.h diff --git a/usr.sbin/mkfs.mfs/v1l/super.h b/minix/usr.sbin/mkfs.mfs/v1l/super.h similarity index 100% rename from usr.sbin/mkfs.mfs/v1l/super.h rename to minix/usr.sbin/mkfs.mfs/v1l/super.h diff --git a/usr.sbin/mkfs.mfs/v1l/type.h b/minix/usr.sbin/mkfs.mfs/v1l/type.h similarity index 100% rename from usr.sbin/mkfs.mfs/v1l/type.h rename to minix/usr.sbin/mkfs.mfs/v1l/type.h diff --git a/usr.sbin/mkfs.mfs/v2/Makefile b/minix/usr.sbin/mkfs.mfs/v2/Makefile similarity index 100% rename from usr.sbin/mkfs.mfs/v2/Makefile rename to minix/usr.sbin/mkfs.mfs/v2/Makefile diff --git a/usr.sbin/mkfs.mfs/v2/const.h b/minix/usr.sbin/mkfs.mfs/v2/const.h similarity index 100% rename from usr.sbin/mkfs.mfs/v2/const.h rename to minix/usr.sbin/mkfs.mfs/v2/const.h diff --git a/usr.sbin/mkfs.mfs/v2/mfsdir.h b/minix/usr.sbin/mkfs.mfs/v2/mfsdir.h similarity index 100% rename from usr.sbin/mkfs.mfs/v2/mfsdir.h rename to minix/usr.sbin/mkfs.mfs/v2/mfsdir.h diff --git a/usr.sbin/mkfs.mfs/v2/super.h b/minix/usr.sbin/mkfs.mfs/v2/super.h similarity index 100% rename from usr.sbin/mkfs.mfs/v2/super.h rename to minix/usr.sbin/mkfs.mfs/v2/super.h diff --git a/usr.sbin/mkfs.mfs/v2/type.h b/minix/usr.sbin/mkfs.mfs/v2/type.h similarity index 100% rename from usr.sbin/mkfs.mfs/v2/type.h rename to minix/usr.sbin/mkfs.mfs/v2/type.h diff --git a/usr.sbin/mkfs.mfs/v2l/Makefile b/minix/usr.sbin/mkfs.mfs/v2l/Makefile similarity index 100% rename from usr.sbin/mkfs.mfs/v2l/Makefile rename to minix/usr.sbin/mkfs.mfs/v2l/Makefile diff --git a/usr.sbin/mkfs.mfs/v2l/const.h b/minix/usr.sbin/mkfs.mfs/v2l/const.h similarity index 100% rename from usr.sbin/mkfs.mfs/v2l/const.h rename to minix/usr.sbin/mkfs.mfs/v2l/const.h diff --git a/usr.sbin/mkfs.mfs/v2l/mfsdir.h b/minix/usr.sbin/mkfs.mfs/v2l/mfsdir.h similarity index 100% rename from usr.sbin/mkfs.mfs/v2l/mfsdir.h rename to minix/usr.sbin/mkfs.mfs/v2l/mfsdir.h diff --git a/usr.sbin/mkfs.mfs/v2l/super.h b/minix/usr.sbin/mkfs.mfs/v2l/super.h similarity index 100% rename from usr.sbin/mkfs.mfs/v2l/super.h rename to minix/usr.sbin/mkfs.mfs/v2l/super.h diff --git a/usr.sbin/mkfs.mfs/v2l/type.h b/minix/usr.sbin/mkfs.mfs/v2l/type.h similarity index 100% rename from usr.sbin/mkfs.mfs/v2l/type.h rename to minix/usr.sbin/mkfs.mfs/v2l/type.h diff --git a/usr.sbin/mkfs.mfs/v3/Makefile b/minix/usr.sbin/mkfs.mfs/v3/Makefile similarity index 100% rename from usr.sbin/mkfs.mfs/v3/Makefile rename to minix/usr.sbin/mkfs.mfs/v3/Makefile diff --git a/usr.sbin/mkfs.mfs/v3/const.h b/minix/usr.sbin/mkfs.mfs/v3/const.h similarity index 100% rename from usr.sbin/mkfs.mfs/v3/const.h rename to minix/usr.sbin/mkfs.mfs/v3/const.h diff --git a/usr.sbin/mkfs.mfs/v3/mfsdir.h b/minix/usr.sbin/mkfs.mfs/v3/mfsdir.h similarity index 100% rename from usr.sbin/mkfs.mfs/v3/mfsdir.h rename to minix/usr.sbin/mkfs.mfs/v3/mfsdir.h diff --git a/usr.sbin/mkfs.mfs/v3/mkfs.mfs.1 b/minix/usr.sbin/mkfs.mfs/v3/mkfs.mfs.1 similarity index 100% rename from usr.sbin/mkfs.mfs/v3/mkfs.mfs.1 rename to minix/usr.sbin/mkfs.mfs/v3/mkfs.mfs.1 diff --git a/usr.sbin/mkfs.mfs/v3/super.h b/minix/usr.sbin/mkfs.mfs/v3/super.h similarity index 100% rename from usr.sbin/mkfs.mfs/v3/super.h rename to minix/usr.sbin/mkfs.mfs/v3/super.h diff --git a/usr.sbin/mkfs.mfs/v3/type.h b/minix/usr.sbin/mkfs.mfs/v3/type.h similarity index 100% rename from usr.sbin/mkfs.mfs/v3/type.h rename to minix/usr.sbin/mkfs.mfs/v3/type.h diff --git a/usr.sbin/mkproto/Makefile b/minix/usr.sbin/mkproto/Makefile similarity index 100% rename from usr.sbin/mkproto/Makefile rename to minix/usr.sbin/mkproto/Makefile diff --git a/usr.sbin/mkproto/mkproto.c b/minix/usr.sbin/mkproto/mkproto.c similarity index 100% rename from usr.sbin/mkproto/mkproto.c rename to minix/usr.sbin/mkproto/mkproto.c diff --git a/releasetools/Makefile b/releasetools/Makefile index e96e41806..6c4ec8c28 100644 --- a/releasetools/Makefile +++ b/releasetools/Makefile @@ -16,18 +16,18 @@ PROGROOT:= ${MAKEOBJDIR:S,releasetools,,} .endif # Specify the programs that are part of the system image. -KERNEL= ${PROGROOT}/kernel/kernel +KERNEL= ${PROGROOT}/minix/kernel/kernel # PROGRAMS are in the order they should be loaded by boot -PROGRAMS+= ${PROGROOT}/servers/ds/ds -PROGRAMS+= ${PROGROOT}/servers/rs/rs -PROGRAMS+= ${PROGROOT}/servers/pm/pm -PROGRAMS+= ${PROGROOT}/servers/sched/sched -PROGRAMS+= ${PROGROOT}/servers/vfs/vfs -PROGRAMS+= ${PROGROOT}/drivers/memory/memory -PROGRAMS+= ${PROGROOT}/drivers/tty/tty -PROGRAMS+= ${PROGROOT}/servers/mfs/mfs -PROGRAMS+= ${PROGROOT}/servers/vm/vm -PROGRAMS+= ${PROGROOT}/servers/pfs/pfs +PROGRAMS+= ${PROGROOT}/minix/servers/ds/ds +PROGRAMS+= ${PROGROOT}/minix/servers/rs/rs +PROGRAMS+= ${PROGROOT}/minix/servers/pm/pm +PROGRAMS+= ${PROGROOT}/minix/servers/sched/sched +PROGRAMS+= ${PROGROOT}/minix/servers/vfs/vfs +PROGRAMS+= ${PROGROOT}/minix/drivers/storage/memory/memory +PROGRAMS+= ${PROGROOT}/minix/drivers/tty/tty/tty +PROGRAMS+= ${PROGROOT}/minix/fs/mfs/mfs +PROGRAMS+= ${PROGROOT}/minix/servers/vm/vm +PROGRAMS+= ${PROGROOT}/minix/fs/pfs/pfs PROGRAMS+= ${PROGROOT}/sbin/init/init usage: @@ -98,12 +98,12 @@ do-hdboot: ${INSTALL_FILE} $$i $$newname; \ echo ${INSTALL_FILE} $$i $$newname; \ done - @cp ${PROGROOT}/kernel/kernel ${DESTDIR}/boot/minix/.temp/ + @cp ${PROGROOT}/minix/kernel/kernel ${DESTDIR}/boot/minix/.temp/ @if [ "${MKINSTALLBOOT:Uno}" != "no" ] ; then \ ${STRIP} -s ${DESTDIR}/boot/minix/.temp/* ; \ gzip ${DESTDIR}/boot/minix/.temp/mod* ; \ ${HOST_SH} mkboot hdboot ${DESTDIR}; \ - ${HOST_SH} ../commands/update_bootcfg/update_bootcfg.sh;\ + ${HOST_SH} ../minix/commands/update_bootcfg/update_bootcfg.sh;\ else \ ${INSTALL_DIR} ${DESTDIR}/multiboot; \ ${INSTALL_FILE} ${DESTDIR}/boot/minix/.temp/* ${DESTDIR}/multiboot; \ @@ -146,3 +146,6 @@ cleandir: ${MAKE} -C ../kernel $@ ${MAKE} -C ../servers $@ ${MAKE} -C ../drivers $@ + +# LSC: For STRIP and HOST_SH +.include diff --git a/releasetools/arm_sdimage.sh b/releasetools/arm_sdimage.sh index 3f6362202..8e23818db 100755 --- a/releasetools/arm_sdimage.sh +++ b/releasetools/arm_sdimage.sh @@ -181,25 +181,26 @@ cp ${IMG_DIR}/uEnv.txt ${OBJ}/ # Do some last processing of the kernel and servers before also putting # them on the FAT # -${CROSS_PREFIX}objcopy ${OBJ}/kernel/kernel -O binary ${OBJ}/kernel.bin +${CROSS_PREFIX}objcopy ${OBJ}/minix/kernel/kernel -O binary ${OBJ}/kernel.bin mcopy -bsp -i ${IMG_DIR}/fat.img ${OBJ}/kernel.bin ::kernel.bin for f in servers/vm/vm servers/rs/rs servers/pm/pm servers/sched/sched \ - servers/vfs/vfs servers/ds/ds servers/mfs/mfs servers/pfs/pfs \ - sbin/init/init + servers/vfs/vfs servers/ds/ds fs/mfs/mfs fs/pfs/pfs \ + ../sbin/init/init do fn=`basename $f`.elf - cp ${OBJ}/${f} ${OBJ}/${fn} + cp ${OBJ}/minix/${f} ${OBJ}/${fn} ${CROSS_PREFIX}strip -s ${OBJ}/${fn} mcopy -bsp -i ${IMG_DIR}/fat.img ${OBJ}/${fn} ::${fn} done -for f in tty memory +for f in tty/tty/tty storage/memory/memory do - cp ${OBJ}/drivers/${f}/${f} ${OBJ}/${f}.elf - ${CROSS_PREFIX}strip -s ${OBJ}/${f}.elf - mcopy -bsp -i ${IMG_DIR}/fat.img ${OBJ}/${f}.elf ::${f}.elf + fn=`basename $f`.elf + cp ${OBJ}/minix/drivers/${f} ${OBJ}/${fn} + ${CROSS_PREFIX}strip -s ${OBJ}/${fn} + mcopy -bsp -i ${IMG_DIR}/fat.img ${OBJ}/${fn} ::${fn} done # diff --git a/releasetools/release.sh b/releasetools/release.sh index e394e7f25..b5017211b 100755 --- a/releasetools/release.sh +++ b/releasetools/release.sh @@ -157,7 +157,7 @@ mkdir -p $RELEASEPACKAGE ########################################################################## echo " * Bootstrapping filesystem in $RELEASEDIR" ########################################################################## -CONFIGHEADER=$RELEASEDIR/usr/src/include/minix/sys_config.h +CONFIGHEADER=$RELEASEDIR/usr/src/minix/include/minix/sys_config.h copy_local_packages @@ -219,7 +219,7 @@ echo " * Build" ########################################################################## cd $RELEASEDIR/usr/src -make build MKLIBCXX=yes DESTDIR=$RELEASEDIR SLOPPY_FLIST=yes $BUILDOPTIONS +make distribution MKLIBCXX=yes DESTDIR=$RELEASEDIR SLOPPY_FLIST=yes $BUILDOPTIONS make -C releasetools do-hdboot DESTDIR=$RELEASEDIR MKINSTALLBOOT=yes cp $RELEASEDIR/usr/mdec/boot_monitor $RELEASEDIR cp $RELEASEDIR/boot/minix_latest/* $RELEASEDIR/boot/minix_default/ diff --git a/servers/Makefile b/servers/Makefile deleted file mode 100644 index a756094ed..000000000 --- a/servers/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Makefile for all system servers. -# - -.include - -.if ${MKIMAGEONLY} == "yes" - -SUBDIR= ds input mfs pfs pm rs sched vfs vm - -.else - -SUBDIR= ds ext2 inet input ipc is iso9660fs \ - mfs pfs pm procfs rs sched vfs vm devman - -.if ${MACHINE_ARCH} == "i386" -SUBDIR+= hgfs vbfs -.endif - -.if ${MKLWIP} == "yes" -SUBDIR += lwip -.endif - -.endif - -.include diff --git a/share/Makefile b/share/Makefile index 89596bf11..3aac23039 100644 --- a/share/Makefile +++ b/share/Makefile @@ -15,12 +15,6 @@ SUBDIR+=i18n locale nls .endif .endif -.if defined(__MINIX) -.if ${MACHINE_ARCH} == "earm" -SUBDIR+= beaglebone -.endif # ${MACHINE_ARCH} == "earm" -.endif # defined(__MINIX) - # Speedup stubs for some subtrees that don't need to run these rules includes-examples includes-man: @true diff --git a/sys/arch/i386/stand/mbr/Makefile.mbr b/sys/arch/i386/stand/mbr/Makefile.mbr index 3e18e2feb..ef6f0acbf 100644 --- a/sys/arch/i386/stand/mbr/Makefile.mbr +++ b/sys/arch/i386/stand/mbr/Makefile.mbr @@ -49,8 +49,8 @@ CPPFLAGS+= -DLOADADDR=${LOADADDR} AFLAGS.mbr.S+= -Wa,--divide BUILDSYMLINKS+= \ - ${NETBSDSRCDIR}/include/arch/i386/include/stackframe.h machine/stackframe.h \ - ${NETBSDSRCDIR}/include/arch/i386/include/fpu.h machine/fpu.h + ${NETBSDSRCDIR}/minix/include/arch/i386/include/stackframe.h machine/stackframe.h \ + ${NETBSDSRCDIR}/minix/include/arch/i386/include/fpu.h machine/fpu.h DPSRCS+= machine/stackframe.h machine/fpu.h .endif # defined(__MINIX) diff --git a/sys/conf/osrelease.sh b/sys/conf/osrelease.sh index 9b2a28247..2aa7d1b0b 100644 --- a/sys/conf/osrelease.sh +++ b/sys/conf/osrelease.sh @@ -35,9 +35,9 @@ path="$0" [ "${path#/*}" = "$path" ] && path="./$path" -release=`grep "define OS_RELEASE" ${path%/*}/../../include/minix/config.h | awk '{ print $3} ' | tr -d '"' | awk -F. ' { print $1 }'` -major=`grep "define OS_RELEASE" ${path%/*}/../../include/minix/config.h | awk '{ print $3 }' | tr -d '"' | awk -F. ' { print $2 }'` -minor=`grep "define OS_RELEASE" ${path%/*}/../../include/minix/config.h | awk '{ print $3 }' | tr -d '"' | awk -F. ' { print $3 }'` +release=`grep "define OS_RELEASE" ${path%/*}/../../minix/include/minix/config.h | awk '{ print $3} ' | tr -d '"' | awk -F. ' { print $1 }'` +major=`grep "define OS_RELEASE" ${path%/*}/../../minix/include/minix/config.h | awk '{ print $3 }' | tr -d '"' | awk -F. ' { print $2 }'` +minor=`grep "define OS_RELEASE" ${path%/*}/../../minix/include/minix/config.h | awk '{ print $3 }' | tr -d '"' | awk -F. ' { print $3 }'` case "$option" in diff --git a/tools/mkfs.mfs/Makefile b/tools/mkfs.mfs/Makefile index 44cbae021..c2bd05cda 100644 --- a/tools/mkfs.mfs/Makefile +++ b/tools/mkfs.mfs/Makefile @@ -1,4 +1,4 @@ HOSTPROGNAME= ${_TOOL_PREFIX}mkfs.mfs -HOST_SRCDIR= usr.sbin/mkfs.mfs/v3 +HOST_SRCDIR= minix/usr.sbin/mkfs.mfs/v3 .include "${.CURDIR}/../Makefile.host" diff --git a/tools/partition/Makefile b/tools/partition/Makefile index 77af07797..eb1c42a4f 100644 --- a/tools/partition/Makefile +++ b/tools/partition/Makefile @@ -1,4 +1,4 @@ HOSTPROGNAME= ${_TOOL_PREFIX}partition -HOST_SRCDIR= commands/partition +HOST_SRCDIR= minix/commands/partition .include "${.CURDIR}/../Makefile.host" diff --git a/tools/toproto/Makefile b/tools/toproto/Makefile index 49f36a0c9..0429dbd0a 100644 --- a/tools/toproto/Makefile +++ b/tools/toproto/Makefile @@ -1,4 +1,4 @@ HOSTPROGNAME= ${_TOOL_PREFIX}toproto -HOST_SRCDIR= usr.bin/toproto +HOST_SRCDIR= minix/usr.bin/toproto .include "${.CURDIR}/../Makefile.host" diff --git a/tools/writeisofs/Makefile b/tools/writeisofs/Makefile index 5535af993..694b35480 100644 --- a/tools/writeisofs/Makefile +++ b/tools/writeisofs/Makefile @@ -1,4 +1,4 @@ HOSTPROGNAME= ${_TOOL_PREFIX}writeisofs -HOST_SRCDIR= commands/writeisofs +HOST_SRCDIR= minix/commands/writeisofs .include "${.CURDIR}/../Makefile.host" diff --git a/usr.bin/Makefile b/usr.bin/Makefile index ae30519a4..0777053ad 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -36,14 +36,6 @@ SUBDIR= asa \ .if !defined(__MINIX) SUBDIR+= ../external/zlib/pigz/bin/pigz .else - -# Non-NetBSD imports -SUBDIR+= ministat - -# Minix commands -SUBDIR+= top -SUBDIR+= toproto - # LSC FIXME For now we compile those unconditionnaly SUBDIR+= apropos whatis bdes soelim .endif # defined(__MINIX) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 089511b26..68e48faac 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -32,15 +32,11 @@ SUBDIR= \ \ zic -.if defined(__MINIX) -# LSC MINIX Specific -SUBDIR+= mkfs.mfs \ - mkproto -.else +.if !defined(__MINIX) .if ${MKMAKEMANDB} != "no" SUBDIR+= makemandb .endif -.endif # defined(__MINIX) +.endif # !defined(__MINIX) .if (${MKYP} != "no") SUBDIR+= rpc.yppasswdd ypbind yppoll ypserv ypset