diff options
author | gjb <gjb@FreeBSD.org> | 2016-04-29 05:28:40 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2016-04-29 05:28:40 +0000 |
commit | 06b209e9f5a8dcaee81d632c1c5b3785a1ec6382 (patch) | |
tree | c76f8a71c5521ffc0b912376ae03be98a81ff7b3 | |
parent | 695162c3413a87933c9895e4de9fb4fda8cb7ac9 (diff) | |
download | FreeBSD-src-06b209e9f5a8dcaee81d632c1c5b3785a1ec6382.zip FreeBSD-src-06b209e9f5a8dcaee81d632c1c5b3785a1ec6382.tar.gz |
Fix including Kyuafile in packaged base system.
Fix a related typo while here.
Note, this change results in the Kyuafile inclusion in the runtime
package, which needs to be fixed, however addresses the PR as far
as I can tell in my tests.
PR: 209114
Submitted by: ngie
Sponsored by: The FreeBSD Foundation
31 files changed, 63 insertions, 32 deletions
diff --git a/bin/tests/Makefile b/bin/tests/Makefile index 609357e..06058a0 100644 --- a/bin/tests/Makefile +++ b/bin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/lib/tests/Makefile b/cddl/lib/tests/Makefile index 609357e..06058a0 100644 --- a/cddl/lib/tests/Makefile +++ b/cddl/lib/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile index 609357e..06058a0 100644 --- a/cddl/sbin/tests/Makefile +++ b/cddl/sbin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile index 609357e..06058a0 100644 --- a/cddl/tests/Makefile +++ b/cddl/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile index 609357e..06058a0 100644 --- a/cddl/usr.bin/tests/Makefile +++ b/cddl/usr.bin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/usr.sbin/tests/Makefile b/cddl/usr.sbin/tests/Makefile index 609357e..06058a0 100644 --- a/cddl/usr.sbin/tests/Makefile +++ b/cddl/usr.sbin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile index 609357e..06058a0 100644 --- a/gnu/lib/tests/Makefile +++ b/gnu/lib/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/gnu/tests/Makefile b/gnu/tests/Makefile index 609357e..06058a0 100644 --- a/gnu/tests/Makefile +++ b/gnu/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/gnu/usr.bin/tests/Makefile b/gnu/usr.bin/tests/Makefile index 609357e..06058a0 100644 --- a/gnu/usr.bin/tests/Makefile +++ b/gnu/usr.bin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile index 296d2dd..13f3819 100644 --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -2,8 +2,9 @@ .include <bsd.init.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile index ee99804..44ed728 100644 --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf TESTS+= Kyuafile diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile index 24f7b79..4d756cf 100644 --- a/lib/atf/tests/test-programs/Makefile +++ b/lib/atf/tests/test-programs/Makefile @@ -2,8 +2,9 @@ .include <bsd.init.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf/test-programs TESTS+= Kyuafile diff --git a/lib/tests/Makefile b/lib/tests/Makefile index 609357e..06058a0 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/libexec/atf/atf-sh/tests/Makefile b/libexec/atf/atf-sh/tests/Makefile index db2200b..b52c88d 100644 --- a/libexec/atf/atf-sh/tests/Makefile +++ b/libexec/atf/atf-sh/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.init.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile index 609357e..06058a0 100644 --- a/libexec/atf/tests/Makefile +++ b/libexec/atf/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile index 04afe9a..06058a0 100644 --- a/libexec/tests/Makefile +++ b/libexec/tests/Makefile @@ -2,10 +2,11 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} -TEST+= Kyuafile +TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/sbin/tests/Makefile b/sbin/tests/Makefile index 609357e..06058a0 100644 --- a/sbin/tests/Makefile +++ b/sbin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/lib/tests/Makefile b/secure/lib/tests/Makefile index 609357e..06058a0 100644 --- a/secure/lib/tests/Makefile +++ b/secure/lib/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile index 609357e..06058a0 100644 --- a/secure/libexec/tests/Makefile +++ b/secure/libexec/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/tests/Makefile b/secure/tests/Makefile index 609357e..06058a0 100644 --- a/secure/tests/Makefile +++ b/secure/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/usr.bin/tests/Makefile b/secure/usr.bin/tests/Makefile index 609357e..06058a0 100644 --- a/secure/usr.bin/tests/Makefile +++ b/secure/usr.bin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/usr.sbin/tests/Makefile b/secure/usr.sbin/tests/Makefile index 609357e..06058a0 100644 --- a/secure/usr.sbin/tests/Makefile +++ b/secure/usr.sbin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/share/examples/tests/Makefile b/share/examples/tests/Makefile index c543aa3..77d89a4 100644 --- a/share/examples/tests/Makefile +++ b/share/examples/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/share/examples/tests/tests/Makefile b/share/examples/tests/tests/Makefile index c417531..08b6049 100644 --- a/share/examples/tests/tests/Makefile +++ b/share/examples/tests/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} # Directory into which the Kyuafile provided by this directory will be diff --git a/share/examples/tests/tests/atf/Makefile b/share/examples/tests/tests/atf/Makefile index ef96dcb..6628a21 100644 --- a/share/examples/tests/tests/atf/Makefile +++ b/share/examples/tests/tests/atf/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/share/examples/tests/tests/plain/Makefile b/share/examples/tests/tests/plain/Makefile index 0b82397..e01de61 100644 --- a/share/examples/tests/tests/plain/Makefile +++ b/share/examples/tests/tests/plain/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/share/tests/Makefile b/share/tests/Makefile index 6448a41..f3c2ef3 100644 --- a/share/tests/Makefile +++ b/share/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile TESTSDIR= ${TESTSBASE}/share diff --git a/tests/Makefile b/tests/Makefile index ba743ee..92e462f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/tests/etc/Makefile b/tests/etc/Makefile index 7e73a48..6e02e32 100644 --- a/tests/etc/Makefile +++ b/tests/etc/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/usr.bin/tests/Makefile b/usr.bin/tests/Makefile index e8e8e80..77a87ea 100644 --- a/usr.bin/tests/Makefile +++ b/usr.bin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile index 609357e..06058a0 100644 --- a/usr.sbin/tests/Makefile +++ b/usr.sbin/tests/Makefile @@ -2,8 +2,9 @@ .include <bsd.own.mk> +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile |