From owner-svn-src-head@freebsd.org  Thu Jul  7 18:09:05 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 C6E8AB7514C;
 Thu,  7 Jul 2016 18:09:05 +0000 (UTC)
 (envelope-from bdrewery@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 B7195156C;
 Thu,  7 Jul 2016 18:09:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [IPv6:::1])
 by freefall.freebsd.org (Postfix) with ESMTP id B09B11148;
 Thu,  7 Jul 2016 18:09:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [172.31.3.2])
 by mail.xzibition.com (Postfix) with ESMTP id 638E518B21;
 Thu,  7 Jul 2016 18:09:05 +0000 (UTC)
X-Virus-Scanned: amavisd-new at mail.xzibition.com
Received: from mail.xzibition.com ([172.31.3.2])
 by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new,
 port 10026)
 with LMTP id UtcdDaDmtcRP; Thu,  7 Jul 2016 18:09:02 +0000 (UTC)
Subject: Re: svn commit: r302391 - head
DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com E295518B17
To: Andrew Turner <andrew@FreeBSD.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
References: <201607071525.u67FPE5F002659@repo.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Organization: FreeBSD
Message-ID: <66204d85-cda5-9fe5-7d75-67672b57b54b@FreeBSD.org>
Date: Thu, 7 Jul 2016 11:08:59 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0)
 Gecko/20100101 Thunderbird/45.2.0
MIME-Version: 1.0
In-Reply-To: <201607071525.u67FPE5F002659@repo.freebsd.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jul 2016 18:09:05 -0000

On 7/7/16 8:25 AM, Andrew Turner wrote:
> Author: andrew
> Date: Thu Jul  7 15:25:14 2016
> New Revision: 302391
> URL: https://svnweb.freebsd.org/changeset/base/302391
> 
> Log:
>   Stop deleting ofwdump.8.gz on arm and arm64 when running make delete-old,
>   it is installed on these architectures.
>   
>   Approved by:	re (kib)
>   Sponsored by:	ABT Systems Ltd
> 
> Modified:
>   head/ObsoleteFiles.inc
> 
> Modified: head/ObsoleteFiles.inc
> ==============================================================================
> --- head/ObsoleteFiles.inc	Thu Jul  7 14:29:23 2016	(r302390)
> +++ head/ObsoleteFiles.inc	Thu Jul  7 15:25:14 2016	(r302391)
> @@ -8014,7 +8014,9 @@ OLD_FILES+=usr/share/man/man5/usbd.conf.
>  .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
>  OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
>  .endif
> -.if ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && ${TARGET_ARCH} != "sparc64"
> +.if ${TARGET_ARCH} != "aarch64" && ${TARGET_CPUARCH} != "arm" && \

TARGET_CPUARCH is not valid here.

# make check-old
make[1]: "/root/git/freebsd/ObsoleteFiles.inc" line 8019: Malformed
conditional (${TARGET_ARCH} != "aarch64" && ${TARGET_CPUARCH} != "arm"
&&  ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" &&
${TARGET_ARCH} != "sparc64")
make[1]: Fatal errors encountered -- cannot continue
make[1]: stopped in /root/git/freebsd

> +    ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && \
> +    ${TARGET_ARCH} != "sparc64"
>  OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
>  .endif
>  OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
> 


-- 
Regards,
Bryan Drewery