From nobody Tue Apr 16 20:13:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJwGY6PZfz5H0qt; Tue, 16 Apr 2024 20:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJwGY3vvZz4vv3; Tue, 16 Apr 2024 20:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dI5OyGACdXLHuYi+kCzkuITPg0xUcH+FLdcDNDM4cZQ=; b=VIq+4E/KAv0ozAbM0j5aGvm4INB09uQexbJe/nQUoOg/pWC2uveSnUSmgbldX0zXMeNqn7 FQ3tFrD0/5vhkW5Hf7e5LZuWw8B4ek6z29lwVfBAFeGs0Xg90VbC6AkA738uzXntaM2THn WOETN1FEH3zpV0o39C/tFUWCZMWoBClWarF145XoANenck1/on4ttdVCeTdoemZ/6u/iSG TTpax+cSh3afC6z0qlm+UrO7WU24RyotHkx8gOOX07tP+BMcXOeM87xDfHspKb7YX/1q/k v+xiIwOGIsn8GePWaB7mBUUYJ2wwGCQCiNHctF7DpYbF6sjPO/zJNavcKdK7uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298421; a=rsa-sha256; cv=none; b=FH4EC248JXLMfJe+QzdE80zUul/OeGoeWtJBBQMuRJ24s2AEkX7bzQC0V69JdJcf5fWMqo MVTukZJTJlb355RktlNBKq8ECSlxOd9ojWG6L432CjvG1JsDZhOyIw1l628Y6zj29ILOCv h8R0xnV8Cof159qPKVp2IaH8dCD7uKTfr5k1i+Qzu6eNkKACwJ0/7nepMYhsMDbjRr0roN xPpbyGOL4v1I0rif2k9V04GfNu1dpD2C0UuShG+1yQWHV0oFFTmOR/lKmRDqo4AkXd6IuA fmbjoCOaLYJanTB9mYxZvrnoY0eO0ntLUxFYX+lsQoNpxrNRy1GwpAEwIZSA7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dI5OyGACdXLHuYi+kCzkuITPg0xUcH+FLdcDNDM4cZQ=; b=tpNgwVuS+efijWLA1uSbPjxZb9v/KuZyxU6XtRK0IUgwNyRNAsxL+bAxkUtxHBDoP74Uk9 zSckteRxvaQAYlw7/L+BPyB7SjQ7U4VBZYH4VIj6tK88YeDVKiKm7U32asBzdgTq7isrLL KjjOaxD1mK8oUaoo1FCiQCYzaCvZeHHy49Ugj+PIfhS/jalcSN03/VfTQHsey7co9U2rUl BiliJpvW90M0WKGJoQ9Zg858qscDjhtMtbWQv9BflWB3GarFeS2hjCq0u+mccfIzDNA9j7 k0SxxjrZiwfsnTTDhTgtnPY2JHYk7G6iKH9wbUizEjjEJXrQ6oWqR7mP6TUTqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJwGY3TSfzxdn; Tue, 16 Apr 2024 20:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKDf0X040212; Tue, 16 Apr 2024 20:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDf0J040209; Tue, 16 Apr 2024 20:13:41 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:13:41 GMT Message-Id: <202404162013.43GKDf0J040209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 33d1ce86abcb - stable/14 - userboot: allow for overriding the version file location List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 33d1ce86abcb072bb0a9fb366aa91e888ea573f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=33d1ce86abcb072bb0a9fb366aa91e888ea573f8 commit 33d1ce86abcb072bb0a9fb366aa91e888ea573f8 Author: Stephen J. Kiernan AuthorDate: 2024-04-03 21:22:01 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:30 +0000 userboot: allow for overriding the version file location Use ?= when assigning VERSION_FILE Reviewed by: imp Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44624 (cherry picked from commit 112783ebbc313f0df73bbec8520a94aba4a4f33d) --- stand/userboot/userboot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 15ac8701e4d4..4674672bbec5 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -44,7 +44,7 @@ CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs CWARNFLAGS.main.c += -Wno-implicit-function-declaration NEWVERSWHAT= "User boot ${LOADER_INTERP}" ${MACHINE_CPUARCH} -VERSION_FILE= ${.CURDIR}/../userboot/version +VERSION_FILE?= ${.CURDIR}/../userboot/version .if ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP} LINKS+= ${BINDIR}/${SHLIB_NAME} ${BINDIR}/userboot.so