mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-24 01:07:21 +01:00
Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master
Conflicts: lib/libexecinfo/Makefile (unresolved) libexec/rtld-elf/amd64/Makefile.inc (unresolved) sbin/ldconfig/Makefile (unresolved) secure/usr.bin/openssl/Makefile (unresolved) share/keys/Makefile (unresolved) sys/modules/aout/Makefile (deleted) sys/modules/sgx/Makefile (deleted) sys/modules/sgx_linux/Makefile (deleted) usr.sbin/bsdinstall/Makefile (unresolved) usr.sbin/unbound/Makefile (unresolved)
This commit is contained in:
Shawn Webb
commit
a726e724d7
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.if !targets(__<${_this:T}>__)
|
.if !targets(__<${_this:T}>__)
|
||||||
__<${_this:T}>__:
|
__<${_this:T}>__:
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
SUBDIR= cat \
|
SUBDIR= cat \
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
BINDIR?= /bin
|
BINDIR?= /bin
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
NETBSD_ATF_TESTS_SH= cat_test
|
NETBSD_ATF_TESTS_SH= cat_test
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH+= chflags_test
|
ATF_TESTS_SH+= chflags_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=utilities
|
PACKAGE=utilities
|
||||||
PROG= chio
|
PROG= chio
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH+= chmod_test
|
ATF_TESTS_SH+= chmod_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
ATF_TESTS_SH= cp_test
|
ATF_TESTS_SH= cp_test
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PROG= cpuset
|
PROG= cpuset
|
||||||
|
|
||||||
LIBADD= jail
|
LIBADD= jail
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH= format_string_test
|
ATF_TESTS_SH= format_string_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH= dd2_test
|
ATF_TESTS_SH= dd2_test
|
||||||
NETBSD_ATF_TESTS_SH= dd_test
|
NETBSD_ATF_TESTS_SH= dd_test
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|
||||||
PROG= df
|
PROG= df
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=yp
|
PACKAGE=yp
|
||||||
PROG= domainname
|
PROG= domainname
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH+= echo_test
|
ATF_TESTS_SH+= echo_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
SHELL= /bin/sh
|
SHELL= /bin/sh
|
||||||
ED= ${.OBJDIR}/ed
|
ED= ${.OBJDIR}/ed
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
NETBSD_ATF_TESTS_SH= expr_test
|
NETBSD_ATF_TESTS_SH= expr_test
|
||||||
|
|
||||||
ATF_TESTS_SH_SED_expr_test+= -e 's/eval expr/eval expr --/g'
|
ATF_TESTS_SH_SED_expr_test+= -e 's/eval expr/eval expr --/g'
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
SCRIPTS = freebsd-version
|
SCRIPTS = freebsd-version
|
||||||
MAN = freebsd-version.1
|
MAN = freebsd-version.1
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
PROG= getfacl
|
PROG= getfacl
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
PROG= kenv
|
PROG= kenv
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
PROG= kill
|
PROG= kill
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH+= ln_test
|
ATF_TESTS_SH+= ln_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH+= ls_tests
|
ATF_TESTS_SH+= ls_tests
|
||||||
# This seems like overkill, but the idea in mind is that all of the testcases
|
# This seems like overkill, but the idea in mind is that all of the testcases
|
||||||
# should be runnable as !root
|
# should be runnable as !root
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH+= mkdir_test
|
ATF_TESTS_SH+= mkdir_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
TAP_TESTS_SH= legacy_test
|
TAP_TESTS_SH= legacy_test
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
TAP_TESTS_PERL= legacy_test
|
TAP_TESTS_PERL= legacy_test
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
PROG= ps
|
PROG= ps
|
||||||
SRCS= fmt.c keyword.c nlist.c print.c ps.c
|
SRCS= fmt.c keyword.c nlist.c print.c ps.c
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH= pwait_test
|
ATF_TESTS_SH= pwait_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
PROG= pwd
|
PROG= pwd
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
PROG= realpath
|
PROG= realpath
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH+= rm_test
|
ATF_TESTS_SH+= rm_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=sendmail
|
PACKAGE=sendmail
|
||||||
SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
|
SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
|
||||||
.PATH: ${SENDMAIL_DIR}/rmail
|
.PATH: ${SENDMAIL_DIR}/rmail
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH+= rmdir_test
|
ATF_TESTS_SH+= rmdir_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
PROG= setfacl
|
PROG= setfacl
|
||||||
SRCS= file.c mask.c merge.c remove.c setfacl.c util.c
|
SRCS= file.c mask.c merge.c remove.c setfacl.c util.c
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
CONFGROUPS= ETC ROOT
|
CONFGROUPS= ETC ROOT
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
TESTS_SUBDIRS+= builtins
|
TESTS_SUBDIRS+= builtins
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= tests
|
PACKAGE= tests
|
||||||
|
|
||||||
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
NETBSD_ATF_TESTS_SH= sleep_test
|
NETBSD_ATF_TESTS_SH= sleep_test
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
PROG= stty
|
PROG= stty
|
||||||
SRCS= cchar.c gfmt.c key.c modes.c print.c stty.c util.c
|
SRCS= cchar.c gfmt.c key.c modes.c print.c stty.c util.c
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
PROG= sync
|
PROG= sync
|
||||||
MAN= sync.8
|
MAN= sync.8
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PACKAGE=runtime
|
PACKAGE=runtime
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
TAP_TESTS_SH= legacy_test
|
TAP_TESTS_SH= legacy_test
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/tests
|
.PATH: ${SRCTOP}/tests
|
||||||
KYUAFILE= yes
|
KYUAFILE= yes
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
PROG= timeout
|
PROG= timeout
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ATF_TESTS_SH= timeout_test
|
ATF_TESTS_SH= timeout_test
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
PACKAGE= runtime
|
PACKAGE= runtime
|
||||||
PROG= uuidgen
|
PROG= uuidgen
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
SUBDIR= lib .WAIT \
|
SUBDIR= lib .WAIT \
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
|
OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
|
||||||
OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
|
OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
.if ${MK_DTRACE} == yes || ${MK_ZFS} == yes
|
.if ${MK_DTRACE} == yes || ${MK_ZFS} == yes
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
SHLIBDIR?= /lib
|
SHLIBDIR?= /lib
|
||||||
SHLIB_MAJOR?= 2
|
SHLIB_MAJOR?= 2
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common
|
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common
|
||||||
|
|
||||||
PACKAGE= dtrace
|
PACKAGE= dtrace
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
|
||||||
|
|
||||||
PACKAGE= zfs
|
PACKAGE= zfs
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/common/ctf
|
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/common/ctf
|
||||||
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common
|
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common
|
||||||
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf
|
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
SHLIBDIR?= /lib
|
SHLIBDIR?= /lib
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
|
||||||
|
|
||||||
PACKAGE= zfs
|
PACKAGE= zfs
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
|
||||||
|
|
||||||
PACKAGE= utilities
|
PACKAGE= utilities
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
.include <bsd.compiler.mk>
|
.include <bsd.compiler.mk>
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
|
.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
|
||||||
|
|
||||||
PACKAGE= zfs
|
PACKAGE= zfs
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
|
||||||
|
|
||||||
PACKAGE= zfs
|
PACKAGE= zfs
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
||||||
|
|
||||||
# ZFS_COMMON_SRCS
|
# ZFS_COMMON_SRCS
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/tests
|
.PATH: ${SRCTOP}/tests
|
||||||
KYUAFILE= yes
|
KYUAFILE= yes
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
SUBDIR.${MK_TESTS}+= tests
|
SUBDIR.${MK_TESTS}+= tests
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
BINDIR?= /sbin
|
BINDIR?= /sbin
|
||||||
|
|
||||||
.include "../Makefile.inc"
|
.include "../Makefile.inc"
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.PATH: ${SRCTOP}/tests
|
.PATH: ${SRCTOP}/tests
|
||||||
KYUAFILE= yes
|
KYUAFILE= yes
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
||||||
|
|
||||||
.PATH: ${ZFSTOP}/cmd/zfs
|
.PATH: ${ZFSTOP}/cmd/zfs
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
||||||
|
|
||||||
.PATH: ${ZFSTOP}/man/man4
|
.PATH: ${ZFSTOP}/man/man4
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
SUBDIR.${MK_ZFS}+= zfs
|
SUBDIR.${MK_ZFS}+= zfs
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
SUBDIR= compatibility.d
|
SUBDIR= compatibility.d
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
||||||
|
|
||||||
.PATH: ${ZFSTOP}/cmd/zpool/compatibility.d
|
.PATH: ${ZFSTOP}/cmd/zpool/compatibility.d
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user