From patchwork Fri Apr 14 03:09:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 13211365 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDFD2C77B72 for ; Fri, 14 Apr 2023 11:46:00 +0000 (UTC) Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net [185.136.64.228]) by mx.groups.io with SMTP id smtpd.web11.549.1681441774219560319 for ; Thu, 13 Apr 2023 20:09:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=felix.moessbauer@siemens.com header.s=fm1 header.b=XJg8A1d9; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.228, mailfrom: fm-72506-20230414030930a4bc037c6bd6fea9c0-vxvnwb@rts-flowmailer.siemens.com) Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230414030930a4bc037c6bd6fea9c0 for ; Fri, 14 Apr 2023 05:09:31 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=N15b/9tKLK0lIrx1SA19CPHyL4qUUskKtSidG5/ZjC4=; b=XJg8A1d9vNqnpBYRTq0YVAf7s4ui98OECxmGzF9Hi8neZRWMKJPbgwRcwsT35D8jXHTuKF 0C5PNflcEomSRMHkVP4LuaE+FCbpBvk8/uHT4s6VlUIzmS43kOsf9/yyWUDsshgkjhFDwkVw C/usj3ySiVEsmZ4s35Y+tRwgQ8Tao=; From: Felix Moessbauer To: cip-dev@lists.cip-project.org Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 1/1] add support to limit resource consumption of squashfs creation Date: Fri, 14 Apr 2023 03:09:12 +0000 Message-Id: <20230414030912.189746-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Apr 2023 11:46:00 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/11219 This patch makes it possible to control the number of CPUs and the memory usage when generating a squashfs. The variable names used follow the imagetype variable scheme. Signed-off-by: Felix Moessbauer --- classes/squashfs.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/classes/squashfs.bbclass b/classes/squashfs.bbclass index a06c501..b14768c 100644 --- a/classes/squashfs.bbclass +++ b/classes/squashfs.bbclass @@ -15,6 +15,13 @@ SQUASHFS_EXCLUDE_DIRS ?= "" SQUASHFS_CONTENT ?= "${PP_ROOTFS}" SQUASHFS_CREATION_ARGS ?= "" +SQUASHFS_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" +SQUASHFS_THREADS[vardepvalue] = "1" +# default according to mksquasfs docs +SQUASHFS_MEMLIMIT ?= "7982M" +SQUASHFS_DEFAULTS ?= "-mem ${SQUASHFS_MEMLIMIT} -processors ${SQUASHFS_THREADS}" +SQUASHFS_DEFAULTS[vardepsexclude] += "SQUASHFS_MEMLIMIT SQUASHFS_THREADS" + python __anonymous() { exclude_directories = d.getVar('SQUASHFS_EXCLUDE_DIRS').split() if len(exclude_directories) == 0: @@ -31,5 +38,5 @@ IMAGE_CMD:squashfs[depends] = "${PN}:do_transform_template" IMAGE_CMD:squashfs() { ${SUDO_CHROOT} /bin/mksquashfs \ '${SQUASHFS_CONTENT}' '${IMAGE_FILE_CHROOT}' \ - -noappend ${SQUASHFS_CREATION_ARGS} + -noappend ${SQUASHFS_DEFAULTS} ${SQUASHFS_CREATION_ARGS} }