From owner-freebsd-bugs@FreeBSD.ORG Tue Mar 12 23:10:00 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A5A29CA1 for ; Tue, 12 Mar 2013 23:10:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 89E0EF62 for ; Tue, 12 Mar 2013 23:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CNA0lT006681 for ; Tue, 12 Mar 2013 23:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2CNA0vR006680; Tue, 12 Mar 2013 23:10:00 GMT (envelope-from gnats) Resent-Date: Tue, 12 Mar 2013 23:10:00 GMT Resent-Message-Id: <201303122310.r2CNA0vR006680@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9FF72957 for ; Tue, 12 Mar 2013 23:02:26 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 783AEEEA for ; Tue, 12 Mar 2013 23:02:26 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2CN2QIb031084 for ; Tue, 12 Mar 2013 23:02:26 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r2CN2QlJ031083; Tue, 12 Mar 2013 23:02:26 GMT (envelope-from nobody) Message-Id: <201303122302.r2CN2QlJ031083@red.freebsd.org> Date: Tue, 12 Mar 2013 23:02:26 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: conf/176897: [PATCH] make distrib-dirs doesn't detect missing mtree files X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 23:10:00 -0000 >Number: 176897 >Category: conf >Synopsis: [PATCH] make distrib-dirs doesn't detect missing mtree files >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Mar 12 23:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: 10-CURRENT >Organization: EMC Isilon >Environment: FreeBSD fuji-current.local 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r+6fb31dd: Tue Mar 12 15:32:36 PDT 2013 root@fuji-current.local:/usr/obj/usr/src/sys/FUJI i386 >Description: Ran make hierarchy and didn't realize there was a typo on my git branch with the MTREES var (BSD.test.dist -> BSD.tests.dist). At the very least distrib-dirs should depend on the mtree file. This hack (a proper solution would be to make it a dependency of the target, but that would involve a large degree of gymnastics) would address that: diff --git a/etc/Makefile b/etc/Makefile index 3a10b02..7ac3bec 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -335,6 +335,7 @@ distrib-dirs: @set ${MTREES}; \ while test $$# -ge 2; do \ m=${.CURDIR}/$$1; \ + test -e $$m; \ shift; \ d=${DESTDIR}$$1; \ shift; \ >How-To-Repeat: 1. Apply this patch: diff --git a/etc/Makefile b/etc/Makefile index 3a10b02..6f15fd0 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -308,7 +308,7 @@ distribution: MTREE_CMD?= mtree -MTREES= mtree/BSD.root.dist / \ +MTREES= mtree/BSD.roots.dist / \ mtree/BSD.var.dist /var \ mtree/BSD.usr.dist /usr \ mtree/BSD.include.dist /usr/include 2. Run make hierarchy from the top-level directory. >Fix: >Release-Note: >Audit-Trail: >Unformatted: