diff options
| author | dim <dim@FreeBSD.org> | 2016-01-08 17:42:14 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-08 17:42:14 +0000 |
| commit | b5c238fc65c2ef8cd6e839857fe5cfd813cd2c59 (patch) | |
| tree | da8282d35996a372408778d38763fa68c3c354c5 /usr.bin | |
| parent | fa38d85e2c222400fa30c70e8a913e8a213a97a7 (diff) | |
| parent | 368544f6729f740145f0b6572ec35ebe304692bf (diff) | |
| download | FreeBSD-src-b5c238fc65c2ef8cd6e839857fe5cfd813cd2c59.zip FreeBSD-src-b5c238fc65c2ef8cd6e839857fe5cfd813cd2c59.tar.gz | |
Merge ^/head r293280 through r293429.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cap_mkdb/cap_mkdb.c | 2 | ||||
| -rw-r--r-- | usr.bin/kdump/Makefile.depend | 3 | ||||
| -rw-r--r-- | usr.bin/nfsstat/Makefile.depend | 2 | ||||
| -rw-r--r-- | usr.bin/truss/Makefile.depend.amd64 | 3 |
4 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c index 2f8bd96..bbcedd5 100644 --- a/usr.bin/cap_mkdb/cap_mkdb.c +++ b/usr.bin/cap_mkdb/cap_mkdb.c @@ -119,7 +119,7 @@ main(int argc, char *argv[]) (void)snprintf(buf, sizeof(buf), "%s.db", capname ? capname : *argv); if ((capname = strdup(buf)) == NULL) errx(1, "strdup failed"); - if ((capdbp = dbopen(capname, O_CREAT | O_TRUNC | O_RDWR, + if ((capdbp = dbopen(capname, O_CREAT | O_TRUNC | O_RDWR | O_SYNC, DEFFILEMODE, DB_HASH, &openinfo)) == NULL) err(1, "%s", buf); diff --git a/usr.bin/kdump/Makefile.depend b/usr.bin/kdump/Makefile.depend index f86656e..83a2492 100644 --- a/usr.bin/kdump/Makefile.depend +++ b/usr.bin/kdump/Makefile.depend @@ -6,7 +6,6 @@ DIRDEPS = \ gnu/lib/libgcc \ include \ include/arpa \ - include/rpc \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ @@ -20,8 +19,6 @@ DIRDEPS = \ .if ${DEP_RELDIR} == ${_DEP_RELDIR} # local dependencies - needed for -jN in clean tree -ioctl.o: ioctl.c -ioctl.po: ioctl.c kdump.o: kdump_subr.h kdump.o: linux32_syscalls.c kdump.o: linux_syscalls.c diff --git a/usr.bin/nfsstat/Makefile.depend b/usr.bin/nfsstat/Makefile.depend index 34582cd..3646e2e 100644 --- a/usr.bin/nfsstat/Makefile.depend +++ b/usr.bin/nfsstat/Makefile.depend @@ -9,8 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libelf \ - lib/libkvm \ .include <dirdeps.mk> diff --git a/usr.bin/truss/Makefile.depend.amd64 b/usr.bin/truss/Makefile.depend.amd64 index ad9c8b3..334bb3a 100644 --- a/usr.bin/truss/Makefile.depend.amd64 +++ b/usr.bin/truss/Makefile.depend.amd64 @@ -6,7 +6,6 @@ DIRDEPS = \ gnu/lib/libgcc \ include \ include/arpa \ - include/rpc \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ @@ -26,6 +25,4 @@ amd64-freebsd32.o: freebsd32_syscalls.h amd64-freebsd32.po: freebsd32_syscalls.h amd64-linux32.o: amd64-linux32_syscalls.h amd64-linux32.po: amd64-linux32_syscalls.h -ioctl.o: ioctl.c -ioctl.po: ioctl.c .endif |
