svn commit: r364010 - head/sbin/iscontrol

[Emmanuel Vadot]

On Fri, 07 Aug 2020 09:45:05 -0600
Ian Lepore <ian at freebsd.org> wrote:

> On Fri, 2020-08-07 at 17:32 +0200, Emmanuel Vadot wrote:
> > On Fri, 7 Aug 2020 08:26:00 -0700 (PDT)
> > "Rodney W. Grimes" <freebsd at gndrsh.dnsmgr.net> wrote:
> > 
> > > > Author: manu
> > > > Date: Fri Aug  7 12:19:21 2020
> > > > New Revision: 364010
> > > > URL: https://svnweb.freebsd.org/changeset/base/364010
> > > > 
> > > > Log:
> > > >   pkgbase: We can't easily have a package with either a - or a _
> > > 
> > > Wow, hopefully this is short term.
> > 
> >  Not really.
> > 
> > > I would think a package name can be any valid file name, and to
> > > remove - and _ from that set is going
> > > to cause lots of POLA.
> > 
> >  The package file itself contain '-', they are named
> > FreeBSD-<name>-{dbg,lib32,dev,}-<version>. it's just that we used -
> > and
> > _ when building them to get some variable which contain the
> > description, nothing that can't be patched by this is clearly not my
> > priority.
> > 
> 
> This should be easy to fix.  Use sed instead of tr, and translate - to
> __ to remove dashes, and then translate __ back to - to restore them,
> and you've properly preserved single _ usage in names.
> 
> -- Ian
> 

 Yes it's easy to fix but that would required renaming the variables in
release/packages/Makefile.packages and since I don't like how this part
of pkgbase is done right now I prefer to not touch this part for now
otherwise I would rewrite everything. There is more urgent work to be
done.

> > > 
> > > >   
> > > >   Rename iscsi_legacy to iscsilegacy, having - or _ in a package
> > > > name cause
> > > >   problems when we process them and generate the ucl.
> > > > 
> > > > Modified:
> > > >   head/sbin/iscontrol/Makefile
> > > > 
> > > > Modified: head/sbin/iscontrol/Makefile
> > > > =================================================================
> > > > =============
> > > > --- head/sbin/iscontrol/Makefile	Fri Aug  7 10:20:39 2020	(
> > > > r364009)
> > > > +++ head/sbin/iscontrol/Makefile	Fri Aug  7 12:19:21 2020	(
> > > > r364010)
> > > > @@ -1,6 +1,6 @@
> > > >  # $FreeBSD$
> > > >  
> > > > -PACKAGE=iscsi_legacy
> > > > +PACKAGE=iscsilegacy
> > > >  SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c
> > > > misc.c
> > > >  PROG= iscontrol
> > > >  LIBADD=	cam md
> > > > 
> > > 
> > > -- 
> > > Rod Grimes                                                 
> > > rgrimes at freebsd.org
> > 
> > 
> 


-- 
Emmanuel Vadot <manu at bidouilliste.com>