Date: Mon, 9 Oct 2017 18:17:21 -0600 From: Sean Bruno <sbruno@freebsd.org> To: Brooks Davis <brooks@freebsd.org>, rgrimes@freebsd.org Cc: Ngie Cooper <yaneurabeya@gmail.com>, 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: <20789d66-03b0-db20-5f3f-2e4b9a4cd487@freebsd.org> In-Reply-To: <20171009203350.GB68389@spindle.one-eyed-alien.net> References: <95D45458-24C3-473C-80AF-A2C622747886@gmail.com> <201710081542.v98FgZ5f074039@pdx.rh.CN85.dnsmgr.net> <20171009203350.GB68389@spindle.one-eyed-alien.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --KclhsJsK7b42NaqonaT9qB7pN6cPNXCNt Content-Type: multipart/mixed; boundary="WiBn6gddnPFMMBEewTpU7gGrheb2rWoRj"; protected-headers="v1" From: Sean Bruno <sbruno@freebsd.org> To: Brooks Davis <brooks@freebsd.org>, rgrimes@freebsd.org Cc: Ngie Cooper <yaneurabeya@gmail.com>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <20789d66-03b0-db20-5f3f-2e4b9a4cd487@freebsd.org> Subject: Re: svn commit: r324406 - head/sys/modules/em References: <95D45458-24C3-473C-80AF-A2C622747886@gmail.com> <201710081542.v98FgZ5f074039@pdx.rh.CN85.dnsmgr.net> <20171009203350.GB68389@spindle.one-eyed-alien.net> In-Reply-To: <20171009203350.GB68389@spindle.one-eyed-alien.net> --WiBn6gddnPFMMBEewTpU7gGrheb2rWoRj Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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 <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 >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> --- head/sys/modules/em/Makefile Sat Oct 7 23:30:57 2017 (r32= 4405) >>>> +++ head/sys/modules/em/Makefile Sat Oct 7 23:33:14 2017 (r32= 4406) >>>> @@ -23,6 +23,6 @@ CFLAGS +=3D -I${SRCTOP}/sys/dev/e1000 >>>> #CFLAGS +=3D -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+=3D as I thought using ln -sf was a break= age >> for meta mode stuff? >=20 > At the very least it should use INSTALL_LIBSYMLINK or INSTALL_RLIBSYMLI= NK. > 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). >=20 > -- Brooks >=20 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 --WiBn6gddnPFMMBEewTpU7gGrheb2rWoRj-- --KclhsJsK7b42NaqonaT9qB7pN6cPNXCNt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE6MTp+IA1BOHj9Lo0veT1/om1/LYFAlncEZFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEU4 QzRFOUY4ODAzNTA0RTFFM0Y0QkEzNEJERTRGNUZFODlCNUZDQjYACgkQveT1/om1 /LbOmQf/Yy7PetHAJcvKn2wVkxf6/FE6wqIAQONdIp+wsitE9MTY1aImbXk4r7/G aXSpoSejHdpoiSzAwjwt/DkHTwkQT95t+5hgBVGOeLvMmoUIGHLN+U26gBxm2dz/ OmmfNHF2lGI3d8YT1w+aYdsFCRqxpJPH0gSLAF1a5ykXNPUvn20u9BW1F8rlIP4J NTaP0aV9PSKFROZGw23j0aAY29+5jU8Bmmfrr6YXi/PCabvWzxhusNQp35tc7O7p OCX13xSaABENih6SrZjuXKM2HMPoDlzdfDMPQwo4NSwKn0fcdsT2GAqIw43FJa7B Lml2fmYAceFtcF4vpRCcbbvf7h2T4A== =mywg -----END PGP SIGNATURE----- --KclhsJsK7b42NaqonaT9qB7pN6cPNXCNt--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20789d66-03b0-db20-5f3f-2e4b9a4cd487>