From nobody Wed Apr 03 23:10:22 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 4V90pR1yrFz5G5f6; Wed, 3 Apr 2024 23:10:23 +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 4V90pR138vz4gsd; Wed, 3 Apr 2024 23:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712185823; 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=XQ5SFRQXbyM85PmcDAaeUXVW/VvPWzn6xGq9wJpzJOs=; b=w/5x/YWalKwK3ZFgDSXCWBO2gB7bB2uHs/DPf3apsj6SYgpqGC9ltZsIAJ0Wt8tHawZR5z CvONBDpW37nt3n0GLIaQQE3U6HbbJEB02UCyrGvNn81ERsI2Vz8k74XINV6xB0VPnH2YUR e3mFuEsAhJIC902pglPxBLvxhl0hyC7Xi0ED7c54ZeO3Ol/14YMYlIiV9O8KQ6xooy5qso Y3nsBEaZ/nMcWCTw3lNlannmSWXLHgoRVFF9EUgUu+0F4vM0Ubr7LAgn9Q6VFQcZeXL6UL 8DaHKZHQdmhplSTRB7NVoRA/0Qj7Oi2qlsjKRHg/hG1PLx6/rVbmZniSGda5jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712185823; a=rsa-sha256; cv=none; b=ad+dkr7DAE17/TFnjlnleSfF33jAI4T3B2OoTmHsogWtL3BQn9/9PPqP2jbtcQoGf1PEWr Df9SZbxD5ycWsUBKfCxifqPYVSwuwbEeL0JTz8bdyi5bd7DlPe5xl2PRP4UcIyt52MjMEV VGXrsG1HCfcIj+Ne8hnwYazEAIkuS8ZOocb3+07TqmLiU/ZjGCVSaUPEoMS+fiitjp0D9s ssjsQYQV1BJfcjzi8qPOpk6xz+DTtRtkvqFOEaB9yrkqm3/xodxVZgeOm1NxPuToixum/t bNzDR+djmsZP8r652CjMY5WC4HMBUnLQan7DuOsKu8RfQCI2SblJDognYuDsOA== 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=1712185823; 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=XQ5SFRQXbyM85PmcDAaeUXVW/VvPWzn6xGq9wJpzJOs=; b=JK8OrLQPjFQxNHWlZNbhFFfgsSK4KHy7xIJfzP9OhKZ5LZEL7empza54qsZoHBJt+DTjHB aWM5951EGR3mgkAupV7KXf0w5TjL/2Bv/RpyxCO3loB6mnxOgqtF9KBuvjBznyQw8xBvnO +4A0sHMJyA5CwJdPbIP9dTQ/+1WaWXq+hiWf+Ye1/ghKbOYfXJaaf7v3OE3vbJPQBO9BH6 AeU/JXNT8uH1FoWWxyMzLIwCyMOp09W7qceUkiOhnPB+OY9nJyTqd5pivBN8mbYXVoz261 wSqeSxXis4krBw8N+kQkigQ115LSx/ANo8BIlNEV4+a9LFRIHYj2qv/K4QRriw== 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 4V90pR0fdpzs1F; Wed, 3 Apr 2024 23:10:23 +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 433NAMrt000149; Wed, 3 Apr 2024 23:10:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433NAMks000146; Wed, 3 Apr 2024 23:10:22 GMT (envelope-from git) Date: Wed, 3 Apr 2024 23:10:22 GMT Message-Id: <202404032310.433NAMks000146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 112783ebbc31 - main - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 112783ebbc313f0df73bbec8520a94aba4a4f33d Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=112783ebbc313f0df73bbec8520a94aba4a4f33d commit 112783ebbc313f0df73bbec8520a94aba4a4f33d Author: Stephen J. Kiernan AuthorDate: 2024-04-03 21:22:01 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-03 23:09:43 +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 --- 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