From nobody Thu Jul 7 17:21:43 2022 X-Original-To: freebsd-current@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 F0CB93E1EA4 for ; Thu, 7 Jul 2022 17:21:21 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lf39F6b1Fz3f5r for ; Thu, 7 Jul 2022 17:21:21 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657214481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tnhLJaQ/429xRrxxXY7KM9IoShXOwK7ariTSuon4OwQ=; b=MSc9Zn1bfHju7hQIwTsCM+KZelc31X4qg72bFQsSlHH3QeRjoK0LtgkzqXHmTr4dwXXvFZ qCkS/ZPLxd5OL4FeVJj5muNI6/awVM24R1Owi7UhqlDMXm8zMaoQBVRs5Lvb1acC2LqhqP tua4GEe5VOJP7ffiR8Cw9w3j9MSba95gnCMwj+9sP6mkwujZCQCKC9I0f0W+yBXrxnfLnz SUReVVP8f3FFZ96gZHif5TuJ6NaC4zR05zUlhWyKhJD/K5VA5JTAEmv0CVBUCvhmdWl6Uv aNYaAItt4dUNQz2yw3IzmMv2rUDWd9Zhz5yKmQpR2G7sxM90N3CG9BigwETLrQ== Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Lf39F5YmhzYfT for ; Thu, 7 Jul 2022 17:21:21 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-ed1-f49.google.com with SMTP id x10so16655069edd.13 for ; Thu, 07 Jul 2022 10:21:21 -0700 (PDT) X-Gm-Message-State: AJIora+1QzelvToLHRsSQ12k+JTlzDPRE+2KnH3nZlX/vtQvFyrARxXl vIT35Biy3k5jHkVhBo7FKZUAISmkhiPi1mPHhWE= X-Google-Smtp-Source: AGRyM1tb657JJAHdt2Fe2znaGq2qxsA/FKLCSIRcXwlBSIZLk5El1mgxHbRVxN58OtJAILye8HTm2m8Ppe8D2cTmKAk= X-Received: by 2002:a05:6402:4490:b0:43a:8f5a:d273 with SMTP id er16-20020a056402449000b0043a8f5ad273mr12098189edb.6.1657214480766; Thu, 07 Jul 2022 10:21:20 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Kyle Evans Date: Thu, 7 Jul 2022 10:21:43 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: buildkernel is broken To: sgk@troutmask.apl.washington.edu Cc: Warner Losh , Ryan Stone , FreeBSD Current Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657214481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tnhLJaQ/429xRrxxXY7KM9IoShXOwK7ariTSuon4OwQ=; b=kNvkOZh8IbW4fARMML9T2X/Kuh3U9qdTVg7OopHoj2kUbGtB44E6/d7NEITDreNpstZ3ce L8xTjQTL2wApFlggYecLqB9UcDECAXcjlsryYsMedkIkH0eNktttwgOfX3me1Z8C7/S+JW 5KolyWfdyiqfv6ZPDJminqx01qXL8Odx52bbuzb0WGbdItMSGdQy49gQqLmX4/ZWZnXP1a RDDanSX4dXYa6eypU6AdHfLpHngG+cWjUsR/3GHLqoC1H4q8KpEHfzEiyMx5Aqaodi1wNL 2W+pXlevSTMhDEBF+QAlqOcPTy5bbP9wv8sn17iitnTOIFqx3o/rXMvOtYQPuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657214481; a=rsa-sha256; cv=none; b=qweTvFmydcKzCdmjB9j0cu97Qx4cnzHSVkKHwaTIEuxAx/mjDzrJ22pJa738U3hCvJSqk6 NG+j17by7rrVMuIKEblejfC5ZYL3s6/LChaitEg6CI+fhSHKAhvdp1TXK2/qnzlg/10OmF l+D8vLob3CgLKwUx8F7qHrqCLYXxsaWmQXSbZY1l4/mGXbyCOG8PXRU/l4GX+ss79zCwFP 697NpYcG4D2IVJo8dtUSuUhsERbNWffoLXuNQh6mR+Gi+O2SEw0Ha/Uzx/xy3lfQpczKf8 PJDkyVNPcH+/eCSQxqkpXDrfFOs+l2NB2EaRhIoSGqtscZpOaFnbAcdlG7VU6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Thu, Jul 7, 2022 at 10:01 AM Steve Kargl wrote: > > On Thu, Jul 07, 2022 at 10:37:40AM -0600, Warner Losh wrote: > > On Thu, Jul 7, 2022 at 10:37 AM Steve Kargl < > > sgk@troutmask.apl.washington.edu> wrote: > > > > > Thanks, but > > > > > > root[216] git cherry-pick -n 37f604b49d4a > > > fatal: bad revision '37f604b49d4a' > > > root[217] pwd > > > /usr/src > > > > > > git fetch maybe? > > > > A cursory google search suggests that 'git fetch' > works on repositories not single files. > Right, the idea is that you `git fetch origin main` (or whatever your remote is called rather than 'origin') then you can cherry-pick the revision. fetch will grab the revision without merging it into the current branch. > I did look at the diff associated with 37f604b49d4a. > I am surprised that the commit that broke buildkernel > for me was allowed to be committed. The fix in > 37f604b49d4a seems rather questionable especially given > that there is no comment about why the macro is expanded > to a zero-trip loop. > > Thanks for the help. I'll just do a 'git pull' > and start over with a buildworld. > > -- > Steve >