From nobody Tue Apr 16 20:13:37 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 4VJwGV4zl4z5H0bx; Tue, 16 Apr 2024 20:13:38 +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 4VJwGV0Y7Lz4vm6; Tue, 16 Apr 2024 20:13:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298418; 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=8ONTlt6E9fRKeeB1O5AzVeYnZQEzds8so7mUgwrY99M=; b=LZgrw1cwjnRVnStXe7s9WJW36EOIhlJVSk202h9OWgAIiqcB98yAhCR3/lbBqIH/KDDk0N nG4hsC7QZ+YCpzdQPiGhCL2ntQMF4ovD5gPR/oRIHTtQxeSfAo3q/X9uE+X0aa6OBoFI9G R55lfwBgnbkM27eMF5pbVh8FQtC9dKDuNpWJ7t4B5W/QYzfcBLcyaoRmIi3yDCxxpqO3cM PI+mua/g5elVnWj//AnDEC/Z32c8BH7Jw2yzqVKZ1gkVTtD4V60Z7UKzEOLNLzvqOTMQbF eq5L/9WrrHnA2XFLZuwfUqL7R14miv65EC0drZFBzPDPkqEv5XJMH+O8qi+31Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298418; a=rsa-sha256; cv=none; b=hvsuKfFDQuCOmTpcLlf3VUT1oKe8GggDfG3gNsTWNPvslFlqFKSHVJY21b9QmlNuVmEV6t ELywCyOPWF8cwitZXzckrQRYU+dXhxkZdEqYZ/OwXaiwAGsmtbRP0QRWC/Q5Z7+2QpKt/u hqh2TixFNyVawpzpwB9tLlVvMKnqgDXeK0h/X2Am0pdFtWIBeGQBb+F/N5Mj3eTlAaBPGl nSPvdzA2R/ifjJ9Y93NFiupYZZZv+apTHuiCjS1XjB55ynW/0yZPaqgnBz5hsJ3idCReiu JsDXaCG5MoCggC93jIoIg/QJlyPfFaHECGGa7TvAIs5ihxxgV56DOcoFYeuuSg== 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=1713298418; 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=8ONTlt6E9fRKeeB1O5AzVeYnZQEzds8so7mUgwrY99M=; b=dHrAJkp0CNJB3RzOXB6xabFRpBZz6S5dh1tnXhzKfQ0z964BpYk4lNlOHCu68QtCbcfpHp XyV6TZJlFuNdmsIvDXpMlMnmIVmKOWvrocP5rH7MeW8vHaDWItzdUK2gxu8lqAT1RjTcVJ 2ADACxSdjH1wXMOQHjww4wMYmd73FClJ+i9O//7UuVxclaCeMlu+sZUADOGuLpqfnkYveQ 7vh9HGwDVpCkQZg+C0b192o61+yEeV+JBZR2wN/+QrRmLXKESK/pEEQqElY/UWVj3Mcekd ooGkSNqTzGHZ8cIwkdKlYLggSE709JWB+8bEKWrlfvtZfWoJPDyv3Lw46zmpbw== 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 4VJwGV07mMzxY9; Tue, 16 Apr 2024 20:13:38 +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 43GKDbu6040047; Tue, 16 Apr 2024 20:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDbTL040044; Tue, 16 Apr 2024 20:13:37 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:13:37 GMT Message-Id: <202404162013.43GKDbTL040044@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: 83bae397799c - stable/14 - uboot/Makefile move BINDIR 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: 83bae397799c4480e9712f03aff62d6f4fa447fe Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=83bae397799c4480e9712f03aff62d6f4fa447fe commit 83bae397799c4480e9712f03aff62d6f4fa447fe Author: Simon J. Gerraty AuthorDate: 2024-03-18 23:14:15 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:29 +0000 uboot/Makefile move BINDIR Set BINDIR before we include bsd.init.mk so we can override it via local.init.mk Reviewed by: imp Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44413 (cherry picked from commit 01f3abbfcd59848e37118e5e2b868a7b3e98cc62) --- stand/uboot/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index ccd02c44957f..791cfcb47bfe 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -10,6 +10,8 @@ LOADER_GZIP_SUPPORT?= no LOADER_BZIP2_SUPPORT?= no LOADER_DISK_SUPPORT?= yes +BINDIR= /boot/uboot + .include .include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" @@ -22,7 +24,6 @@ PROG= ubldr .endif NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} -BINDIR= /boot/uboot INSTALLFLAGS= -b WARNS?= 1