From nobody Wed Nov 6 21:59:50 2024 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 4XkJzB3h0kz5btkY for ; Wed, 06 Nov 2024 22:00:06 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 4XkJz94jf4z4DjM for ; Wed, 6 Nov 2024 22:00:04 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-37d4d1b48f3so145849f8f.1 for ; Wed, 06 Nov 2024 14:00:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730930402; x=1731535202; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fGoL0yajA4BHCKT4ZtV51wlk4vOmA/Qw6bpf76MwgzI=; b=FXTxF/jNxG5WiQY4hvKuqClDUPTChtCvckUyaFgl9NuHFqawDGc+h0VeLQFOxIINYX PiAqayADTQ/pinVK3Bpkl0gGngre+RZ4WSFFnWViiIYeq7KK4u2gFa0402KAFY9yKAdw 1PHKaPt5+uJ6Dv5Dr8IQD7ZXwmNBOfWScLAICgmOFv2mRjq+ilfmU1a8wNZtTQj3bYVo gCCxzodGG0TGsc9mycO+eTQGBH3Pe5RSnWWODPWC9tt1a3S3PoOhCo0TXFd+/p+SfOzL SwLye6lNsJ/kisxp63o/RFfz09MRdl8PYjI+w79PZYktDMrBdpThmJaPm27wzvdD9eQG JEOw== X-Forwarded-Encrypted: i=1; AJvYcCXfyJhVOcAPBilW39AUG//1UD5hE/hYMkTTJghNVEbUX+5+VT2e/8FpRK+H4HncaOTKDustqQZID3hZdq5V0vRhK61I@freebsd.org X-Gm-Message-State: AOJu0YxOPGatULeWNoAGk6hQuD3NSYz7G8tHo4Udzwr6hQKbnBScxuiQ fGbzDSmaIJdgEUHcvN0F37SNAm75ghFrpqA8Y2mB6kDnGRMRsO2vW9xTPJnPre0= X-Google-Smtp-Source: AGHT+IElsFloyq1B+sIdL7Bd28E7Kug0Ku1GznP35njo8YXR75x2OF3wU6/XXWlECrow49fijHXJBA== X-Received: by 2002:a05:6000:b4c:b0:37d:3735:8fe7 with SMTP id ffacd0b85a97d-381b708b14bmr18803314f8f.32.1730930402299; Wed, 06 Nov 2024 14:00:02 -0800 (PST) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381c10ea7c2sm20285043f8f.57.2024.11.06.14.00.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2024 14:00:01 -0800 (PST) Content-Type: text/plain; charset=us-ascii 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Subject: Re: git: cdfd0600dc88 - main - release: Include -dbg files in dvd image From: Jessica Clarke In-Reply-To: <202411052139.4A5Ldkj3078621@gitrepo.freebsd.org> Date: Wed, 6 Nov 2024 21:59:50 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202411052139.4A5Ldkj3078621@gitrepo.freebsd.org> To: Colin Percival X-Mailer: Apple Mail (2.3818.100.11.1.3) X-Spamd-Result: default: False [-1.12 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; NEURAL_SPAM_SHORT(0.28)[0.277]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.51:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.51:from] X-Rspamd-Queue-Id: 4XkJz94jf4z4DjM X-Spamd-Bar: - On 5 Nov 2024, at 21:39, Colin Percival wrote: >=20 > The branch main has been updated by cperciva: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dcdfd0600dc8882f0a0d0e6d9a1cdcf92= 6edba6d6 >=20 > commit cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6 > Author: Colin Percival > AuthorDate: 2024-11-05 21:35:17 +0000 > Commit: Colin Percival > CommitDate: 2024-11-05 21:39:38 +0000 >=20 > release: Include -dbg files in dvd image >=20 > In 2016, commit 8834318685bc reworked the code for excluding -dbg > files from install media, and in the process accidentally broke it > for dvd images ('grep -v' should have been 'grep -vE'). >=20 > FreeBSD Update builds later began to depend on this, and in any = case > since DVD images are intended as "include everything" images = there's > no point excluding those; so remove the (broken) filtering from DVD > image builds. Ah, my bad, I found this a couple of years ago downstream[1] but should have upstreamed the second half of that commit (which also went one further than this commit and removed the now-pointless $$(ls ...). Jess [1] = https://github.com/CTSRD-CHERI/cheribsd/commit/7cd4d52c6df917ec4dc8aa74ad2= 88de83441d8c8 > Sponsored by: Amazon > MFC after: 2 days > --- > release/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/release/Makefile b/release/Makefile > index 6f59647ff5db..9f19b150ae65 100644 > --- a/release/Makefile > +++ b/release/Makefile > @@ -241,12 +241,12 @@ dvd: packagesystem > -DDB_FROM_SRC ) > # Copy distfiles > mkdir -p ${.TARGET}/usr/freebsd-dist > - for dist in MANIFEST $$(ls *.txz | grep -v -- '(${base = ${_ALL_libcompats}:L:ts|})-dbg'); \ > + for dist in MANIFEST $$(ls *.txz); \ > do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ > done > .if defined(NO_ROOT) > echo "./usr/freebsd-dist type=3Ddir uname=3Droot gname=3Dwheel = mode=3D0755" >> ${.TARGET}/METALOG > - for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base = ${_ALL_libcompats}:L:ts|})-dbg'); \ > + for dist in MANIFEST $$(ls *.txz); \ > do echo "./usr/freebsd-dist/$${dist} type=3Dfile uname=3Droot = gname=3Dwheel mode=3D0644" >> ${.TARGET}/METALOG; \ > done > .endif