From owner-svn-src-stable@freebsd.org Tue Jan 5 05:38:07 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4678A62093; Tue, 5 Jan 2016 05:38:07 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-ig0-x235.google.com (mail-ig0-x235.google.com [IPv6:2607:f8b0:4001:c05::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8358E1343; Tue, 5 Jan 2016 05:38:07 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by mail-ig0-x235.google.com with SMTP id to18so6246401igc.0; Mon, 04 Jan 2016 21:38:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=kFmyVvfpOutgLSO/u4gGnEDGz22QhbLtWhs7Yy/yUPs=; b=H254qbUeqWFvlVZGuHJhPmKca3NEZwA5K/mcuqelnInll8n042E2SPoF1HemivKASv fGxziZB5tcnHYxw+D+7V4raU/xMzmzxCHThNVhieQ/5bZKDZHzkFepsKvIbJlPEFUFaf 8e//6QFojZHUVPT5dhN4nd5QX1dPadvn1VMybLc71jCpensD4HrMThQFB0hyldPjk2KU CB/1R1qz+YVxvBCcG88QsoZDkdV8tAdu8Hp8279+WjfKieMjaOWeezjycddbk1Y5nWnd xBqWFzm7ojt0gOTD9O1ibnrRPCAHMrnxMd6SZjjIZjZu/KZcL7L0RAdEJKZFh1JQJJFX y7jg== MIME-Version: 1.0 X-Received: by 10.50.36.74 with SMTP id o10mr1892793igj.73.1451972286918; Mon, 04 Jan 2016 21:38:06 -0800 (PST) Sender: crodr001@gmail.com Received: by 10.50.152.69 with HTTP; Mon, 4 Jan 2016 21:38:06 -0800 (PST) In-Reply-To: <201501202339.t0KNd9J6007337@svn.freebsd.org> References: <201501202339.t0KNd9J6007337@svn.freebsd.org> Date: Tue, 5 Jan 2016 00:38:06 -0500 X-Google-Sender-Auth: U8v-uhDkSawXo1m0Wn6MUxgE_X8 Message-ID: Subject: Re: svn commit: r277457 - in stable/10: . etc etc/mtree tools/build/mk From: Craig Rodrigues To: Garrett Cooper Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2016 05:38:07 -0000 On Tue, Jan 20, 2015 at 6:39 PM, Garrett Cooper wrote: > Author: ngie > Date: Tue Jan 20 23:39:08 2015 > New Revision: 277457 > URL: https://svnweb.freebsd.org/changeset/base/277457 > > Log: > MFC r275907: > > r275907 (by ngie): > > Fix building/installing tests when TESTSBASE != /usr/tests > > This merge is botched. Can you fix this? mtree is now creating these directories under /usr/tests/sys which is wrong, and causing "installworld" to fail if src.conf contains WITH_TESTS="yes" usr/tests/sys/usr.sbin usr/tests/sys/usr.sbin/sa usr/tests/sys/usr.sbin/pw usr/tests/sys/usr.sbin/fstyp usr/tests/sys/usr.sbin/nmtree usr/tests/sys/usr.sbin/newsyslog usr/tests/sys/usr.sbin/etcupdate usr/tests/sys/usr.sbin/makefs usr/tests/sys/usr.bin usr/tests/sys/usr.bin/tar usr/tests/sys/usr.bin/cut usr/tests/sys/usr.bin/comm usr/tests/sys/usr.bin/col usr/tests/sys/usr.bin/cpio usr/tests/sys/usr.bin/file2c usr/tests/sys/usr.bin/uudecode usr/tests/sys/usr.bin/truncate usr/tests/sys/usr.bin/cmp usr/tests/sys/usr.bin/m4 usr/tests/sys/usr.bin/grep usr/tests/sys/usr.bin/timeout usr/tests/sys/usr.bin/lastcomm usr/tests/sys/usr.bin/ncal usr/tests/sys/usr.bin/yacc usr/tests/sys/usr.bin/yacc/yacc usr/tests/sys/usr.bin/join usr/tests/sys/usr.bin/bmake usr/tests/sys/usr.bin/bmake/basic usr/tests/sys/usr.bin/bmake/basic/t3 usr/tests/sys/usr.bin/bmake/basic/t0 usr/tests/sys/usr.bin/bmake/basic/t2 usr/tests/sys/usr.bin/bmake/basic/t1 usr/tests/sys/usr.bin/bmake/shell usr/tests/sys/usr.bin/bmake/shell/select usr/tests/sys/usr.bin/bmake/shell/meta usr/tests/sys/usr.bin/bmake/shell/path usr/tests/sys/usr.bin/bmake/shell/path_select usr/tests/sys/usr.bin/bmake/shell/builtin usr/tests/sys/usr.bin/bmake/shell/replace usr/tests/sys/usr.bin/bmake/sysmk usr/tests/sys/usr.bin/bmake/sysmk/t1 usr/tests/sys/usr.bin/bmake/sysmk/t1/2 usr/tests/sys/usr.bin/bmake/sysmk/t1/2/1 usr/tests/sys/usr.bin/bmake/sysmk/t1/mk usr/tests/sys/usr.bin/bmake/sysmk/t2 usr/tests/sys/usr.bin/bmake/sysmk/t2/mk usr/tests/sys/usr.bin/bmake/sysmk/t2/2 usr/tests/sys/usr.bin/bmake/sysmk/t2/2/1 usr/tests/sys/usr.bin/bmake/sysmk/t0 usr/tests/sys/usr.bin/bmake/sysmk/t0/mk usr/tests/sys/usr.bin/bmake/sysmk/t0/2 usr/tests/sys/usr.bin/bmake/sysmk/t0/2/1 usr/tests/sys/usr.bin/bmake/variables usr/tests/sys/usr.bin/bmake/variables/modifier_t usr/tests/sys/usr.bin/bmake/variables/opt_V usr/tests/sys/usr.bin/bmake/variables/t0 usr/tests/sys/usr.bin/bmake/variables/modifier_M usr/tests/sys/usr.bin/bmake/archives usr/tests/sys/usr.bin/bmake/archives/fmt_oldbsd usr/tests/sys/usr.bin/bmake/archives/fmt_44bsd_mod usr/tests/sys/usr.bin/bmake/archives/fmt_44bsd usr/tests/sys/usr.bin/bmake/suffixes usr/tests/sys/usr.bin/bmake/suffixes/basic usr/tests/sys/usr.bin/bmake/suffixes/src_wild2 usr/tests/sys/usr.bin/bmake/suffixes/src_wild1 usr/tests/sys/usr.bin/bmake/execution usr/tests/sys/usr.bin/bmake/execution/plus usr/tests/sys/usr.bin/bmake/execution/ellipsis usr/tests/sys/usr.bin/bmake/execution/joberr usr/tests/sys/usr.bin/bmake/execution/empty usr/tests/sys/usr.bin/bmake/syntax usr/tests/sys/usr.bin/bmake/syntax/enl usr/tests/sys/usr.bin/bmake/syntax/funny-targets usr/tests/sys/usr.bin/bmake/syntax/directive-t0 usr/tests/sys/usr.bin/bmake/syntax/semi usr/tests/sys/usr.bin/sed usr/tests/sys/usr.bin/sed/regress.multitest.out usr/tests/sys/usr.bin/apply usr/tests/sys/usr.bin/opensm usr/tests/sys/usr.bin/calendar usr/tests/sys/usr.bin/limits usr/tests/sys/usr.bin/jot usr/tests/sys/usr.bin/tr usr/tests/sys/usr.bin/printf usr/tests/sys/usr.bin/dirname usr/tests/sys/usr.bin/xargs usr/tests/sys/usr.bin/uuencode usr/tests/sys/usr.bin/gzip usr/tests/sys/usr.bin/basename -- Craig