Re: svn commit: r324406 - head/sys/modules/em

[Rodney W. Grimes]

> 
> > On Oct 9, 2017, at 18:54, Ian Lepore  wrote:
> 
> ...
> 
> > I think the right answer here is just
> > 
> >   LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_igb.ko
> 
>   That will definitely work and is probably the best pattern.
> Thanks,
> -Ngie

I concur, a hard link would probably be a better solution all
around than a symlink, unless there is some major reason
for this to be a symlink?


-- 
Rod Grimes rgri...@freebsd.org
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r324406 - head/sys/modules/em

[Ngie Cooper (yaneurabeya)]

> On Oct 9, 2017, at 18:54, Ian Lepore  wrote:

...

> I think the right answer here is just
> 
>   LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_igb.ko

That will definitely work and is probably the best pattern.
Thanks,
-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

Re: svn commit: r324406 - head/sys/modules/em

[Ian Lepore]

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/MakefileSat Oct  7 23:30:57
> > > > > 2017(r324405)
> > > > > +++ head/sys/modules/em/MakefileSat 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

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r324406 - head/sys/modules/em

[Sean Bruno]

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/MakefileSat Oct  7 23:30:57 2017(r324405)
 +++ head/sys/modules/em/MakefileSat 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



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r324406 - head/sys/modules/em

[Brooks Davis]

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/MakefileSat Oct  7 23:30:57 2017(r324405)
> > > +++ head/sys/modules/em/MakefileSat 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


signature.asc
Description: PGP signature

Re: svn commit: r324406 - head/sys/modules/em

[Rodney W. Grimes]

> 
> > 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/MakefileSat Oct  7 23:30:57 2017(r324405)
> > +++ head/sys/modules/em/MakefileSat 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?

-- 
Rod Grimes rgri...@freebsd.org
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r324406 - head/sys/modules/em

[Ngie Cooper]

> 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/MakefileSat Oct  7 23:30:57 2017(r324405)
> +++ head/sys/modules/em/MakefileSat 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
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r324406 - head/sys/modules/em

[Sean Bruno]

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/MakefileSat Oct  7 23:30:57 2017
(r324405)
+++ head/sys/modules/em/MakefileSat 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
 
 .include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"