From nobody Thu Jul 27 04:12:07 2023 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 4RBHQw1vk5z4pQS9; Thu, 27 Jul 2023 04:12:08 +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 4RBHQw0j9rz3p1N; Thu, 27 Jul 2023 04:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431128; 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=FotphUV+u/CvQ5xPNektaf8nuu2rL8xwGbyYr3MEemA=; b=RcfA71EkYjeGp31tpWK+MyQJquBpevBZ/F6UTDnBj5J4vURR2aUO3eA1WTiSdWH+5ekL7t 3IRBDzfhHJ8xMEMLSGNqeOQF4F/EJCrmXXUif9ddjvQ3ezMOCbeaaT0nfGqlADvv3iBS2K RSAL4ARwxIXllcPj1HrwmExelWn/2X6jG3c01HSFA1I+AXLJHKGSs5U2MSBSu/elPUHpKg Um+I2Fu6Cm5iVlqN6dILDbEF5/yqTZG77JIH5LgVJovL6Pub9WcUlZJJVLaA3Rpf69Xyoh EdP8OUya6OTMfOVRvBGNgCzv6aqVUjkbBKLg4Im1W2iCOu0FMbFJp2eHdtosEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431128; 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=FotphUV+u/CvQ5xPNektaf8nuu2rL8xwGbyYr3MEemA=; b=nvhIR8/jfvBDuBu9Fnfyd4iPsdg/0JbMNp8wZr8kQehlvW6x5gtyE3HeYCxnNxSVyFSfJR jcGKWxIGBQfDs/VjYP0zMPxcvDHEW2dNNzprr3UdIOkb5N6z4TeXL/bIZvAigkWbHe66l6 XwS7dZja/xutrJ2SeEOQ449N8WNDx5aCvXr6QmeseJ4LcTurB+0yG1sR5fJy8RX9OP2VD5 BV4oLv3T694a3qYTTdX1nTckVn6qbRcydMXGSLyr6uT3do71S4H2bQ0ZhBgyI+Pizn0J5d NyH9vVq8Jjs3TDG6xW0LuNEfgirjM24mx6LokRtnNVZFS2sU75fwvTE3A66GDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690431128; a=rsa-sha256; cv=none; b=dxfQCKX5KYHs/W9KZ2dtpm6Ys4evXqcf/hNDjMRcAnOjbOruX/auF3UUDhnEWcxBKv7TqJ Lr82rsweD+AYdNunc4R4jNsCm3TaQ5QvoEPrOmNcKbZYZWnpR5grPCy1ajUlSqqAOVN3eE YKg7L6YCpt8rMUAPU4pVLdFjfUhQHDFImdSdYXjJXp9277vqX3ypykjnP0HJdI3r+UyUZX mkdROE9DDLAAB2Y+t2bwH5jkwuEZrI0G51dRgpcH02tEFcyiBcT3t3A6pwHdBzF96Vl2jA zMimAc6tEM6Lg902xyDy+t8hiSgi0AILg/mtc2qhpeEMu/CZy1W+GaDv4ndUnQ== 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 4RBHQv6lQyz19Dg; Thu, 27 Jul 2023 04:12:07 +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 36R4C7Zx097768; Thu, 27 Jul 2023 04:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R4C76D097767; Thu, 27 Jul 2023 04:12:07 GMT (envelope-from git) Date: Thu, 27 Jul 2023 04:12:07 GMT Message-Id: <202307270412.36R4C76D097767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 2a4d73f3cfbd - main - Makefile.inc1: Reinstate kbdcontrol bootstrap for BUILD_WITH_STRICT_TMPPATH 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a4d73f3cfbdbe95cd6554ce1b9b73d1edbae8b7 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2a4d73f3cfbdbe95cd6554ce1b9b73d1edbae8b7 commit 2a4d73f3cfbdbe95cd6554ce1b9b73d1edbae8b7 Author: Jessica Clarke AuthorDate: 2023-07-27 04:10:49 +0000 Commit: Jessica Clarke CommitDate: 2023-07-27 04:10:49 +0000 Makefile.inc1: Reinstate kbdcontrol bootstrap for BUILD_WITH_STRICT_TMPPATH During BUILD_WITH_STRICT_TMPPATH builds we need to symlink the host's kbdcontrol into WORLDTMP/legacy/bin so that it can be used. For completeness, also check if the host has it, since technically the host could have been built with WITHOUT_LEGACY_CONSOLE (though given nobody's screamed since this code was removed that's likely not something that gets hit in practice), and handle BOOTSTRAP_ALL_TOOLS (especially since that case will cover cross-building if and when kbdcontrol can be built on non-FreeBSD). This allows a BUILD_WITH_STRICT_TMPPATH tinderbox to pass. This partially reverts commit 33550b47391330362ea58984aa3fd691f6219ee0. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41202 --- Makefile.inc1 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index f8d4b4333d99..af7d5b8ad0c5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2374,6 +2374,19 @@ _crunchgen= usr.sbin/crunch/crunchgen _bootstrap_tools_links+=crunchgen .endif +# The ATKBD_DFLT_KEYMAP, UKBD_DFLT_KEYMAP and KBDMUX_DFLT_KEYMAP kernel options +# require kbdcontrol. Note that, even on FreeBSD, the host will lack kbdcontrol +# if built with WITHOUT_LEGACY_CONSOLE. +# +# XXX: kbdcontrol cannot currently be bootstrapped on non-FreeBSD systems +.if !defined(CROSSBUILD_HOST) +.if defined(BOOTSTRAP_ALL_TOOLS) || !exists(/usr/sbin/kbdcontrol) +_kbdcontrol= usr.sbin/kbdcontrol +.else +_bootstrap_tools_links+=kbdcontrol +.endif +.endif + .if ${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no" _etdump= usr.bin/etdump _makefs= usr.sbin/makefs