Date: Mon, 9 Oct 2017 20:33:50 +0000 From: Brooks Davis <brooks@freebsd.org> To: rgrimes@freebsd.org Cc: Ngie Cooper <yaneurabeya@gmail.com>, Sean Bruno <sbruno@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r324406 - head/sys/modules/em Message-ID: <20171009203350.GB68389@spindle.one-eyed-alien.net> In-Reply-To: <201710081542.v98FgZ5f074039@pdx.rh.CN85.dnsmgr.net> References: <95D45458-24C3-473C-80AF-A2C622747886@gmail.com> <201710081542.v98FgZ5f074039@pdx.rh.CN85.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Sun, Oct 08, 2017 at 08:42:35AM -0700, Rodney W. Grimes wrote: > > > > > On Oct 7, 2017, at 16:33, Sean Bruno <sbruno@FreeBSD.org> 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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJZ290uAAoJEKzQXbSebgfAJUcH/iJUHmSlEGqliH+uqHZ51w3p M/+iBM3rGUHAbEE9dL0+qvY/FaZ+DQZh7sxoyOlfppWpdhIEFalDX/pXVy/1pgwW pdOYvVA5ZJgFdJLkKO9LT7yhwessZu9CbxKV+5ZZpZqW9rWzov7gg8q4RANtzR0q PJgTZetq81elAxY3o7tn1KTd2d0Ef29EvWnU4IsRwim3Zj/lCAFHHH3171BzmZKw eX3Orp8p1fgrcQZT+E2KFmSDp/svOQPnU0vz5DwpfWbkLXLeZBTJxYO3ao72GbqP w9CaJULZlhfzXuQcN4p0NAFMYJCzmPHjR6GvIy+1ubpFoLny1jgGmd0gILqBqLM= =smL7 -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20171009203350.GB68389>