From nobody Wed Mar 02 05:55:43 2022 X-Original-To: dev-commits-src-main@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 9296A19E06CE; Wed, 2 Mar 2022 05:55:43 +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 4K7jyl3l7pz3PbT; Wed, 2 Mar 2022 05:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646200543; 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=ig9mQpvhUyvF/gu5Iv+yRaCA+I3oiX0FiMmPLWYeqLA=; b=sbEcGpdfZidEAAF6Xf2bGrYspFo+sj0VhmZlJhJaUdTDjm6xf/c2HP3h7K2Y1Yp95SmZvT 6XmhTzjV4zyBz1h6XyaBmC3hsvja0EeGcmV/YGnYxZpR1u8sn50RHCy9BN29asxD0lUJHx 319YBx87Y/kh3XUtxjKg873i9unpQyZHZqYWNpEdQH80CqMjpwuqHiqdl82HTNBvLu6kWB EyMb00ffB5he3uKxRtB3XBtyLl1D71sPVY0QEf24GLiNycF9m4AJDOnVQWr3Y20zMSJvk1 22gSRichwRHURZhYYjt60jpVpJnm95sq+9/NFi5lycBoJR2cEK3i0iywXWahWw== 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 5F7211DBCD; Wed, 2 Mar 2022 05:55:43 +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 2225thGG075847; Wed, 2 Mar 2022 05:55:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2225thGX075846; Wed, 2 Mar 2022 05:55:43 GMT (envelope-from git) Date: Wed, 2 Mar 2022 05:55:43 GMT Message-Id: <202203020555.2225thGX075846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 33550b473913 - main - bootstrap: No need for kbdcontrol bootstrap anymore List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 33550b47391330362ea58984aa3fd691f6219ee0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646200543; 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=ig9mQpvhUyvF/gu5Iv+yRaCA+I3oiX0FiMmPLWYeqLA=; b=fWFpk/9cYqTZZ+R5TVfwkyUz7abVKK+1yrlSYPVQpxKU7mZ4VQtNcNtJxoeupAlGQxa48o dXNyS5RgXl2jpySPTYbCNg7Cl2Eroc3Aj0i4O1j3/kh38qFehUjuARDG9FEE6x5TgrS0nJ /O8roFM9afIOYWmGe1KhSCjPJCPYHt2VCU20+oojJQak7+fTDN1w6l1dUA8Ww+nkDalBtR BnJViUjxuycOr1zTohstUcEDqKXpivgHihLFs2w2liC87u/T0xB5CmlVc/Qxe65SikiYgy 3/c3m1B7Y4Hl91axfl85jZRMM11/a7tl/peC5eX/mwbMrC1wznNoVNMbJ/8dUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646200543; a=rsa-sha256; cv=none; b=aS0yCzbHK1xpabmWNc5CwpXikBY9yQ+8bITWF4EU7TyS0kzIzIzcTBF+qe82liBgFm/0n3 AWyopReJFZzXbFkyuye7uSz6CuwEcDsgLIl9ecHs54MfEPtpvZ7E0m66izj/+lH7dNietY s02oBTwJZrUR9LmQHbdy0VmL21Jt76cjsb9CtFF3rL19dzkf75ACkZvCnZLQ7DlHQXhyt2 +jGUbZHHJXV36HZuiMFqlUsvq6pA3DlQ6STfpNSGPG0uvFCbM6slSdxg1Cc+prZ0z8hz4V NoWy4Zj5riOAgP4hGRXkF3vfmOC4fU+9eVrwxJGJXOp4+hKWst2q8nr3H6shYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=33550b47391330362ea58984aa3fd691f6219ee0 commit 33550b47391330362ea58984aa3fd691f6219ee0 Author: Warner Losh AuthorDate: 2022-03-02 05:54:45 +0000 Commit: Warner Losh CommitDate: 2022-03-02 05:55:24 +0000 bootstrap: No need for kbdcontrol bootstrap anymore We only need kbdcontrol when bootstrapping from FreeBSD 10 or pre-FreeBSD 11.0 current. Since we can no longer build from these versions of FreeBSD, remove the support for bootstrapping them. Sponsored by: Netflix --- Makefile.inc1 | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b7aff83a31d2..5d060f9f6d63 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2305,18 +2305,6 @@ _crunchgen= usr.sbin/crunch/crunchgen _bootstrap_tools_links+=crunchgen .endif -# r296926 -P keymap search path, MFC to stable/10 in r298297 -# Note: kbdcontrol can not be bootstrapped on non-FreeBSD systems -.if !defined(CROSSBUILD_HOST) -.if (${BOOTSTRAPPING} < 1003501 || \ - (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) || \ - (!exists(/usr/sbin/kbdcontrol))) -_kbdcontrol= usr.sbin/kbdcontrol -.else -_bootstrap_tools_links+=kbdcontrol -.endif -.endif - # 1300102: VHDX support .if ${BOOTSTRAPPING} < 1201520 || \ (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102)