From owner-svn-src-head@FreeBSD.ORG  Tue Dec  4 12:39:26 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D3CB0752;
 Tue,  4 Dec 2012 12:39:26 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B8BB68FC08;
 Tue,  4 Dec 2012 12:39:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB4CdQwL083957;
 Tue, 4 Dec 2012 12:39:26 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB4CdQJp083956;
 Tue, 4 Dec 2012 12:39:26 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201212041239.qB4CdQJp083956@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Tue, 4 Dec 2012 12:39:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243861 - 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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Dec 2012 12:39:26 -0000

Author: pjd
Date: Tue Dec  4 12:39:26 2012
New Revision: 243861
URL: http://svnweb.freebsd.org/changeset/base/243861

Log:
  Change /usr/libexec/ld-elf.so.1 to point at ../../libexec/ld-elf.so.1
  instead of /libexec/ld-elf.so.1. Below in the Makefile we execute
  'chflags noschg ${DESTDIR}/usr/libexec/ld-elf.so.1', which follows
  symlink and removes 'schg' flag from system's /libexec/ld-elf.so.1
  instead of the one in DESTDIR. It is also more friendly to use
  replative paths in symlink in case of jail/chroot environments.
  
  Obtained from:	WHEEL Systems
  MFC after:	2 weeks

Modified:
  head/libexec/rtld-elf/Makefile

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Tue Dec  4 11:10:01 2012	(r243860)
+++ head/libexec/rtld-elf/Makefile	Tue Dec  4 12:39:26 2012	(r243861)
@@ -27,7 +27,7 @@ LDFLAGS+=	-nostdlib -e .rtld_start
 WARNS?=		2
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
-BINDIR=		/libexec
+BINDIR=		../../libexec
 SYMLINKS=	${BINDIR}/${PROG} /usr/libexec/${PROG}
 MLINKS=		rtld.1 ld-elf.so.1.1 \
 		rtld.1 ld.so.1