From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:651c:241:b0:246:30de:ae6 with SMTP id x1-20020a05651c024100b0024630de0ae6mr19329288ljn.187.1647415579253; Wed, 16 Mar 2022 00:26:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:80d5:0:b0:247:df0a:13df with SMTP id r21-20020a2e80d5000000b00247df0a13dfls204924ljg.9.gmail; Wed, 16 Mar 2022 00:26:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySSEKyUNJFSovH44u1jtOG4lkdApmjUNzZPFKRl1eZe5j9FVBrL9FoysoXkGzGp6Bv2dnq X-Received: by 2002:a2e:a80a:0:b0:247:f1a9:c9f7 with SMTP id l10-20020a2ea80a000000b00247f1a9c9f7mr18116694ljq.85.1647415578175; Wed, 16 Mar 2022 00:26:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647415578; cv=none; d=google.com; s=arc-20160816; b=JEpjndxEwnLjO4LzPjgXSs7GQZbb3AbjUH9CcwGkY7FJdAerjp2DU6X5NCUHEEqfrJ mSIhVU1+Weh+7/G9SOqoHYi36VpjzrM3rPTh1Bun+bBTdTDPUb/1aObSlENwAMpxzXVW eEcOlwHpn4nML/pyMJc1o9YOkafsu/AKAnjXpsiPEQ08G0LhsT2DT4R8KRsDVNTk3Lr2 yIpykopi6RATSiZB+rjcbY5HAGPEsa9I+tW6Q9+CncJngsPT0PZ1LuR4YrQzrsaPUvjL IO9BLnxwgMTX4d9xCmAxqiAMLkJqBngdU7RaopPGma0WgCXp3icX77QazqDLYOV43p/C M/4g== 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=/YhfnS09maRAahFS7t7/mxnwisrcjkLgONr+KhTfKY8=; b=tchpDGIp8yzII9TZhISXaLMQn+C3YLE0f6uqwa+cx2PJ7deMyunWABkQdlp5m29Dtb iX0CbaIqUNRBW/X4PYXCousxmSr4JzQVc0DLxTA1m8XC/HqDr7rAHCIQIYCRACG+w7o6 cpUO+ISd4QAm9tVTZPHIQcc+5+jcDgAjwhD+qO/tbJn4nmpawvJ97VfrH1pEJCex4XZ3 6yrcbvt6qtHhYDYdlQ0VNo7FhxT/eJtSredO4aKUQJvKSWbuAn1iP7khQ8EC3LZJJHsb WY//sv1iNfkIu3WNCN6ku7RZUrjPTAfpPrvbLo2kOHhrfsLg+D2K2jtq0cp5LQ0U6GnX NyyA== 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 br37-20020a056512402500b00448b7726e65si73624lfb.5.2022.03.16.00.26.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 00:26:18 -0700 (PDT) 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 22G7Q7dk021517 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Mar 2022 08:26:17 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 06/15] sbuild: Support of DEB_BUILD_PROFILES Date: Wed, 16 Mar 2022 08:25:58 +0100 Message-Id: <20220316072607.20518-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220316072607.20518-1-ubely@ilbers.de> References: <20220316072607.20518-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: H3HcDULvVGIO In Isar packages may use their own profiles. For example, linux-custom.inc introduces 'nolibcdev' profile that should be passed to dpkg-buildpackage in both cross and native builds. By default, sbuild for cross-building uses passes "cross,nocheck" options to dpkg-buildpackage and ignores DEB_BUILD_PROFILES environment variable. This change makes sbuild use custom profiles even in cross-build mode. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 848ffad1..1f795c75 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -37,13 +37,17 @@ dpkg_runbuild() { E="${@ isar_export_proxies(d)}" E="${@ isar_export_ccache(d)}" export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}" - export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(d)}" export PARALLEL_MAKE="${PARALLEL_MAKE}" + profiles="${@ isar_deb_build_profiles(d)}" + if [ ! -z "$profiles" ]; then + profiles=$(echo --profiles="$profiles" | sed -e 's/ \+/,/g') + fi + export SBUILD_CONFIG="${SBUILD_CONFIG}" sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ - --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} \ + --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles} \ --no-run-lintian --no-run-piuparts --no-run-autopkgtest \ --debbuildopts="--source-option=-I" \ --build-dir=${WORKDIR} ${WORKDIR}/${PPS} -- 2.20.1