From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a05:6512:c0c:: with SMTP id z12mr46878154lfu.591.1638968749102; Wed, 08 Dec 2021 05:05:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3e10:: with SMTP id i16ls1231567lfv.3.gmail; Wed, 08 Dec 2021 05:05:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrHhmIdKJ9CfYh0wRYMmwroqpzuDqGSQWsdaXQnh06WEFLNWkYEmapPBtJkNh9tSQsrCDI X-Received: by 2002:a05:6512:3185:: with SMTP id i5mr13461163lfe.341.1638968748031; Wed, 08 Dec 2021 05:05:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968748; cv=none; d=google.com; s=arc-20160816; b=bgjCtWoS6gncdNmG8jXECNjLZWWgXBpODiKSPKg5OkgQcKiRHj5xubdtPN6byjrls7 wY+mOM7Argw1uDRmFB0oBWK9D4shhoJP4bwFThhbvB8Q8gi98X5y4VQM4anlYGTKyMuC zYOWN/TGGqM+bOnhwWxEEidyr8F0yRRpIiUbzuGoLGLwXX7Uf2l1OUjeFP0o+0wOcJO0 mflI3ZEstWZsz4xS/uU0nNqTJYrZKAUlSlSx70+Uerrt/ayWRmg6rqCRdUr51wGxAdb6 1mqf0wM8/6F5dplVSMc7Edo7+Nv47LLL5+bsY6RyNrPPSEeCw7zjRgP11d5SVrcsvUnk Rang== 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=yNBHe/FHg0TO0+v4SCrqrtopFeDx4cj9jjJtorf6qjrqX/gFjzU9QoNWq8jyOF31oK ymEGjSIln4J38/WwjoGYxf8Q0FV03xixcyEUjV1vbVzuGeS3ukSBcGK8eOsCFQCxRPVn Wb2EUhuZ+CXnipVm/yLvhhjoQX0V9APp4Y0JkoU9xO8Fm35LzFEP1Q2PbDgzXWpP1sPx LI+lp2X/SGztqOzR+bAhB3UumIK7ULzb64TYj8wgONMQmLu3TvvQZ1chXJ+sPhxap/B7 mwic2kURrr61djUFF+K/ies/mrhSgwhTaTwBOs2MG5uHsPxgToAXOIQM/86JUF/Kwn7+ r+XA== 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 y7si198963ljp.7.2021.12.08.05.05.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:47 -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 1B8D5iL8009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:47 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 07/20] kselftest: Do not use shell environment Date: Wed, 8 Dec 2021 14:05:31 +0100 Message-Id: <20211208130544.15133-8-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208130544.15133-1-ubely@ilbers.de> References: <20211208130544.15133-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: 1T1PzTKCa7D0 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