From nobody Tue Sep 10 16:06:31 2024 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 4X37qp2w7Vz5W5XN for ; Tue, 10 Sep 2024 16:06:46 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (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 4X37qn6wlSz4vGZ for ; Tue, 10 Sep 2024 16:06:45 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2f74e613a10so3739881fa.1 for ; Tue, 10 Sep 2024 09:06:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725984404; x=1726589204; 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=T1Oqn/P34VNtbD6YylRDPEVDr4l9jmwzvxtn+eC3dws=; b=I+A8BN32SkqPJlYB/2JihaCGx2DBYnskfBH7FRX/z2jq2HZDjxbqpTq14K2FlRio0k FtJMBOO6RaUEhF8FVSzC9uD05k8Caqb5GFKvCTXft9gZnRnLMfFlxoIpMH6f/Uzo6hAj JpqWWpCfmY9L4Y5i8stYFhdowUUZbhsBRUaxaBwjwKGJbOh9yWc1+jrrghVev7L76ye8 LsVf/iwrU0kHsJoY2iJKhYj5y8TZeATTVOLv6VVUy4uIy1RumHZqVl/k74laRRIxuu5v lw3P8kPoad4crjyVAwQsOAc7kfed11LgXde+X9PQBasU+ax2RjnzX2RSmgzz52FHVRQA MGHg== X-Forwarded-Encrypted: i=1; AJvYcCUKeKWXDSlAmHWdGTsQkcWQzc4GXSrr3orF3dPR3rKPiuJVlxQH4YnjDRDHhVvy+bJo/9wTIh81SzaBznWad6pUjw/dGA==@freebsd.org X-Gm-Message-State: AOJu0Yy++IHsKA8Q4MxsKV7jX8+C8xzopTxNVVyy+lUdC26HmHABVy0i qXWEhIfr9C49bZN2yEWkl6y6G7sXCrJyqJmHc62dDE20BjmtlpvuQaf+1YerXE0= X-Google-Smtp-Source: AGHT+IEkyKLNkEfOxdjdzXiLmiIn1KO9tBYs4You5G6d5ItE7bsyGk2N1VuyPqn1CVT4rHAG5D77Ig== X-Received: by 2002:a05:651c:198d:b0:2f1:750d:53a7 with SMTP id 38308e7fff4ca-2f75a971718mr89863691fa.8.1725984402567; Tue, 10 Sep 2024 09:06:42 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3789564aea0sm9307011f8f.20.2024.09.10.09.06.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Sep 2024 09:06:41 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3776.700.51\)) Subject: Re: git: fd3d3240b0d7 - main - depend-cleanup.sh: Add a rule to work around abd_os.c dependency changes From: Jessica Clarke In-Reply-To: <202409101531.48AFVOiw046173@gitrepo.freebsd.org> Date: Tue, 10 Sep 2024 17:06:31 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <65741638-EA13-4154-9013-E36D628E50D8@freebsd.org> References: <202409101531.48AFVOiw046173@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3776.700.51) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4X37qn6wlSz4vGZ On 10 Sep 2024, at 16:31, Mark Johnston wrote: >=20 > The branch main has been updated by markj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dfd3d3240b0d7e4fa790e3d2b6d4e055a= 52754f32 >=20 > commit fd3d3240b0d7e4fa790e3d2b6d4e055a52754f32 > Author: Mark Johnston > AuthorDate: 2024-09-10 15:29:39 +0000 > Commit: Mark Johnston > CommitDate: 2024-09-10 15:29:39 +0000 >=20 > depend-cleanup.sh: Add a rule to work around abd_os.c dependency = changes >=20 > Fixes incremental buildworld after the latest OpenZFS import. >=20 > Fixes: e2df9bb44109 ("zfs: merge openzfs/zfs@b10992582") > Sponsored by: Klara, Inc. > --- > tools/build/depend-cleanup.sh | 3 +++ > 1 file changed, 3 insertions(+) >=20 > diff --git a/tools/build/depend-cleanup.sh = b/tools/build/depend-cleanup.sh > index b7231422c5ed..da3dd05c6c4d 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -182,3 +182,6 @@ if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ > echo "removing rescue.mk without nvme_util.o" > rm -f "$OBJTOP"/rescue/rescue/rescue.mk > fi > + > +# 20240910 e2df9bb44109 > +clean_dep cddl/lib/libzpool abd_os c Won=E2=80=99t that also clean the new one given the source directory for = the file just changed, thereby rebuilding it every time? I think this needs a custom grep for the bad source dependency. Jess