From owner-svn-src-head@freebsd.org  Fri Sep 18 23:12:39 2015
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 4B5DB9CFAD2;
 Fri, 18 Sep 2015 23:12:39 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 355FD179A;
 Fri, 18 Sep 2015 23:12:39 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8INCdeM035201;
 Fri, 18 Sep 2015 23:12:39 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8INCdFu035200;
 Fri, 18 Sep 2015 23:12:39 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201509182312.t8INCdFu035200@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 18 Sep 2015 23:12:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287977 - head/libexec/rtld-elf
X-SVN-Group: head
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.20
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: Fri, 18 Sep 2015 23:12:39 -0000

Author: bdrewery
Date: Fri Sep 18 23:12:38 2015
New Revision: 287977
URL: https://svnweb.freebsd.org/changeset/base/287977

Log:
  META_MODE: No need to fix the link in this case.
  
  The exists(${DESTDIR}...) check runs with DESTDIR being blank.  When the
  target runs it does have DESTDIR=${STAGE_OBJTOP} via bsd.sys.mk.  This
  results in the first execution warning that the symlink is missing.  The
  second run does run fine.  However, this chflags is not needed at all
  for META_MODE/STAGING since we never had this path being a schg file
  while using META_MODE.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/libexec/rtld-elf/Makefile

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Fri Sep 18 22:55:18 2015	(r287976)
+++ head/libexec/rtld-elf/Makefile	Fri Sep 18 23:12:38 2015	(r287977)
@@ -77,7 +77,7 @@ SYMBOL_MAPS+=	${.CURDIR}/${RTLD_ARCH}/Sy
 # Since moving rtld-elf to /libexec, we need to create a symlink.
 # Fixup the existing binary that's there so we can symlink over it.
 beforeinstall:
-.if exists(${DESTDIR}/usr/libexec/${PROG})
+.if exists(${DESTDIR}/usr/libexec/${PROG}) && ${MK_STAGING} == "no"
 	-chflags -h noschg ${DESTDIR}/usr/libexec/${PROG}
 .endif