Including IB utils in install images

[Ravi Pokala]

-----Original Message-----
From: Glen Barber <gjb at freebsd.org>
Date: 2021-02-03, Wednesday at 10:29
To: Ravi Pokala <rpokala at freebsd.org>
Cc: "freebsd-hackers at freebsd.org" <freebsd-hackers at freebsd.org>
Subject: Re: Including IB utils in install images

    On Wed, Feb 03, 2021 at 10:06:20AM -0800, Ravi Pokala wrote:
    > Hi folks,
    > 
    > I'm using release/release.sh to create install images. We recently determined that we need to start including the InfiniBand utilities (contrib/ofed/infiniband-diags / usr.bin/ofed/infiniband-diags). I updated my release.conf to add 'WITH_OFED_EXTRA=1' to MAKE_FLAGS, and I confirmed that the utilities are being built. However, they are not subsequently copied to the distdir, or included in the resulting image. Well, technically, `ibstat' is, but per usr.bin/ofed/infiniband-diags/Makefile, it is not contingent on WITH_OFED_EXTRA / MK_OFED_EXTRA.
    > 
    > Bug, or operator error?
    > 

Hi Glen,

    You could set a local SRC_CONF (see release/release.conf.sample), but
    I *think* you also need to set WITH_OFED=1.  According to src.conf(5),
    it seems WITH_OFED_EXTRA is ignored unless WITH_OFED is explicitly set.

While that's certainly logical, src.conf(5) does not actually contain that wording.

But it's moot; OFED is already in __DEFAULT_YES_OPTIONS in src.opts.mk, so WITH_OFED=1 is implied.

Looking for what's happening with `ibstat' (outside MK_OFED_EXTRA) and `ibping' (inside MK_OFED_EXTRA), this is what I see:

================================================================
[builder:/usr0/rpokala] rpokala> egrep '^===> .*/(ibstat|ibping)' release.out
===> usr.bin/ofed/infiniband-diags/ibstat (cleandir)
===> usr.bin/ofed/infiniband-diags/ibping (cleandir)
===> usr.bin/ofed/infiniband-diags/ibstat (cleandir)
===> usr.bin/ofed/infiniband-diags/ibping (cleandir)
===> usr.bin/ofed/infiniband-diags/ibstat (includes)
===> usr.bin/ofed/infiniband-diags/ibping (includes)
===> usr.bin/ofed/infiniband-diags/ibstat (all)
===> usr.bin/ofed/infiniband-diags/ibping (all)
===> usr.bin/ofed/infiniband-diags/ibstat (install)
===> usr.bin/ofed/infiniband-diags/ibstat (installconfig)
===> usr.bin/ofed/infiniband-diags/ibstat (cleandir)
===> usr.bin/ofed/infiniband-diags/ibping (cleandir)
===> usr.bin/ofed/infiniband-diags/ibstat (cleandir)
===> usr.bin/ofed/infiniband-diags/ibping (cleandir)
===> usr.bin/ofed/infiniband-diags/ibstat (includes)
===> usr.bin/ofed/infiniband-diags/ibping (includes)
===> usr.bin/ofed/infiniband-diags/ibstat (all)
===> usr.bin/ofed/infiniband-diags/ibping (all)
===> usr.bin/ofed/infiniband-diags/ibstat (distribute)
===> usr.bin/ofed/infiniband-diags/ibstat (installconfig)
===> usr.bin/ofed/infiniband-diags/ibstat (install)
===> usr.bin/ofed/infiniband-diags/ibstat (installconfig)
===> usr.bin/ofed/infiniband-diags/ibstat (install)
===> usr.bin/ofed/infiniband-diags/ibstat (installconfig)
===> usr.bin/ofed/infiniband-diags/ibstat (install)
===> usr.bin/ofed/infiniband-diags/ibstat (installconfig)
================================================================

Note that both are part of "cleandir", "includes", and "all", but only `ibstat' is part of "install", "installconfig", and "distribute". I have no idea how things get onto those lists, but it appears that that's not happening in the MK_OFED_EXTRA case.

Thanks,

Ravi (rpokala@)

    Glen