From be89757ef58071e59a826057bc1f01abdbe3a414 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Thu, 22 Nov 2012 16:50:23 +0100 Subject: [PATCH] common upgrades Change-Id: I567fc15845b601019d346569ecfcef4f89687fd2 --- common/Makefile | 4 --- common/include/Makefile | 8 ----- {include => common/include}/prop/Makefile | 0 {include => common/include}/prop/plistref.h | 0 {include => common/include}/prop/prop_array.h | 0 {include => common/include}/prop/prop_bool.h | 0 {include => common/include}/prop/prop_data.h | 0 .../include}/prop/prop_dictionary.h | 0 .../include}/prop/prop_ingest.h | 0 .../include}/prop/prop_number.h | 0 .../include}/prop/prop_object.h | 0 .../include}/prop/prop_string.h | 0 {include => common/include}/prop/proplib.h | 0 common/include/sys/Makefile | 11 ------ common/include/sys/Makefile.mount.inc | 5 --- common/lib/libprop/prop_object.c | 2 ++ common/lib/libutil/Makefile.inc | 2 +- include/Makefile | 36 ++++--------------- include/minix/Makefile | 8 ++--- {common/include/sys => include/minix}/mount.h | 2 +- {common/include => include/minix}/termios.h | 0 include/sys/Makefile | 9 +++++ {common/include => include}/sys/bootblock.h | 0 {common/include => include}/sys/disk.h | 0 {common/include => include}/sys/disklabel.h | 0 .../include => include}/sys/disklabel_gpt.h | 0 {common/include => include}/sys/dkbad.h | 0 {common/include => include}/sys/dkio.h | 0 {common/include => include}/sys/elf64.h | 0 {common/include => include}/sys/elf_common.h | 0 {common/include => include}/sys/elf_core.h | 0 {common/include => include}/sys/elf_generic.h | 0 {common/include => include}/sys/exec_elf.h | 0 {common/include => include}/sys/ioc_block.h | 0 {common/include => include}/sys/ioc_disk.h | 0 {common/include => include}/sys/ioc_fbd.h | 0 {common/include => include}/sys/ioc_file.h | 0 {common/include => include}/sys/ioc_memory.h | 0 {common/include => include}/sys/ioc_sound.h | 0 {common/include => include}/sys/ioc_tape.h | 0 {common/include => include}/sys/ioc_tty.h | 0 {common/include => include}/sys/ioccom.h | 0 {common/include => include}/sys/iostat.h | 0 {common/include => include}/sys/kbdio.h | 0 {common/include => include}/sys/mtio.h | 0 {common/include => include}/sys/mutex.h | 0 {common/include => include}/sys/procfs.h | 0 {common/include => include}/sys/svrctl.h | 0 {common/include => include}/sys/video.h | 0 {common/include => include}/sys/vm.h | 0 50 files changed, 22 insertions(+), 65 deletions(-) delete mode 100644 common/Makefile delete mode 100644 common/include/Makefile rename {include => common/include}/prop/Makefile (100%) rename {include => common/include}/prop/plistref.h (100%) rename {include => common/include}/prop/prop_array.h (100%) rename {include => common/include}/prop/prop_bool.h (100%) rename {include => common/include}/prop/prop_data.h (100%) rename {include => common/include}/prop/prop_dictionary.h (100%) rename {include => common/include}/prop/prop_ingest.h (100%) rename {include => common/include}/prop/prop_number.h (100%) rename {include => common/include}/prop/prop_object.h (100%) rename {include => common/include}/prop/prop_string.h (100%) rename {include => common/include}/prop/proplib.h (100%) delete mode 100644 common/include/sys/Makefile delete mode 100644 common/include/sys/Makefile.mount.inc rename {common/include/sys => include/minix}/mount.h (97%) rename {common/include => include/minix}/termios.h (100%) rename {common/include => include}/sys/bootblock.h (100%) rename {common/include => include}/sys/disk.h (100%) rename {common/include => include}/sys/disklabel.h (100%) rename {common/include => include}/sys/disklabel_gpt.h (100%) rename {common/include => include}/sys/dkbad.h (100%) rename {common/include => include}/sys/dkio.h (100%) rename {common/include => include}/sys/elf64.h (100%) rename {common/include => include}/sys/elf_common.h (100%) rename {common/include => include}/sys/elf_core.h (100%) rename {common/include => include}/sys/elf_generic.h (100%) rename {common/include => include}/sys/exec_elf.h (100%) rename {common/include => include}/sys/ioc_block.h (100%) rename {common/include => include}/sys/ioc_disk.h (100%) rename {common/include => include}/sys/ioc_fbd.h (100%) rename {common/include => include}/sys/ioc_file.h (100%) rename {common/include => include}/sys/ioc_memory.h (100%) rename {common/include => include}/sys/ioc_sound.h (100%) rename {common/include => include}/sys/ioc_tape.h (100%) rename {common/include => include}/sys/ioc_tty.h (100%) rename {common/include => include}/sys/ioccom.h (100%) rename {common/include => include}/sys/iostat.h (100%) rename {common/include => include}/sys/kbdio.h (100%) rename {common/include => include}/sys/mtio.h (100%) rename {common/include => include}/sys/mutex.h (100%) rename {common/include => include}/sys/procfs.h (100%) rename {common/include => include}/sys/svrctl.h (100%) rename {common/include => include}/sys/video.h (100%) rename {common/include => include}/sys/vm.h (100%) diff --git a/common/Makefile b/common/Makefile deleted file mode 100644 index b3f5270bd..000000000 --- a/common/Makefile +++ /dev/null @@ -1,4 +0,0 @@ - -SUBDIR+= include - -.include diff --git a/common/include/Makefile b/common/include/Makefile deleted file mode 100644 index 833574271..000000000 --- a/common/include/Makefile +++ /dev/null @@ -1,8 +0,0 @@ - -INCSDIR= /usr/include/minix - -INCS+= termios.h - -SUBDIR+= sys - -.include diff --git a/include/prop/Makefile b/common/include/prop/Makefile similarity index 100% rename from include/prop/Makefile rename to common/include/prop/Makefile diff --git a/include/prop/plistref.h b/common/include/prop/plistref.h similarity index 100% rename from include/prop/plistref.h rename to common/include/prop/plistref.h diff --git a/include/prop/prop_array.h b/common/include/prop/prop_array.h similarity index 100% rename from include/prop/prop_array.h rename to common/include/prop/prop_array.h diff --git a/include/prop/prop_bool.h b/common/include/prop/prop_bool.h similarity index 100% rename from include/prop/prop_bool.h rename to common/include/prop/prop_bool.h diff --git a/include/prop/prop_data.h b/common/include/prop/prop_data.h similarity index 100% rename from include/prop/prop_data.h rename to common/include/prop/prop_data.h diff --git a/include/prop/prop_dictionary.h b/common/include/prop/prop_dictionary.h similarity index 100% rename from include/prop/prop_dictionary.h rename to common/include/prop/prop_dictionary.h diff --git a/include/prop/prop_ingest.h b/common/include/prop/prop_ingest.h similarity index 100% rename from include/prop/prop_ingest.h rename to common/include/prop/prop_ingest.h diff --git a/include/prop/prop_number.h b/common/include/prop/prop_number.h similarity index 100% rename from include/prop/prop_number.h rename to common/include/prop/prop_number.h diff --git a/include/prop/prop_object.h b/common/include/prop/prop_object.h similarity index 100% rename from include/prop/prop_object.h rename to common/include/prop/prop_object.h diff --git a/include/prop/prop_string.h b/common/include/prop/prop_string.h similarity index 100% rename from include/prop/prop_string.h rename to common/include/prop/prop_string.h diff --git a/include/prop/proplib.h b/common/include/prop/proplib.h similarity index 100% rename from include/prop/proplib.h rename to common/include/prop/proplib.h diff --git a/common/include/sys/Makefile b/common/include/sys/Makefile deleted file mode 100644 index b895df8be..000000000 --- a/common/include/sys/Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -INCSDIR= /usr/include/sys - -INCS+= elf64.h elf_common.h elf_generic.h \ - ioc_block.h ioc_fbd.h ioc_file.h ioc_tape.h ioc_disk.h \ - ioc_memory.h ioc_sound.h ioc_tty.h \ - kbdio.h mtio.h svrctl.h video.h vm.h procfs.h elf_core.h exec_elf.h \ - disk.h dkio.h ioccom.h mutex.h iostat.h disklabel.h disklabel_gpt.h \ - bootblock.h dkbad.h - -.include diff --git a/common/include/sys/Makefile.mount.inc b/common/include/sys/Makefile.mount.inc deleted file mode 100644 index 9d59529cf..000000000 --- a/common/include/sys/Makefile.mount.inc +++ /dev/null @@ -1,5 +0,0 @@ -.include - -.PATH: ${NETBSDSRCDIR}/common/include/sys - -INCS+= mount.h diff --git a/common/lib/libprop/prop_object.c b/common/lib/libprop/prop_object.c index fd0f14de9..9f85c3e76 100644 --- a/common/lib/libprop/prop_object.c +++ b/common/lib/libprop/prop_object.c @@ -39,7 +39,9 @@ #include #include #include +#if defined(__minix) #include +#endif /* defined(__minix) */ #endif #include diff --git a/common/lib/libutil/Makefile.inc b/common/lib/libutil/Makefile.inc index 2cb2184d9..4ce9e03ae 100644 --- a/common/lib/libutil/Makefile.inc +++ b/common/lib/libutil/Makefile.inc @@ -4,5 +4,5 @@ SRCS+= snprintb.c .else SRCS+= snprintb.c proc_compare.c getfstypename.c -COPTS.snprintb.c = -Wno-format-nonliteral .endif +COPTS.snprintb.c = -Wno-format-nonliteral diff --git a/include/Makefile b/include/Makefile index e6ea0024e..129400901 100644 --- a/include/Makefile +++ b/include/Makefile @@ -7,8 +7,6 @@ NOOBJ= # defined # Missing: mp.h -.if defined(__MINIX) -# Avoid installing: kvm.h lwp.h sa.h (latter not installed anyway) INCS= a.out.h aio.h ar.h assert.h atomic.h \ bitstring.h bm.h cdbr.h cdbw.h complex.h cpio.h ctype.h \ db.h dirent.h disktab.h dlfcn.h err.h errno.h fenv.h fmtmsg.h fnmatch.h \ @@ -20,31 +18,10 @@ INCS= a.out.h aio.h ar.h assert.h atomic.h \ ndbm.h netconfig.h netdb.h netgroup.h nlist.h nl_types.h nsswitch.h \ paths.h pwd.h randomid.h ranlib.h re_comp.h regex.h regexp.h \ resolv.h res_update.h rmt.h sched.h search.h semaphore.h setjmp.h \ - sgtty.h signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h string.h \ - strings.h stringlist.h struct.h sysexits.h tar.h time.h \ - ttyent.h tzfile.h ucontext.h ulimit.h unistd.h util.h utime.h utmp.h \ - utmpx.h uuid.h varargs.h vis.h wchar.h wctype.h wordexp.h - -# MINIX Specific headers. -INCS+= env.h fetch.h lib.h libutil.h timers.h - -.else -INCS= a.out.h aio.h ar.h assert.h atomic.h \ - bitstring.h bm.h cdbr.h cdbw.h complex.h cpio.h ctype.h \ - db.h dirent.h disktab.h dlfcn.h err.h errno.h fenv.h fmtmsg.h fnmatch.h \ - fstab.h fts.h ftw.h getopt.h glob.h grp.h ifaddrs.h iconv.h \ - inttypes.h iso646.h kvm.h langinfo.h libgen.h \ - limits.h link.h link_aout.h link_elf.h locale.h \ - login_cap.h lwp.h malloc.h math.h md2.h \ - memory.h mntopts.h monetary.h mpool.h mqueue.h \ - ndbm.h netconfig.h netdb.h netgroup.h nlist.h nl_types.h nsswitch.h \ - paths.h pwd.h quota.h randomid.h ranlib.h re_comp.h regex.h regexp.h \ - resolv.h res_update.h rmt.h sched.h search.h semaphore.h setjmp.h \ - string.h sgtty.h signal.h spawn.h stab.h stdbool.h stddef.h stdio.h \ + string.h sgtty.h signal.h stab.h stdbool.h stddef.h stdio.h \ stdlib.h strings.h stringlist.h struct.h sysexits.h tar.h time.h \ ttyent.h tzfile.h ucontext.h ulimit.h unistd.h util.h utime.h utmp.h \ utmpx.h uuid.h vis.h wchar.h wctype.h wordexp.h -.endif INCS+= arpa/ftp.h arpa/inet.h arpa/nameser.h arpa/nameser_compat.h \ arpa/telnet.h arpa/tftp.h INCS+= protocols/dumprestore.h protocols/routed.h protocols/rwhod.h \ @@ -60,6 +37,12 @@ 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 timers.h varargs.h +.endif + + .include @@ -71,14 +54,9 @@ INCSDIR= /usr/include .else SUBDIR= rpc .endif -.if defined(__MINIX) -SUBDIR+= prop -.else SUBDIR+= ../common/include/prop -.endif .if defined(__MINIX) -SUBDIR+= arch/${MACHINE_ARCH} SUBDIR+= arch sys minix SUBDIR+= net netinet netinet6 SUBDIR+= ddekit diff --git a/include/minix/Makefile b/include/minix/Makefile index d0627e350..2c3cec201 100644 --- a/include/minix/Makefile +++ b/include/minix/Makefile @@ -14,18 +14,14 @@ INCS+= acpi.h audio_fw.h bitmap.h \ driver.h drivers.h drvlib.h ds.h \ endpoint.h fslib.h gcov.h hash.h \ hgfs.h ioctl.h input.h ipc.h ipcconst.h \ - keymap.h limits.h mthread.h minlib.h \ + keymap.h limits.h mount.h mthread.h minlib.h \ netdriver.h optset.h partition.h portio.h \ priv.h procfs.h profile.h queryparam.h \ rs.h safecopies.h sched.h sef.h sffs.h \ sound.h spin.h sys_config.h sysinfo.h \ - syslib.h sysutil.h timers.h type.h \ + syslib.h sysutil.h termios.h timers.h type.h \ tty.h u64.h usb.h usb_ch9.h vbox.h \ vboxfs.h vboxif.h vboxtype.h vm.h \ vfsif.h vtreefs.h libminixfs.h netsock.h -# Necessary as the build system does not support multiple inclusion -# of bsd.kinc.mk in a single Makefile with different INCSDIR -.include "${NETBSDSRCDIR}/common/include/sys/Makefile.mount.inc" - .include diff --git a/common/include/sys/mount.h b/include/minix/mount.h similarity index 97% rename from common/include/sys/mount.h rename to include/minix/mount.h index f4fbd7344..dddb4e6c8 100644 --- a/common/include/sys/mount.h +++ b/include/minix/mount.h @@ -1,4 +1,4 @@ -/* +/* * definitions for mount(2) */ diff --git a/common/include/termios.h b/include/minix/termios.h similarity index 100% rename from common/include/termios.h rename to include/minix/termios.h diff --git a/include/sys/Makefile b/include/sys/Makefile index f82783301..921ccbba6 100644 --- a/include/sys/Makefile +++ b/include/sys/Makefile @@ -36,6 +36,15 @@ INCS+= ansi.h atomic.h \ extattr.h \ wait.h exec.h +# Present only in minix +INCS+= ioc_net.h statfs.h +INCS+= elf64.h elf_common.h elf_generic.h \ + ioc_block.h ioc_fbd.h ioc_file.h ioc_tape.h ioc_disk.h \ + ioc_memory.h ioc_sound.h ioc_tty.h \ + kbdio.h mtio.h svrctl.h video.h vm.h procfs.h elf_core.h exec_elf.h \ + disk.h dkio.h ioccom.h mutex.h iostat.h disklabel.h disklabel_gpt.h \ + bootblock.h dkbad.h + INCSYMLINKS=\ sys/fcntl.h /usr/include/fcntl.h \ sys/poll.h /usr/include/poll.h \ diff --git a/common/include/sys/bootblock.h b/include/sys/bootblock.h similarity index 100% rename from common/include/sys/bootblock.h rename to include/sys/bootblock.h diff --git a/common/include/sys/disk.h b/include/sys/disk.h similarity index 100% rename from common/include/sys/disk.h rename to include/sys/disk.h diff --git a/common/include/sys/disklabel.h b/include/sys/disklabel.h similarity index 100% rename from common/include/sys/disklabel.h rename to include/sys/disklabel.h diff --git a/common/include/sys/disklabel_gpt.h b/include/sys/disklabel_gpt.h similarity index 100% rename from common/include/sys/disklabel_gpt.h rename to include/sys/disklabel_gpt.h diff --git a/common/include/sys/dkbad.h b/include/sys/dkbad.h similarity index 100% rename from common/include/sys/dkbad.h rename to include/sys/dkbad.h diff --git a/common/include/sys/dkio.h b/include/sys/dkio.h similarity index 100% rename from common/include/sys/dkio.h rename to include/sys/dkio.h diff --git a/common/include/sys/elf64.h b/include/sys/elf64.h similarity index 100% rename from common/include/sys/elf64.h rename to include/sys/elf64.h diff --git a/common/include/sys/elf_common.h b/include/sys/elf_common.h similarity index 100% rename from common/include/sys/elf_common.h rename to include/sys/elf_common.h diff --git a/common/include/sys/elf_core.h b/include/sys/elf_core.h similarity index 100% rename from common/include/sys/elf_core.h rename to include/sys/elf_core.h diff --git a/common/include/sys/elf_generic.h b/include/sys/elf_generic.h similarity index 100% rename from common/include/sys/elf_generic.h rename to include/sys/elf_generic.h diff --git a/common/include/sys/exec_elf.h b/include/sys/exec_elf.h similarity index 100% rename from common/include/sys/exec_elf.h rename to include/sys/exec_elf.h diff --git a/common/include/sys/ioc_block.h b/include/sys/ioc_block.h similarity index 100% rename from common/include/sys/ioc_block.h rename to include/sys/ioc_block.h diff --git a/common/include/sys/ioc_disk.h b/include/sys/ioc_disk.h similarity index 100% rename from common/include/sys/ioc_disk.h rename to include/sys/ioc_disk.h diff --git a/common/include/sys/ioc_fbd.h b/include/sys/ioc_fbd.h similarity index 100% rename from common/include/sys/ioc_fbd.h rename to include/sys/ioc_fbd.h diff --git a/common/include/sys/ioc_file.h b/include/sys/ioc_file.h similarity index 100% rename from common/include/sys/ioc_file.h rename to include/sys/ioc_file.h diff --git a/common/include/sys/ioc_memory.h b/include/sys/ioc_memory.h similarity index 100% rename from common/include/sys/ioc_memory.h rename to include/sys/ioc_memory.h diff --git a/common/include/sys/ioc_sound.h b/include/sys/ioc_sound.h similarity index 100% rename from common/include/sys/ioc_sound.h rename to include/sys/ioc_sound.h diff --git a/common/include/sys/ioc_tape.h b/include/sys/ioc_tape.h similarity index 100% rename from common/include/sys/ioc_tape.h rename to include/sys/ioc_tape.h diff --git a/common/include/sys/ioc_tty.h b/include/sys/ioc_tty.h similarity index 100% rename from common/include/sys/ioc_tty.h rename to include/sys/ioc_tty.h diff --git a/common/include/sys/ioccom.h b/include/sys/ioccom.h similarity index 100% rename from common/include/sys/ioccom.h rename to include/sys/ioccom.h diff --git a/common/include/sys/iostat.h b/include/sys/iostat.h similarity index 100% rename from common/include/sys/iostat.h rename to include/sys/iostat.h diff --git a/common/include/sys/kbdio.h b/include/sys/kbdio.h similarity index 100% rename from common/include/sys/kbdio.h rename to include/sys/kbdio.h diff --git a/common/include/sys/mtio.h b/include/sys/mtio.h similarity index 100% rename from common/include/sys/mtio.h rename to include/sys/mtio.h diff --git a/common/include/sys/mutex.h b/include/sys/mutex.h similarity index 100% rename from common/include/sys/mutex.h rename to include/sys/mutex.h diff --git a/common/include/sys/procfs.h b/include/sys/procfs.h similarity index 100% rename from common/include/sys/procfs.h rename to include/sys/procfs.h diff --git a/common/include/sys/svrctl.h b/include/sys/svrctl.h similarity index 100% rename from common/include/sys/svrctl.h rename to include/sys/svrctl.h diff --git a/common/include/sys/video.h b/include/sys/video.h similarity index 100% rename from common/include/sys/video.h rename to include/sys/video.h diff --git a/common/include/sys/vm.h b/include/sys/vm.h similarity index 100% rename from common/include/sys/vm.h rename to include/sys/vm.h -- 2.44.0