From owner-svn-src-head@freebsd.org  Tue Oct 10 19:14:41 2017
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 641E7E3A806;
 Tue, 10 Oct 2017 19:14:41 +0000 (UTC)
 (envelope-from sbruno@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 331E16891F;
 Tue, 10 Oct 2017 19:14:41 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9AJEejQ040537;
 Tue, 10 Oct 2017 19:14:40 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9AJEenl040536;
 Tue, 10 Oct 2017 19:14:40 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201710101914.v9AJEenl040536@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Tue, 10 Oct 2017 19:14:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324500 - head/sys/modules/em
X-SVN-Group: head
X-SVN-Commit-Author: sbruno
X-SVN-Commit-Paths: head/sys/modules/em
X-SVN-Commit-Revision: 324500
X-SVN-Commit-Repository: base
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.23
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, 10 Oct 2017 19:14:41 -0000

Author: sbruno
Date: Tue Oct 10 19:14:40 2017
New Revision: 324500
URL: https://svnweb.freebsd.org/changeset/base/324500

Log:
  Hard link if_igb.ko to if_em.ko.  Use a LINK directive to ensure that
  this is more friendly to the tree.
  
  Tested this with loader.conf:if_igb_load="YES" and it does the right
  thing.
  
  Submitted by:	Ian Lepore <ian@freebsd.org>

Modified:
  head/sys/modules/em/Makefile

Modified: head/sys/modules/em/Makefile
==============================================================================
--- head/sys/modules/em/Makefile	Tue Oct 10 16:17:03 2017	(r324499)
+++ head/sys/modules/em/Makefile	Tue Oct 10 19:14:40 2017	(r324500)
@@ -22,7 +22,6 @@ CFLAGS += -I${SRCTOP}/sys/dev/e1000
 # DEVICE_POLLING for a non-interrupt-driven method
 #CFLAGS  += -DDEVICE_POLLING
 
-afterinstall:
-	cd ${DESTDIR}${KMODDIR} && ln -sf if_em.ko if_igb.ko
+LINKS=	${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_igb.ko
 
 .include <bsd.kmod.mk>