From owner-dev-commits-src-branches@freebsd.org Sun Mar 28 18:27:39 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 586DE5A972D; Sun, 28 Mar 2021 18:27:39 +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 4F7khq1dPzz4vwJ; Sun, 28 Mar 2021 18:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2A92B24CA2; Sun, 28 Mar 2021 18:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12SIRdIl006749; Sun, 28 Mar 2021 18:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12SIRdPr006748; Sun, 28 Mar 2021 18:27:39 GMT (envelope-from git) Date: Sun, 28 Mar 2021 18:27:39 GMT Message-Id: <202103281827.12SIRdPr006748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: b56440b34356 - releng/13.0 - Makefile.inc1: unbreak bootstrap when kbdcontrol does not exist MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.0 X-Git-Reftype: branch X-Git-Commit: b56440b34356282a9b659366341d81e620e515e5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2021 18:27:39 -0000 The branch releng/13.0 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=b56440b34356282a9b659366341d81e620e515e5 commit b56440b34356282a9b659366341d81e620e515e5 Author: Glen Barber AuthorDate: 2021-03-24 00:47:14 +0000 Commit: Glen Barber CommitDate: 2021-03-28 18:27:29 +0000 Makefile.inc1: unbreak bootstrap when kbdcontrol does not exist Approved by: re (cperciva) Submitted by: Evgeniy Khramtsov Reviewed by: arichardson Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 50179c5ec7d09d7b02497caf95dca5d33f93bcd9) (cherry picked from commit 1048c56784c0e1d044b6828b030f326e48eaba28) --- Makefile.inc1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index f27cd2706359..288d16a7574e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2299,7 +2299,8 @@ _bootstrap_tools_links+=crunchgen # Note: kbdcontrol can not be bootstrapped on non-FreeBSD systems .if !defined(CROSSBUILD_HOST) .if (${BOOTSTRAPPING} < 1003501 || \ - (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103)) + (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) || \ + (!exists(/usr/sbin/kbdcontrol))) _kbdcontrol= usr.sbin/kbdcontrol .else _bootstrap_tools_links+=kbdcontrol