From nobody Thu Oct 02 13:19:02 2025 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 4ccsnm68vbz69qLb for ; Thu, 02 Oct 2025 13:19:08 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from www121.sakura.ne.jp (www121.sakura.ne.jp [153.125.133.21]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4ccsnm1rs7z41Yc; Thu, 02 Oct 2025 13:19:07 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Authentication-Results: mx1.freebsd.org; none Received: from kalamity.joker.local (124-18-6-240.area1c.commufa.jp [124.18.6.240]) (authenticated bits=0) by www121.sakura.ne.jp (8.18.1/8.17.1/[SAKURA-WEB]/20201212) with ESMTPA id 592DJ3dq099884; Thu, 2 Oct 2025 22:19:03 +0900 (JST) (envelope-from junchoon@dec.sakura.ne.jp) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=dec.sakura.ne.jp; s=s2405; t=1759411143; bh=vbEeWP5Un93JD1KghEyL+wY07cmI1rFBnlxn8Yp+vM8=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=RA4dHrx+qz00rZwWI6X0W9eEQujfmL0eOKBfsHfFV1ORVme7DdYUG5o7CLvTHCf/0 UNcdTGRoqcAq0sGRk2L2A51qd4vftRdMH3KAy9lHEGWVlQqDgdqXg4sWsK5mXjwdJL cSVhrsEvGbQ8cqwUoN+G/vchKakjdi5VILWkz4wk= Date: Thu, 2 Oct 2025 22:19:02 +0900 From: Tomoaki AOKI To: Andriy Gapon Cc: freebsd-current@freebsd.org Subject: Re: Questions about pkgbase Message-Id: <20251002221902.822ef8e9224b759611cfc14a@dec.sakura.ne.jp> In-Reply-To: <36501ae5-5d7f-4e4c-8c96-0f1908ce1059@FreeBSD.org> References: <20251002.180121.980053125503545103.yasu@FreeBSD.org> <36501ae5-5d7f-4e4c-8c96-0f1908ce1059@FreeBSD.org> Organization: Junchoon corps X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ccsnm1rs7z41Yc On Thu, 2 Oct 2025 12:54:55 +0300 Andriy Gapon wrote: > On 02/10/2025 12:35, Lexi Winter wrote: > > yes, the merge functionality is the same (more or less), but the result > > for the user is worse: etcupdate makes it clear which files failed to > > merge and offers a manual resolution of the merge with conflict markers, > > while pkg just prints a message, which is usually lost in the hundreds > > of other messages printed during an upgrade, and requires the user to > > manually locate the unmerged files via find / -name '*.pkgnew', then > > you only get the old and new files with no way to easily see what has > > changed in the new version of the file. (basically, this is a manual > > two-way merge.) > > > > if there's a better way to do this with pkg, i'd definitely like to know > > about it. > > It would be good if pkg installed base configuration files into etcupdate's tree > and then a user needed to explicitly run etcupdate to apply configuration updates. > > But I imagine that this may not be very easy to do and it would create a > relatively fragile dependency between pkg and etcupdate. > > -- > Andriy Gapon Isn't it better to keep freebsd-update (with modifications) and wrap pkgbase upgrades around? Doing so would allow splitting etcupdate process out from base pkg upgrades, isn't it? -- Tomoaki AOKI