From owner-freebsd-hackers@freebsd.org Thu Feb 11 18:47:17 2021 Return-Path: Delivered-To: freebsd-hackers@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 267645316B7 for ; Thu, 11 Feb 2021 18:47:17 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dc5GF0YxTz4dlb; Thu, 11 Feb 2021 18:47:17 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 01564299C0; Thu, 11 Feb 2021 18:47:16 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f177.google.com with SMTP id r77so6217008qka.12; Thu, 11 Feb 2021 10:47:16 -0800 (PST) X-Gm-Message-State: AOAM532syaHCqY3gHNKSk8QI6X1H3Pf19VldSjftmKtQFxq0ndXdlOHk 7sslyfF2HxPWntmB4NW3wgAiptAg0jltbOuyjlU= X-Google-Smtp-Source: ABdhPJzUFM2zuR4TXwDjFsbXh/hdcIeiu6NOdtanOH7c3cAPBNfglPtA7HRqFSg98dC3tAlC7L7Kh/ImMVEQAUXlCmA= X-Received: by 2002:a05:620a:b8a:: with SMTP id k10mr10524283qkh.120.1613069236422; Thu, 11 Feb 2021 10:47:16 -0800 (PST) MIME-Version: 1.0 References: <377FA5D1-0DC8-463D-A8E3-5645801C2858@freebsd.org> <20210203182928.GG77557@FreeBSD.org> In-Reply-To: <20210203182928.GG77557@FreeBSD.org> From: Kyle Evans Date: Thu, 11 Feb 2021 12:47:03 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Including IB utils in install images To: Glen Barber Cc: Ravi Pokala , "freebsd-hackers@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Technical discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2021 18:47:17 -0000 On Wed, Feb 3, 2021 at 12:29 PM Glen Barber 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 dete= rmined that we need to start including the InfiniBand utilities (contrib/of= ed/infiniband-diags / usr.bin/ofed/infiniband-diags). I updated my release.= conf to add 'WITH_OFED_EXTRA=3D1' to MAKE_FLAGS, and I confirmed that the u= tilities 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 W= ITH_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=3D1. 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=3D/path/whatever/maybe/tmpfile cat < $srcconf WITH_OFED_EXTRA=3D"YES" EOF ... SRC_CONF=3D$srcconf Thanks, Kyle Evans