From owner-svn-src-all@freebsd.org Thu Jul 7 18:16:33 2016 Return-Path: Delivered-To: svn-src-all@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 0E034B75374 for ; Thu, 7 Jul 2016 18:16:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22a.google.com (mail-it0-x22a.google.com [IPv6:2607:f8b0:4001:c0b::22a]) (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 CB0921A77 for ; Thu, 7 Jul 2016 18:16:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22a.google.com with SMTP id h190so26371785ith.1 for ; Thu, 07 Jul 2016 11:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=db/JZW84ChpgKebV28egscRQ59TuSy/ZKLXK+DZ8rVM=; b=u9DOOxBo22jakxMU4JL49qPyvPD178ygPP274bTw7OAwbWJlngpp2n0omX4iGD8A+J O9nbxfBoOQkOAlQ38nbKBosJMrRtsN16xAuHD7qUBo1tu/Qg45UFeKhi4XhdDM44AYoi 2IBpRyxoSsBnkAMu7sNuM+rw64S40Os5WespnunvNcyO4pgHowvmRWD+Oo6HO7BZuaNx P+7H87NXiDCY+QCV0RPMUOC2AlN1lwSAG6fkz6HYrLxpGlvxrQggUOUjlD2LKMTTqmat Q6U7A5Xm3hRxOkaFaL9EcFyzzUoZKtNhgC49bB4Y4rt8+JBehquYoXK50h1YIX+WCS23 wjBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=db/JZW84ChpgKebV28egscRQ59TuSy/ZKLXK+DZ8rVM=; b=MO85WTlAN34ROs/RNc3W4zfIQbeRXzGRf+ilXky7yylHSnTvwubvuRly5g5VeGIJNF Lvzm1S/wfoxL7BcYuWoV6pxx1cqF06kNnX9s+n4XxIzTnVr1ecleMcnxVUTNwh0F8olB MLxg/CB5bcYmdC8TqtXQS5PCUkMPW3VZie/IcqzJEGqdjyV2cAgM2x3ytuTaRhDFohmw oWEiaRiTG0HfqnN2+Y3ksNXNaDKRTThWaWMv+tlqYcpskFsggy0MU85EfYggz1X/FsRu Ad1GTjfx+XxWrz9mVMsLcqY8V4ogbvgRNYeQE6i9Ab2Bu+Yj2fTYL0i0buZonK4f5nvw a+pg== X-Gm-Message-State: ALyK8tKJbO43Ynu6sw+qZLDkHwW9AhOXMxmKlzLiwgISI2FXbUycVeXv0ZtqW3BSImlHwSHc9k6esbgnLxJR2w== X-Received: by 10.36.41.16 with SMTP id p16mr4708367itp.60.1467915391404; Thu, 07 Jul 2016 11:16:31 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.137.131 with HTTP; Thu, 7 Jul 2016 11:16:30 -0700 (PDT) X-Originating-IP: [69.53.245.200] In-Reply-To: <66204d85-cda5-9fe5-7d75-67672b57b54b@FreeBSD.org> References: <201607071525.u67FPE5F002659@repo.freebsd.org> <66204d85-cda5-9fe5-7d75-67672b57b54b@FreeBSD.org> From: Warner Losh Date: Thu, 7 Jul 2016 12:16:30 -0600 X-Google-Sender-Auth: VDFAOVJeTbpy_X5I9htlNmAML50 Message-ID: Subject: Re: svn commit: r302391 - head To: Bryan Drewery Cc: Andrew Turner , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jul 2016 18:16:33 -0000 On Thu, Jul 7, 2016 at 12:08 PM, Bryan Drewery wrote: > 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. Also, shouldn't we have some MK variable that controls this in the first place? This ifdef soup needs to be cleaned up. Warner > # 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 >