From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a2e:950:: with SMTP id 77mr12031165ljj.438.1627307220386; Mon, 26 Jul 2021 06:47:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:160f:: with SMTP id f15ls2698142ljq.3.gmail; Mon, 26 Jul 2021 06:46:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqOo4IJFQCMbqShQNKuVc/7WRq4QIAx1U7/eMM9sUH8F4xxZxjDT6rLVRWBenJNnU804mT X-Received: by 2002:a2e:954b:: with SMTP id t11mr12208470ljh.105.1627307219336; Mon, 26 Jul 2021 06:46:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307219; cv=none; d=google.com; s=arc-20160816; b=epTzBY7+DCDIQ2+eBla/xw1XlKr/qNb6Ulc+1/j7hp2TL32KWPLy0mR6mP+CCNSi6Z 01KsM6lQPz9kMTN/w7BTNhM3eSASCycYKeiU336nLMEr/UHS4QCpmiSYFiuWBBIBmEhF 2JAodbfp3xKrKdN/mesfQ3X/5gKqlriKJgQvEB8UHvwBirhVS60LDcJCIxmPxI6r7YAn k8g8N78KVt5L8gAJguJ7y6VNvuATGPekfoGg6MdhS22gwdMCC6zxSfnAQrIj1vDv4U5K Uruygj6NBbp3lRvVNRHUH/45oRn9mdxPC4ghLTZivrikEtp140wO49aTy4VXQ1fZq9Q3 isdQ== 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:cc:to:from; bh=R4WYvl5aGzqgwjED0foXjhxcg7iW8RwPcxLS18JZR6w=; b=zZfs1E3QIs3z/2d9SfVa7MVSljMlcUWaEoB+TtHMdURbkoGCVNIMUioi0St2k7WWmP xs0ADICDsVba+RUG7KhiLk/WHxCh/03w7dyhDTBd6gwAmmqD0l+TJsyG30vSruj/nzUs Gta2J6iCQ/odWaeT/zmGZaXsV8ZqCRfHB9zWiflLrBMouL6qDwrUfYOnHIWgapQQnxXs Xqsf41AyZc+DpaQbAipR1YpoL8PfGdRTtFz9lRbpYKYrLWvkoMtvifRsQpuqwtCJTZoK JjmBA29FEqD7ogdiOCOsdmXuH+hVS1bK0lGogIYkWc8ujucDx60zi2L0ZVM/CsCYs7sd KJeA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id h20si1298544lfv.7.2021.07.26.06.46.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 06:46:59 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-198-62-214-37.mgts.dynamic.pppoe.byfly.by [37.214.62.198] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16QDknv0019679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jul 2021 15:46:58 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 08/15] kselftest: Do not use shell environment Date: Mon, 26 Jul 2021 16:46:29 +0300 Message-Id: <20210726134636.30800-9-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726134636.30800-1-amikan@ilbers.de> References: <20210726134636.30800-1-amikan@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: quGATPrdtR0t 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 2a76028..6187d8e 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.25.1