From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a2e:a889:: with SMTP id m9mr16676012ljq.422.1643734402405; Tue, 01 Feb 2022 08:53:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1599:: with SMTP id bp25ls906608lfb.0.gmail; Tue, 01 Feb 2022 08:53:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGDmu8v3rPAyGXrccZx/JCzgCQq3YemfbTHrFkHkceeBvhwTcVFYY05vN6Ly3uezmz67x1 X-Received: by 2002:a05:6512:1520:: with SMTP id bq32mr18768970lfb.644.1643734401348; Tue, 01 Feb 2022 08:53:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643734401; cv=none; d=google.com; s=arc-20160816; b=BuQpSvngeOnhkm+GfhJX4URMZAFtuE28IzM0K+1mIuyUXNeApHr+cSZt918FfnSnYc EyNXai0Obg1yyU4hlIBrdpZuhoUd3tGrZ7ymN34yvNFtsGEDdfer2Tj5XYD+qAJu5PkJ EkGw1kb6QDfgbNusBE7rQ24Qd0OOkXwknr8wFaR9N55PlJcKqP8IM/Q4XJKIT5+DsRDr R+/UyaX3iQBQzIQ25agl8HhKpQ3nKZAlNlQwyH2hbFWK31Oa68HxzCixTP9R7tpXJzua fs+6nBcRcBtIaYwMHzPj8KfCX4glRGGjkMsYV6zNLX3EwjjOuNk7r9ZAUk5DDgFPC+mN au3Q== 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=TthcEL9RBlpA8Bth4ZSbbrBtsCtKuJq3Zc+aKVmnxOw8QaghWdZw0XlQB5u/uC9nlJ 2Bp4ajY/qvDSTYN7Z8BdFYTG0/otJ/50caYpfjwuaJmtVHbo/884lGHB2ai/18i5RYnf RgqT5FgKKLXAMVLJoZaVDM6+Osr2FGDLP8SBelsjEqIjnjtX4XLv3y8pv4VSFNY5gTIW j/0qbGgGkHrlOevFZ89oL+nAmgusqRIxzoEVuwbkBx2ryPG3eRrgGSq1jLKlsDMDt9Yz 6s/qrm/3Ub0U95XfJFbKsU6GaHUE7rTle2Zg8PgVSNwH5c+uamHD8+bWu4WuXR7CueF+ XY8Q== 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 i4si482232lfg.6.2022.02.01.08.53.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 08:53:21 -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 211Gr4ql019494 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Feb 2022 17:53:16 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 6/8] kselftest: Do not use shell environment Date: Tue, 1 Feb 2022 17:53:02 +0100 Message-Id: <20220201165304.21976-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220201165304.21976-1-ubely@ilbers.de> References: <20220201165304.21976-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: trmEXo0Id60j 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