From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a5d:5450:: with SMTP id w16mr22417953wrv.44.1643734866255; Tue, 01 Feb 2022 09:01:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f792:: with SMTP id q18ls223432wrp.1.gmail; Tue, 01 Feb 2022 09:01:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3BsA7i70jIKeizc/XcxO8MQt4ysG0/9Ur6ltjrxszdLYwP6eop9KVUDr7FZAprmQfXx0W X-Received: by 2002:a5d:5052:: with SMTP id h18mr23582993wrt.350.1643734865201; Tue, 01 Feb 2022 09:01:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643734865; cv=none; d=google.com; s=arc-20160816; b=uyKgmq0kXUMmXOMM1ganmQbCzEEHUKrJHWwbeJqTiD+NKpwh2zwBOkIw6nz4gvv/cp a+IHe9oFzI5rDzRyDjuc8lov9btyJ/DHhGyMYnnGkSDVbr4rF5zRCndxoFWKKSQw6+JX 8pJ7jhTVZzUgxtA4HJAPC2LtEgjOjekuecbqcVZek2DxTLQqln8iIGm44g6cJKZ5xHAH FfjcN+DmkLw3bQ+c8fKtunXTEh2H7rU+naYWj14ov/hZRGgiFh4Jqkh/AiYB6ax9tlnQ Gf2C+VxNj8YL/6H56abxBaNdim/Of73jbbxD4BWSLp7irjQNJ2Tdyn+BPfnavwxM9gSZ mWvA== 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=HjB39zVxhN3F7zEENaic/erOoQ7Jbj6OPxce0hfFIcU=; b=G0dfVyCqNwDga36RDnIWzYWd3FbkIRQbfvT7UCnNp6KIHq/vkJfhLCTyV3YYpemT4E suk4N9EtadxWbQpzO4WoFGjxPactY7qEiXqHKPIOlKFCF6mKN5s6l/ZVhlG3HZ7uLJcP RdSrNHBksrjGit5jAlWrFevZI0vMWbO/iRuSeN5pa/DpmVL2Cm7zFHJECnrzQwKkCuEu 3vk6LocU6augiQCm7mQWYeFc4Bsk553Mms/nGfAwZnpilRLLtRDqT7kPpH3P+ze7T5X6 3/SyMyXQSYX4SITTjy15IxfmcUyxZ3K0KxLkK92xkHfuVPhD4You/Fn+dKIwoVXVYktm R0hA== 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 v5si137068wme.4.2022.02.01.09.01.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 09:01:05 -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 211H0cAA019722 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Feb 2022 18:01:04 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 06/12] sbuild: support of DEB_BUILD_PROFILES Date: Tue, 1 Feb 2022 18:00:32 +0100 Message-Id: <20220201170038.5723-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220201170038.5723-1-ubely@ilbers.de> References: <20220201170038.5723-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: g1s+KXo0Obb+ 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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index d7afea18..66db7ec5 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -35,10 +35,18 @@ dpkg_runbuild() { E="${@ isar_export_ccache(d)}" export PARALLEL_MAKE="${PARALLEL_MAKE}" + profiles=$(grep "DEB_BUILD_PROFILES" ${SBUILD_CONFIG} | tail -n1 | cut -d "'" -f 4) + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + profiles="${profiles} cross nocheck" + fi + 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