From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a05:6402:2079:: with SMTP id bd25mr24011170edb.116.1637324018369; Fri, 19 Nov 2021 04:13:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:5941:: with SMTP id g1ls1270869ejr.10.gmail; Fri, 19 Nov 2021 04:13:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJzNWQt9lRFGvcWYI0Jxl9VyOs2SC6VO5pQopDXAGlPbfMsvF/R+06yQO3R2ePuLK16Pza6S X-Received: by 2002:a17:906:489b:: with SMTP id v27mr6982408ejq.567.1637324017229; Fri, 19 Nov 2021 04:13:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324017; cv=none; d=google.com; s=arc-20160816; b=bhrIFz3dyO7od2ejrsv9CFpoZwatCqPKVmhuSYBvL5HGNgkUPQ1iBc6Ds/Sr/ePABZ 6ANyhlmitqjxDCWnrPhp5w2NTPh7qwoGxEXG84BSCdghSAT+We3vhSwZtondQGupqfKG ybjQKjExItSffKXloTZ3bm02npw8jK2WxYhYXV4WS7aU+qLKFYNi7CXPGeWLoZfDZ1sv shyyAmzPOgyy0aHzX26DDSOP21XWxKg29YwzPo8byooHe5WCsIow3sudKiDmXTPugRHJ aayuFEp9siY+TKZOuKbsxEqzTFHdEVJhUQcggXNyLcRZA7akRqgnI/7jiZ5/WQbB6dzk /bBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=ha6B0nyA/rAp6GqRQmJs+YdAccU/YOusI2pUNKr0+9U=; b=WriCmkEHbR2tYn4OXg0GD2OZPMqAIut7rWLhTz7VBoyzfUM2mpbRTZ3Rda0JT8ZkNs 8LTklZGEh1sSXuwNE65tJbzBjDxnKlz2gei56r6+egQ2eiMHNCjyCddWA8fHQtOMasFH BtYS3oUEL9gJ4J/zic+Zq1Le7BkJpJkJHXig8wZ80PVw7kU7AB0EoaPFn0vl4z+nopjB dP/6fEWp1uxAuH9/vNC7tDSMXKktShV9DCy7G4hka5/fenQPws+DjORqnl6X1HUPW3px n0W8tbPBrPzlQ1IiQAJOgpp2aaABKCwap4xTG5VV5ZrjDXn5HvZdDJLkOsT9RUuZw83T 8U8A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id w5si127488ede.3.2021.11.19.04.13.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:37 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1AJCDX7I021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:36 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 08/24] kselftest: Do not use shell environment Date: Fri, 19 Nov 2021 13:13:17 +0100 Message-Id: <20211119121333.13805-9-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119121333.13805-1-ubely@ilbers.de> References: <20211119121333.13805-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: yO8vHY/jtpIV From: Anton Mikanovich To make package build process independent of the shell environment we should remove KSELFTEST_ARGS passing through export call. The same logic can be done by internal recipe parser and then pass variable to template-based debian/rules file. Signed-off-by: Anton Mikanovich --- .../kselftest/files/{rules => rules.tmpl} | 0 meta/recipes-kernel/kselftest/kselftest.inc | 21 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) rename meta/recipes-kernel/kselftest/files/{rules => rules.tmpl} (100%) diff --git a/meta/recipes-kernel/kselftest/files/rules b/meta/recipes-kernel/kselftest/files/rules.tmpl similarity index 100% rename from meta/recipes-kernel/kselftest/files/rules rename to meta/recipes-kernel/kselftest/files/rules.tmpl diff --git a/meta/recipes-kernel/kselftest/kselftest.inc b/meta/recipes-kernel/kselftest/kselftest.inc index 2a76028b..6187d8e4 100644 --- a/meta/recipes-kernel/kselftest/kselftest.inc +++ b/meta/recipes-kernel/kselftest/kselftest.inc @@ -33,26 +33,21 @@ DEBIAN_BUILD_DEPENDS ?= " \ llvm:native, \ " -SRC_URI += "file://rules" +SRC_URI += "file://rules.tmpl" S = "${WORKDIR}/linux-${PV}" +TEMPLATE_FILES = "rules.tmpl" +TEMPLATE_VARS += "KSELFTEST_ARGS" + KSELFTEST_TARGETS ?= "" KSELFTEST_SKIP_TARGETS ?= "" KSELFTEST_FORCE_TARGETS ?= "0" +KSELFTEST_ARGS = "${@ "TARGETS=\"${KSELFTEST_TARGETS}\"" if d.getVar('KSELFTEST_TARGETS', True) else ''}" +KSELFTEST_ARGS_append = "${@ " FORCE_TARGETS=1" if d.getVar('KSELFTEST_FORCE_TARGETS', True) == '1' else ''}" +KSELFTEST_ARGS_append .= "${@ " SKIP_TARGETS=\"${KSELFTEST_SKIP_TARGETS}\"" if d.getVar('KSELFTEST_SKIP_TARGETS', True) else ''}" + do_prepare_build[cleandirs] += "${S}/debian" do_prepare_build() { deb_debianize } - -dpkg_runbuild_prepend() { - if [ -n "${KSELFTEST_TARGETS}" ];then - export KSELFTEST_ARGS="TARGETS=\"${KSELFTEST_TARGETS}\"" - fi - if [ ${KSELFTEST_FORCE_TARGETS} -eq 1 ];then - export KSELFTEST_ARGS="${KSELFTEST_ARGS} FORCE_TARGETS=1" - fi - if [ -n "${KSELFTEST_SKIP_TARGETS}" ];then - export KSELFTEST_ARGS="${KSELFTEST_ARGS} SKIP_TARGETS=\"${KSELFTEST_SKIP_TARGETS}\"" - fi -} -- 2.20.1