diff options
| author | Isaac Freund <ifreund@freebsdfoundation.org> | 2024-12-23 15:54:29 -0600 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2024-12-23 17:03:30 -0500 |
| commit | 3a56015a2f5d630910177fa79a522bb95511ccf7 (patch) | |
| tree | 086b5446664f4ce564f005fc11e154d3bab729f2 /secure | |
| parent | 969d1aa4dbfcbccd8de965f7761203208bf04e46 (diff) | |
pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev
Currently, files that belong in the tests package are included in the
ssh, bsnmp, and clibs-dev packages:
ssh.plist
24:@dir(root,wheel,0755,) /usr/tests/secure/libexec
25:@(root,wheel,0444,) /usr/tests/secure/libexec/Kyuafile
bsnmp.plist
82:@dir(root,wheel,0755,) /usr/tests/lib/libbsnmp
83:@(root,wheel,0444,) /usr/tests/lib/libbsnmp/Kyuafile
84:@(root,wheel,0555,) /usr/tests/lib/libbsnmp/bsnmpd_test
clibs-dev.plist
2518:@dir(root,wheel,0755,) /usr/tests/lib/csu
2519:@(root,wheel,0444,) /usr/tests/lib/csu/Kyuafile
This is caused by the PACKAGE=foo assignment in foo/Makefile.inc which
overrides the default PACKAGE?=tests in bsd.test.mk.
To fix this, instead use PACKAGE?=foo in foo/Makefile.inc and set
PACKAGE=tests in foo/tests/Makefile.
PR: 249144
Reviewed by: bapt, emaste
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D47025
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/libexec/Makefile.inc | 2 | ||||
| -rw-r--r-- | secure/libexec/tests/Makefile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc index 8998b613dda3..e5e48d7a9b37 100644 --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -1,4 +1,4 @@ BINDIR?= /usr/libexec -PACKAGE= ssh +PACKAGE?= ssh .include "../Makefile.inc" diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile index 29b1b564beca..e142d9c1e98a 100644 --- a/secure/libexec/tests/Makefile +++ b/secure/libexec/tests/Makefile @@ -1,4 +1,5 @@ .PATH: ${SRCTOP}/tests KYUAFILE= yes +PACKAGE= tests .include <bsd.test.mk> |