From nobody Tue Aug 19 13:54:25 2025 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 4c5rg00w8lz64x3T; Tue, 19 Aug 2025 13:54:36 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c5rfy5dLkz3WbS; Tue, 19 Aug 2025 13:54:34 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=VCV0yEkd; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::72c as permitted sender) smtp.mailfrom=markjdb@gmail.com Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-7e864c4615aso627524585a.1; Tue, 19 Aug 2025 06:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755611669; x=1756216469; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=iUWEhaC1YQa7nyPWFln1MITyhW+QboQhr/Ufhh/arlU=; b=VCV0yEkdtYiTrunBOn/DhYTinpAwtOnXUsCMkDQxer7JyzbQT7Rfcn9emxI7WQbdqy ogj5L0e9/HzEfjyq6FGgR12naveQkeAEV6uwpEh4T+u3oJmFWv9usWbeTcKVdH9WtKLf +mLr27I9C5zts0cXjmVc5WhWjZ4V3SDSkwzY5wN4eP5xQk0RjFa66fXKEJBROG+G2r0d 8m+GRoJfDI1vxRKEdu2A0BwpKAlOwocYylcwAVX1//5fYyJBI65xoI/8vVO4qMRyWrgW 18u2SShNscWw9vQb23W+FLI9QiHQ06BrZaH44MxNXdqtTVlB4dFN3/R8oGY2szp1cs2d 24Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755611669; x=1756216469; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iUWEhaC1YQa7nyPWFln1MITyhW+QboQhr/Ufhh/arlU=; b=IvqJane6sMOqI9fZwQqmAJ8diRpYC5yQNGCuRWkdD3RHgpQoqhLUFzcVd78C5l4YDW XQpEGBDqZwh79XrBieASHpKji0pACyEE5fEDSrDzGghNK67Yda9i5YJyuZP70Ks/16Up GrzPUp6JkRY1TiVzkPJrESPTQz9UCt44yKmszUDzcOkYrUFS3ymfrz09BH7Jn/kGBUxL zoJj0R31CkHpZ4q5tvEt6nhYJGG1ouHM2WAdWmIoU9l7Ola8VhBcKxbagDtRsnq9GMn7 qhb7lEzKRyP7azDT2r7qRrOojjI1ZjegZbRFwPeMtR7mNAThcp9XSL1lWRZmb5Vh7gN+ GIxQ== X-Forwarded-Encrypted: i=1; AJvYcCWps753jwKSfypmpnU133Ejh5bULsuH5/UtTlqmzW8ouJP04i5IY2QT8+sp6a+YKDb6oXWkSupFtSMlrJXnez2C27ZMfTk=@freebsd.org, AJvYcCXhoDNi0oU86rH+o6TRW7u8wOKcF5bDpGiI8EQD1PXEH8Xr2dhadlM2d//oC82l4z/losEE6FO0TBvyFN709i6EjzYC@freebsd.org X-Gm-Message-State: AOJu0YzViYiSxvjonK4ZQVl1pa3coX40VFGnQ+rCbvgXVcfB15r5l87Z PWbd9RtltWplxmOPf7Ty6wgbZwYKDQrrc3jzZ1BI5j/qmqjZ28F4J2jiRAUdlzlw X-Gm-Gg: ASbGnctHy/EBkmhpoEtl1X5Z7NvaL44sPlxGerR6EZ2BZf1oECRY2QCbug/hPvJUEO9 ebSqBLRPAqWptO/nfBYr4ui/jPiA+klPhK3v/1rtwfTJwvQGe0B7nnpyrtQSOmljpdGZIF3nTyt y7YO+SogHE5u2G6QmQQTEmMJTPtoOG4dMH5ncBpef/arUGJfDRATY7aQFPFvHlhNnlCVwTdjFod 850dWBkbCLm+fKcu+7Hs0BsUIlXHeHfXCjfK6qClY1Buz7ban09CAHE4sdngR/QehtGZLm3cQwo Y0vbK40C0lJHbaZDEEcXRvFDPScWAYdtyqXAEGYED2Vf9engpmptN8kHjqLbgt3FytgaGjGlB27 a7fFTx6kFzLroB8YdCIaLO+t3alRUMLTNLMn6 X-Google-Smtp-Source: AGHT+IH4xBzPaqdNUX6OY4vXuAXIpg5lcLg1qqa4QD3ebYGxiFkfTd11LBVlsU1ADpYXdaXFhoWhDw== X-Received: by 2002:a05:620a:708e:b0:7e7:f2a2:251 with SMTP id af79cd13be357-7e9f4b7d38cmr219678685a.27.1755611668617; Tue, 19 Aug 2025 06:54:28 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7e87e1c10f2sm765634085a.59.2025.08.19.06.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Aug 2025 06:54:27 -0700 (PDT) Date: Tue, 19 Aug 2025 09:54:25 -0400 From: Mark Johnston To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 00294d7b0a2e - main - bsdinstall: Guard against invalid branch/revision Message-ID: References: <202507251534.56PFY5PS085339@gitrepo.freebsd.org> 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202507251534.56PFY5PS085339@gitrepo.freebsd.org> X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.90)[-0.902]; MID_RHS_NOT_FQDN(0.50)[]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[gmail.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72c:from] X-Rspamd-Queue-Id: 4c5rfy5dLkz3WbS On Fri, Jul 25, 2025 at 03:34:05PM +0000, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=00294d7b0a2e3ae3e870333ef7c8ecbc9fa26da3 > > commit 00294d7b0a2e3ae3e870333ef7c8ecbc9fa26da3 > Author: Ed Maste > AuthorDate: 2025-07-25 14:56:22 +0000 > Commit: Ed Maste > CommitDate: 2025-07-25 15:33:56 +0000 > > bsdinstall: Guard against invalid branch/revision > > I somehow ended up with a tree where make -V BRANCH and make -V REVISION > were broken, resulting in a FreeBSD-base.conf with a broken repo URL. > Check for BRANCH == RELEASE explicitly and emit a warning if BRANCH does > not match an expected case. > > Reviewed by: Isaac Freund > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D51528 > --- > usr.sbin/bsdinstall/Makefile | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile > index 75db149b814b..e5bb3197fa05 100644 > --- a/usr.sbin/bsdinstall/Makefile > +++ b/usr.sbin/bsdinstall/Makefile > @@ -22,8 +22,11 @@ REVISION?= ${_REVISION} > > .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE > SUBURL= base_latest > -.else > +.elif ${BRANCH} == RELEASE > SUBURL= base_release_${REVISION:C/[0-9]+\.//} > +.else > +.warning Invalid branch "${BRANCH}" This warning gets tripped now that the branch is PRERELEASE. I guess we should still be using base_latest at this point? > +SUBURL= base_latest > .endif > > FreeBSD-base.conf: FreeBSD-base.conf.in