From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A0427158041 for ; Mon, 19 Feb 2024 22:08:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64FE82BC01E; Mon, 19 Feb 2024 22:08:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 216C42BC016 for ; Mon, 19 Feb 2024 22:08:38 +0000 (UTC) Received: from grubbs.orbis-terrarum.net (localhost [127.0.0.1]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B79A3430C9 for ; Mon, 19 Feb 2024 22:08:37 +0000 (UTC) Received: from grubbs.orbis-terrarum.net (localhost [127.0.0.1]) by grubbs.orbis-terrarum.net (Postfix) with ESMTP id 8B8822601A3 for ; Mon, 19 Feb 2024 22:08:36 +0000 (UTC) Received: (qmail 5839 invoked by uid 129); 19 Feb 2024 22:08:36 -0000 X-HELO: bohr-int.orbis-terrarum.net Authentication-Results: orbis-terrarum.net; auth=pass (plain) smtp.auth=robbat2-bohr@orbis-terrarum.net; iprev=pass Received: from d206-116-35-168.bchsia.telus.net (HELO bohr-int.orbis-terrarum.net) (206.116.35.168) by orbis-terrarum.net (qpsmtpd/0.95) with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted); Mon, 19 Feb 2024 22:08:36 +0000 Received: (nullmailer pid 25932 invoked by uid 10000); Mon, 19 Feb 2024 22:08:33 -0000 From: "Robin H. Johnson" To: gentoo-dev@lists.gentoo.org Cc: "Robin H. Johnson" Subject: [gentoo-dev] [PATCH] check-reqs.eclass: more disk checks Date: Mon, 19 Feb 2024 14:08:32 -0800 Message-ID: <20240219220832.25919-1-robbat2@gentoo.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Virus-Checked: Checked by ClamAV on orbis-terrarum.net X-Archives-Salt: 9ffc8420-6f45-46be-8df5-989503c74a36 X-Archives-Hash: a92c360a27d87abc50225e8a0e9ab9b9 Allow checking more disk space, for users with many split volumes and ever-larger packages. gentoo-kernel-bin: / >=350MB/version (in /lib/modules) /boot >=40MB/version rust-bin: /opt >=450MB/version Signed-off-by: Robin H. Johnson --- eclass/check-reqs.eclass | 44 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index fac2f4553d74..7b65f44e8c41 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -24,12 +24,21 @@ # # need this much temporary build space # CHECKREQS_DISK_BUILD="2G" # +# # install will need this much space in / +# CHECKREQS_DISK_ROOT="1G" +# +# # install will need this much space in /boot +# CHECKREQS_DISK_BOOT="128M" +# # # install will need this much space in /usr # CHECKREQS_DISK_USR="1G" # # # install will need this much space in /var # CHECKREQS_DISK_VAR="1024M" # +# # install will need this much space in /opt +# CHECKREQS_DISK_OPT="1G" +# # @CODE # # If you don't specify a value for, say, CHECKREQS_MEMORY, then the test is not @@ -56,6 +65,16 @@ _CHECK_REQS_ECLASS=1 # @DESCRIPTION: # How much diskspace is needed to build the package? Eg.: CHECKREQS_DISK_BUILD=2T +# @ECLASS_VARIABLE: CHECKREQS_DISK_ROOT +# @DEFAULT_UNSET +# @DESCRIPTION: +# How much space in / is needed to install the package? Eg.: CHECKREQS_DISK_ROOT=1G + +# @ECLASS_VARIABLE: CHECKREQS_DISK_BOOT +# @DEFAULT_UNSET +# @DESCRIPTION: +# How much space in /boot is needed to install the package? Eg.: CHECKREQS_DISK_BOOT=128M + # @ECLASS_VARIABLE: CHECKREQS_DISK_USR # @DEFAULT_UNSET # @DESCRIPTION: @@ -66,6 +85,11 @@ _CHECK_REQS_ECLASS=1 # @DESCRIPTION: # How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M +# @ECLASS_VARIABLE: CHECKREQS_DISK_OPT +# @DEFAULT_UNSET +# @DESCRIPTION: +# How much space is needed in /opt? Eg.: CHECKREQS_DISK_OPT=1G + # @ECLASS_VARIABLE: CHECKREQS_DONOTHING # @USER_VARIABLE # @DEFAULT_UNSET @@ -121,8 +145,11 @@ _check-reqs_prepare() { if [[ -z ${CHECKREQS_MEMORY} && -z ${CHECKREQS_DISK_BUILD} && + -z ${CHECKREQS_DISK_ROOT} && + -z ${CHECKREQS_DISK_BOOT} && -z ${CHECKREQS_DISK_USR} && - -z ${CHECKREQS_DISK_VAR} ]]; then + -z ${CHECKREQS_DISK_VAR} && + -z ${CHECKREQS_DISK_OPT} ]]; then eerror "Set some check-reqs eclass variables if you want to use it." eerror "If you are user and see this message file a bug against the package." die "${FUNCNAME}: check-reqs eclass called but not actually used!" @@ -161,6 +188,16 @@ _check-reqs_run() { fi if [[ ${MERGE_TYPE} != buildonly ]]; then + [[ -n ${CHECKREQS_DISK_ROOT} ]] && \ + _check-reqs_disk \ + "${EROOT%/}/" \ + "${CHECKREQS_DISK_ROOT}" + + [[ -n ${CHECKREQS_DISK_BOOT} ]] && \ + _check-reqs_disk \ + "${EROOT%/}/boot" \ + "${CHECKREQS_DISK_BOOT}" + [[ -n ${CHECKREQS_DISK_USR} ]] && \ _check-reqs_disk \ "${EROOT%/}/usr" \ @@ -170,6 +207,11 @@ _check-reqs_run() { _check-reqs_disk \ "${EROOT%/}/var" \ "${CHECKREQS_DISK_VAR}" + + [[ -n ${CHECKREQS_DISK_OPT} ]] && \ + _check-reqs_disk \ + "${EROOT%/}/opt" \ + "${CHECKREQS_DISK_OPT}" fi } -- 2.43.0