From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a05:6512:3f94:: with SMTP id x20mr4307851lfa.583.1644475402207; Wed, 09 Feb 2022 22:43:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:98b:: with SMTP id b11ls750784ljq.7.gmail; Wed, 09 Feb 2022 22:43:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJx4f8j9q/lsPY33P5IGaAzSLD0THbVfgj9TCs4sGRn/UVh6hU6FNpKjZFqaz2kQzYugz6B2 X-Received: by 2002:a2e:3212:: with SMTP id y18mr3966520ljy.27.1644475400993; Wed, 09 Feb 2022 22:43:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644475400; cv=none; d=google.com; s=arc-20160816; b=bbXgoxQMWvqZ0dDtDetbuqh9n+coKkmejTpbb+3qcNWY9NlJ/Dh1EaH4OxKXc4hWkr 8YN3Nxtwj4lv3+o/a3MXPsNb0nfXamRqPjwtXXmflJ4gh5APIrXkx9EI2V3yVkUq6Gch rGr/rUUSjUgVsmxHus9F55TV77DKs2nRzP/F/u3Zg7nZY3n5RNKwOke/J9ZZ48+s0Qlc SQi12i+9sA6mztV3kfF+B1kivCuMQUcWZuHYZ6+vGnYNPLPvstq1p2lb07YusNUcbn+x aGWbWqnQ4JHLIYW9Gw5c2acVBw9Q0JkC6vydabm5b4eFzlyoukhkOFOqDJ1obZsLu1Ig 43Ug== 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=dOvGhwuyIcq8o8eFoWMNqXX2SbGz2b0j2m376PjU6CDKyY8hyLixedJqRRbZx17jU+ LM0/0fMVxxJrpmHyb9fci3xa3hkACro+ArLB/fC/vjpy14t648BtKFgh20xPiQLFNylB mGdtA4YlOXxeKErvbZH2NDF5Pg8X61+t7O6SU63rzJdtWKKTBznULM9jBtdp6s4U5sUX 5ZJ6mZZHBU1W7zqs8BWHk2xSF5QniRjsug1OQI/lWUoGGCYOHNJAFssHG3SAlqtCYeb7 lp5Met0X/hAHZV4qLvtvz65fWwlAaIg48lb/L4OjGIIiILqAnQhfB7Atu62C5EayhM/8 hSLA== 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 o24si1098153lfb.1.2022.02.09.22.43.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 22:43:20 -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 21A6hHmp027943 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Feb 2022 07:43:20 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 7/9] kselftest: Do not use shell environment Date: Thu, 10 Feb 2022 07:43:15 +0100 Message-Id: <20220210064317.3712-8-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220210064317.3712-1-ubely@ilbers.de> References: <20220210064317.3712-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: hDJr0ReBlqvC 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