From owner-svn-src-head@freebsd.org Thu Mar 26 17:34:29 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1F33C2A5200; Thu, 26 Mar 2020 17:34:29 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pBtq4Y92z3RFm; Thu, 26 Mar 2020 17:34:27 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A2FAD9F95; Thu, 26 Mar 2020 17:34:18 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02QHYIwl014501; Thu, 26 Mar 2020 17:34:18 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02QHYHq2014497; Thu, 26 Mar 2020 17:34:17 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202003261734.02QHYHq2014497@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Thu, 26 Mar 2020 17:34:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359335 - in head: etc/mtree lib/kyua lib/kyua/cli usr.bin/kyua X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head: etc/mtree lib/kyua lib/kyua/cli usr.bin/kyua X-SVN-Commit-Revision: 359335 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 17:34:29 -0000 Author: brooks Date: Thu Mar 26 17:34:17 2020 New Revision: 359335 URL: https://svnweb.freebsd.org/changeset/base/359335 Log: Install expected kyua docs. The "kyua about" command assumes these files exist causing tests supplied devel/kyua to fail. Fix a bug defining the default KYUA_DOCDIR so the installed files can be found. Reported by: jenkins tests Reviewed by: lwhsu Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D24187 Modified: head/etc/mtree/BSD.usr.dist head/lib/kyua/Makefile.kyua head/lib/kyua/cli/Makefile head/usr.bin/kyua/Makefile Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Thu Mar 26 17:28:54 2020 (r359334) +++ head/etc/mtree/BSD.usr.dist Thu Mar 26 17:34:17 2020 (r359335) @@ -219,6 +219,8 @@ .. atf .. + kyua + .. legal .. llvm Modified: head/lib/kyua/Makefile.kyua ============================================================================== --- head/lib/kyua/Makefile.kyua Thu Mar 26 17:28:54 2020 (r359334) +++ head/lib/kyua/Makefile.kyua Thu Mar 26 17:34:17 2020 (r359335) @@ -3,7 +3,7 @@ KYUA_VERSION= 0.13 KYUA_CONFDIR= /etc/kyua -KYUA_DOCDIR= /nonexistant +KYUA_DOCDIR= /usr/share/doc/kyua KYUA_EGDIR= /usr/share/examples/kyua KYUA_MISCDIR= /usr/share/kyua/misc KYUA_STOREDIR= /usr/share/kyua/store Modified: head/lib/kyua/cli/Makefile ============================================================================== --- head/lib/kyua/cli/Makefile Thu Mar 26 17:28:54 2020 (r359334) +++ head/lib/kyua/cli/Makefile Thu Mar 26 17:34:17 2020 (r359335) @@ -4,7 +4,7 @@ KYUA_LIB= cli INTERNALLIB= LIBADD= kyua_drivers kyua_engine kyua_model kyua_store kyua_utils CFLAGS+= -DKYUA_CONFDIR=\"${KYUA_CONFDIR}\" \ - -DKYUA_DOCDIR=\"${KYUA_CONFDIR}\" \ + -DKYUA_DOCDIR=\"${KYUA_DOCDIR}\" \ -DKYUA_MISCDIR=\"${KYUA_MISCDIR}\" \ -DPACKAGE=\"kyua\" \ -DPACKAGE_NAME=\"Kyua\" \ Modified: head/usr.bin/kyua/Makefile ============================================================================== --- head/usr.bin/kyua/Makefile Thu Mar 26 17:28:54 2020 (r359334) +++ head/usr.bin/kyua/Makefile Thu Mar 26 17:34:17 2020 (r359335) @@ -28,10 +28,13 @@ CFLAGS+= -I${KYUA_SRCDIR} # kyua uses auto_ptr CFLAGS+= -Wno-deprecated-declarations -FILESGROUPS= EXAMPLES MISC STORE +FILESGROUPS= DOCS EXAMPLES MISC STORE CONFS= kyua.conf CONFSDIR= ${KYUA_CONFDIR} + +DOCS= AUTHORS CONTRIBUTORS LICENSE +DOCSDIR= ${KYUA_DOCDIR} EXAMPLES= Kyuafile.top kyua.conf EXAMPLESDIR= ${KYUA_EGDIR}