From nobody Tue Dec 10 17:29:05 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 4Y75Ln3rWNz5gNvx; Tue, 10 Dec 2024 17:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y75Ln1YnDz3xXd; Tue, 10 Dec 2024 17:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733851745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zig6yT8kLxpmImQhqNmFMMgAeZg8QzFe2VsiodWNl3U=; b=XgdMRzGPX6k+eDQrhiTdM8tTMov1jZBSn9zKfHnVMyA/yEn2KUX8vxoDXt/6waoHCqHkj+ NYiIk1yl+AsHtkTyVJNGpS4SFVuaJ2SryqWbdc0s6SK0DjSKi4HhN4q4P+0ZHCJHNpOjqO orEzyAon8AghuyxaDghV6lQDOIoosRDbAMYX3u3doVP4yTlv/fcKkCbZXYbrNQLK+7qSx7 wsTMgmb0j3HYy8j92IKqRdmjlHPpLitDAS9Y4Bcomhui3c9tlwdN3GDtriUNEB/SGdffpl YVUHcXnzPxzv4UkO+AyuMHrELpVeaLG+WWfUKTJenYAARGuavf8Dz/RGguUZIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733851745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zig6yT8kLxpmImQhqNmFMMgAeZg8QzFe2VsiodWNl3U=; b=LgkfeIB+JDIR/oUK9x6f3BMPzyMmOQzsa4oXLUxc3AcXQkY+OnH/do87bJs7fHFn4+Jh9z 7j74wDK3u3hnSdDoqlZozej3f40LQn455P/9aaF47KkqbfRJLkj0U1VlkVvhxMdsneDFko 0FQKwww0YFX+RXM+hF5a3XzfGrwp8gDlI0+guvDuLQjfUI+jiGiom9ob6wFp6G5JSNhD8Z 8Ok6NTVMtcP6HRg1g5nuxjYwNGAdt3yNeIXctGqNUKLzDFfWNq7s++DJfvXBcB5pVklakb IxOxo+2UWZAcEKqiFfVmGdlh0WaYPJY1sNkNeMqUBQijjy6XLOQ9sVFfvJqbiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733851745; a=rsa-sha256; cv=none; b=egHOPJKsO81Y9OfwZMGHFXNxBlyaKdA2uaGchBU79zAijFaLUJpkgF3SjWcVrKmuGG2DL0 mbMEHp9tXKvMIiaqVBMhR+5pJ+Py6ti7t4YTdNbOG+hKaMIUTbEn3edDzhbiE3g7mYRZyl y6e7Z93iVMnvkV7vvS4TSOW2UC9S1JGKghiNiIs/QAbkHSm4cJMMPASApawygl+1fj78AA YyeKgQUSG/p6nEGxtznaJ8lA1sFNZukez6K3Np0X5PcNxFdRtjDY3yshZMsyB8Mg2A8zrV s0ctnpHtPb8XwvdL23kyG8QoNos9N25ud7TWtILDT6rFz5dJr6dRqg0Lw9kiSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y75Ln0yfRzXnr; Tue, 10 Dec 2024 17:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BAHT5pR031437; Tue, 10 Dec 2024 17:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAHT5lr031434; Tue, 10 Dec 2024 17:29:05 GMT (envelope-from git) Date: Tue, 10 Dec 2024 17:29:05 GMT Message-Id: <202412101729.4BAHT5lr031434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 6dafe8c1e46e - main - Clean pkg cache in release media 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dafe8c1e46e58097b277ab9babb3ec5336713d7 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=6dafe8c1e46e58097b277ab9babb3ec5336713d7 commit 6dafe8c1e46e58097b277ab9babb3ec5336713d7 Author: Muhammad Moinur Rahman AuthorDate: 2024-12-10 17:24:43 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-12-10 17:28:55 +0000 Clean pkg cache in release media Recently wifi-firmware-kmod-release pkgs were added in the release installation media, but unfortunately the pkgs were not cleaned up after the installation. These kept the stale pkgs in the /var/cache. The pkgs should be removed with pkg clean. PR: 283112 Reported by: yanhui.he@broadcom.com Reviewed by: cperciva, emaste Approved by: cperciva, emaste, re (implicit) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47942 --- release/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/Makefile b/release/Makefile index a99486ea4b84..ee2f52ad56af 100644 --- a/release/Makefile +++ b/release/Makefile @@ -79,6 +79,7 @@ PKG_ARGS+= -o METALOG=METALOG PKG_ENV+= ASSUME_ALWAYS_YES=yes PKG_ARGS+= -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos PKG_INSTALL= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} install +PKG_CLEAN= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} clean -a .endif .if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL) @@ -194,6 +195,7 @@ disc1: packagesystem .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} wifi-firmware-kmod-release || true + ${PKG_CLEAN} || true .endif # Set up installation environment ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf @@ -270,6 +272,7 @@ dvd: packagesystem .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} wifi-firmware-kmod-release || true + ${PKG_CLEAN} || true .endif # Set up installation environment ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf