From owner-svn-src-head@freebsd.org  Tue Dec  1 06:09:24 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 13B07A3E638;
 Tue,  1 Dec 2015 06:09:24 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 D193E1E61;
 Tue,  1 Dec 2015 06:09:23 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB169MP2023578;
 Tue, 1 Dec 2015 06:09:22 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB169MJH023576;
 Tue, 1 Dec 2015 06:09:22 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512010609.tB169MJH023576@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 1 Dec 2015 06:09:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291566 - in head: . lib/libelf
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: Tue, 01 Dec 2015 06:09:24 -0000

Author: ngie
Date: Tue Dec  1 06:09:22 2015
New Revision: 291566
URL: https://svnweb.freebsd.org/changeset/base/291566

Log:
  Move libelf.so.2 from /usr/lib to /lib to unbreak libkvm use after r291406
  
  Tested with the following commands as root:
  - yes | make delete-old
  - service ldconfig restart
  - netstat -nr
  
  X-MFC with: r291406
  Reviewed by: jhb, kib
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/ObsoleteFiles.inc
  head/lib/libelf/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Tue Dec  1 05:59:53 2015	(r291565)
+++ head/ObsoleteFiles.inc	Tue Dec  1 06:09:22 2015	(r291566)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
+OLD_FILES+=usr/lib/libelf.so.2
 # 20151115: Fox bad upgrade scheme
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312

Modified: head/lib/libelf/Makefile
==============================================================================
--- head/lib/libelf/Makefile	Tue Dec  1 05:59:53 2015	(r291565)
+++ head/lib/libelf/Makefile	Tue Dec  1 06:09:22 2015	(r291566)
@@ -7,6 +7,7 @@ SRCDIR=	${TOP}/libelf
 .PATH:	${SRCDIR}
 
 LIB=	elf
+SHLIBDIR?= /lib
 
 SRCS=	elf.c							\
 	elf_begin.c						\