From owner-svn-src-head@freebsd.org Tue Oct 10 01:54:17 2017 Return-Path: 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 B2D58E4310F for ; Tue, 10 Oct 2017 01:54:17 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1a.eu.mailhop.org (outbound1a.eu.mailhop.org [52.58.109.202]) (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 4CAC464AD9 for ; Tue, 10 Oct 2017 01:54:16 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: e7375abd-ad5d-11e7-a893-25625093991c X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound1.eu.mailhop.org (Halon) with ESMTPSA id e7375abd-ad5d-11e7-a893-25625093991c; Tue, 10 Oct 2017 01:54:09 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v9A1s53Y002547; Mon, 9 Oct 2017 19:54:05 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1507600445.84167.23.camel@freebsd.org> Subject: Re: svn commit: r324406 - head/sys/modules/em From: Ian Lepore To: Sean Bruno , Brooks Davis , rgrimes@freebsd.org Cc: Ngie Cooper , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Mon, 09 Oct 2017 19:54:05 -0600 In-Reply-To: <20789d66-03b0-db20-5f3f-2e4b9a4cd487@freebsd.org> References: <95D45458-24C3-473C-80AF-A2C622747886@gmail.com> <201710081542.v98FgZ5f074039@pdx.rh.CN85.dnsmgr.net> <20171009203350.GB68389@spindle.one-eyed-alien.net> <20789d66-03b0-db20-5f3f-2e4b9a4cd487@freebsd.org> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Oct 2017 01:54:17 -0000 On Mon, 2017-10-09 at 18:17 -0600, Sean Bruno wrote: > > On 10/09/17 14:33, Brooks Davis wrote: > > > > On Sun, Oct 08, 2017 at 08:42:35AM -0700, Rodney W. Grimes wrote: > > > > > > > > > > > > > > > > > > > > > On Oct 7, 2017, at 16:33, Sean Bruno > > > > > wrote: > > > > > > > > > > Author: sbruno > > > > > Date: Sat Oct  7 23:33:14 2017 > > > > > New Revision: 324406 > > > > > URL: https://svnweb.freebsd.org/changeset/base/324406 > > > > > > > > > > Log: > > > > >  Fix symlink if_igb.ko in -current such that its relative and > > > > > doesn't > > > > >  end up with non-standard DESTDIR information in its > > > > > symlink.  This > > > > >  can happen very trivially if the release scripts are used. > > > > > > > > > >  Sponsored by:    Limelight Networks > > > > > > > > > > Modified: > > > > >  head/sys/modules/em/Makefile > > > > > > > > > > Modified: head/sys/modules/em/Makefile > > > > > ============================================================= > > > > > ================= > > > > > --- head/sys/modules/em/Makefile    Sat Oct  7 23:30:57 > > > > > 2017    (r324405) > > > > > +++ head/sys/modules/em/Makefile    Sat Oct  7 23:33:14 > > > > > 2017    (r324406) > > > > > @@ -23,6 +23,6 @@ CFLAGS += -I${SRCTOP}/sys/dev/e1000 > > > > > #CFLAGS  += -DDEVICE_POLLING > > > > > > > > > > afterinstall: > > > > > -    ln -sf ${DESTDIR}${KMODDIR}/${KMOD}.ko > > > > > ${DESTDIR}${KMODDIR}/if_igb.ko > > > > > +    cd ${DESTDIR}${KMODDIR} && ln -sf if_em.ko if_igb.ko > > > > While this is definitely better, the same thing could be > > > > achieved via: > > > > > > > > ln -sf if_em.ko ${DESTDIR}/.../if_igb.ko > > > Should this be using SYMLINK+= as I thought using ln -sf was a > > > breakage > > > for meta mode stuff? > > At the very least it should use INSTALL_LIBSYMLINK or > > INSTALL_RLIBSYMLINK. > > Direct use of ln(1) is always a bug in install targets and ideally > > we > > would make it fail.  (It breaks NO_ROOT installs by failing to add > > an > > entry to the METALOG file). > > > > -- Brooks > > > > I'm more than happy to make changes here. > > The closest example I can see in the tree from a Makefile is some of > the > things in etc: > > ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound > > Is that, more or less, something y'all would like to see? > > sean > I think the right answer here is just   LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_igb.ko -- Ian