[PATCH rtems-net-legacy] netlegacy: Build libtelnetd.a and install header file in correct location

[Vijay Kumar Banerjee]

On Fri, Mar 5, 2021 at 12:07 PM Gedare Bloom <gedare at rtems.org> wrote:
>
> On Fri, Mar 5, 2021 at 11:42 AM Vijay Kumar Banerjee <vijay at rtems.org> wrote:
> >
> > ---
> >  netlegacy.py                 | 27 +++++++++++++++++++++------
> >  testsuites/telnetd01/wscript |  2 +-
> >  2 files changed, 22 insertions(+), 7 deletions(-)
> >
> > diff --git a/netlegacy.py b/netlegacy.py
> > index 037e2ee..0889548 100644
> > --- a/netlegacy.py
> > +++ b/netlegacy.py
> > @@ -31,7 +31,8 @@ import os
> >
> >  source_files = []
> >  include_files = {}
> > -exclude_dirs = ['pppd', 'nfsclient', 'testsuites', 'librpc/include', 'bsps']
> > +exclude_dirs = ['pppd', 'nfsclient', 'testsuites', 'librpc/include', 'bsps',
> > +                'telnetd']
> >  exclude_headers = ['rtems-bsd-user-space.h', 'rtems-bsd-kernel-space.h']
> >
> >  for root, dirs, files in os.walk("."):
> > @@ -51,6 +52,8 @@ def build(bld):
> >      bsp = bld.env.RTEMS_ARCH_BSP.split('-')[-1]
> >      pppd_source = [os.path.join('./pppd', s)
> >                     for s in os.listdir('./pppd') if s[-2:] == '.c']
> > +    telnetd_source = [os.path.join('./telnetd', s)
> > +                      for s in os.listdir('telnetd') if s[-2:] == '.c']
> >
> >      bsp_dirs, bsp_sources = bsp_drivers.bsp_files(bld)
> >
> > @@ -98,12 +101,24 @@ def build(bld):
> >                use='networking',
> >                source=pppd_source)
> >
> > +    bld.stlib(target='telnetd',
> > +              features='c',
> > +              includes=ip,
> > +              use='networking',
> > +              source=telnetd_source)
> > +
> >      bld.install_files(os.path.join('${PREFIX}', arch_lib_path),
> > -                      ["libnetworking.a"])
> > -    bld.install_files(os.path.join('${PREFIX}', arch_lib_path),
> > +                      ["libnetworking.a", 'libpppd.a', 'libtelnetd.a'])
> > +    bld.install_files(os.path.join('${PREFIX}', arch_lib_path,
> > +                                   'include', 'libchip'),
> >                        [os.path.join('./bsps/include/libchip/', f)
> >                        for f in os.listdir('./bsps/include/libchip/')])
> >      for i in include_files:
> > -        bld.install_files(os.path.join('${PREFIX}',
> > -                          arch_lib_path, i),
> > -                          include_files[i])
> > +        if 'include' in i.split('/'):
> > +            bld.install_files(os.path.join('${PREFIX}',
> > +                                           arch_lib_path, i),
> > +                              include_files[i])
> > +        else:
> > +            bld.install_files(os.path.join('${PREFIX}',
> > +                                           arch_lib_path, 'include', i),
> > +                              include_files[i])
> > diff --git a/testsuites/telnetd01/wscript b/testsuites/telnetd01/wscript
> > index 8a48b90..fd573be 100644
> > --- a/testsuites/telnetd01/wscript
> > +++ b/testsuites/telnetd01/wscript
> > @@ -42,5 +42,5 @@ def build(bld):
> >                  features='c cprogram',
> >                  cfags=['-O2', '-g'],
> unrelated: should this be cflags?
>
Thanks, I'll push with this one fixed.

Best regards,
Vijay
> go ahead and push the fix, you can be a little bit aggressive for a
> few days to get this repo "stable"
>
> >                  includes='. .. ../include ../../ ../../include',
> > -                use=['networking'],
> > +                use=['telnetd', 'networking'],
> >                  source='init.c')
> > --
> > 2.26.2
> >
> > _______________________________________________
> > devel mailing list
> > devel at rtems.org
> > http://lists.rtems.org/mailman/listinfo/devel