Date: Thu, 11 Feb 2021 19:21:57 -0800 From: Ravi Pokala <rpokala@freebsd.org> To: Kyle Evans <kevans@freebsd.org>, Glen Barber <gjb@freebsd.org> Cc: "freebsd-hackers@freebsd.org" <freebsd-hackers@freebsd.org> Subject: Re: Including IB utils in install images Message-ID: <4D70C9A9-A534-4C38-9A95-4ED260F49DD1@panasas.com> In-Reply-To: <CACNAnaG%2BX5Hqsy4yds3xyYQbDwW8N8tq3r-119y2Mo=RHRJfGA@mail.gmail.com> References: <377FA5D1-0DC8-463D-A8E3-5645801C2858@freebsd.org> <20210203182928.GG77557@FreeBSD.org> <CACNAnaG%2BX5Hqsy4yds3xyYQbDwW8N8tq3r-119y2Mo=RHRJfGA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
-----Original Message----- From: Kyle Evans <kevans@freebsd.org> Date: 2021-02-11, Thursday at 10:47 To: Glen Barber <gjb@freebsd.org> Cc: Ravi Pokala <rpokala@freebsd.org>, "freebsd-hackers@freebsd.org" <freebsd-hackers@freebsd.org> Subject: Re: Including IB utils in install images On Wed, Feb 3, 2021 at 12:29 PM Glen Barber <gjb@freebsd.org> wrote: > > 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? > > > > 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. > Ravi followed up privately here; the problem he was seeing is because MAKE_FLAGS is only included in release.sh for building stuff. WORLD_FLAGS gets closer to what he wants, but a local src.conf is better as far as "touching build options" goes. The caveat was that then they'd have to pair their release.conf with a src.conf; I pointed out that release.conf is literally sourced in and that's heavily baked in enough to release.sh that it cannot change. A good solution for this kind of thing should be something along the lines of: srcconf=/path/whatever/maybe/tmpfile cat <<EOF > $srcconf WITH_OFED_EXTRA="YES" EOF ... SRC_CONF=$srcconf I had hoped that adding "WITH_OFED_EXTRA=1" to WORLD_FLAGS in release.conf would do the trick, to avoid a separate src.conf to keep track of and clean up after. That built the tools, and put them in the world, but they were still omitted from the release directory. So, I gave in and created a src.conf with "WITH_OFED_EXTRA=1", and that indeed did the trick. Thanks Kyle! -Ravi (rpokala@) Thanks, Kyle Evans
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D70C9A9-A534-4C38-9A95-4ED260F49DD1>