From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a05:6512:110c:: with SMTP id l12mr6761876lfg.120.1644738304130; Sat, 12 Feb 2022 23:45:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3ba6:: with SMTP id g38ls1297449lfv.3.gmail; Sat, 12 Feb 2022 23:45:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJxmdUJ1MBywXjB2V3k9cXlwCVeL0PUgqTavwLL4KZK/BcHu6CTMggwLycdtIYbmSEtwetev X-Received: by 2002:a05:6512:3c94:: with SMTP id h20mr6592830lfv.480.1644738303092; Sat, 12 Feb 2022 23:45:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644738303; cv=none; d=google.com; s=arc-20160816; b=lS/oxQSXKafNkRP1rpJ6pJ5kGyzEyd1nyptF6WPNzVufhw3YBdNOz6Nyz3dZB9ksve wwpbycjxmSzxfoLA4Ty8hI7FhYNcB25F4ILNOLR5h0U++pnax5S1n46YpbXK2t+yisMi nVKP+mhaD6qXPwmrnddUpAC35zz8RFLn35bs4FsJZFg7X3nqWC74mLuYGuMOHL2ZCpSC IN5RAYklMMV8e+yzwWdgNYvBbnIUV3ptDu9ffgqW83h3az9VvaKJYw8i/D1DypGD85YU yFMpSD228HVNLRtNkEf9UYMmQwlAtkrjgmIyQOmEMuA8WtpIfb7DdS/uiLJ89p5Aaj/L RGnA== 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=tjS6qgWqy4h6z6gyh2XhLYf++eLyhWnRMwfL9wMNkrs=; b=ODdIPi6AisS2CsQ6ZhxlIl/9zQtZpYptdF6kpRnetzop9t4bYn+B618j2dW6KY1NoU W5ujWG0BIrGsN1mZfvXWaykIvnRQOd3yLij17TaWW4uO8ARYuDG7YJ3Oc5tLmbRxdagM pvZVyQLo7WR12mjyxJgf7WtJ1mWzum/evCE/XRAazsNmvlDZA9XzzZsTo2CVXn3ZqRmI azyDwBvdbPTjojuLg2VHGY5iELlo5Dhk2My+LQBs3osr5eJhUqfA30J5uebaK7uilVgk DMaZnHMh7rsfBx0UI7AQTLnmB19c+8gcSeTGDBQxnaqy9AaKd7jcnGFqMBkwgyZO4vr8 BkyQ== 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 w7si1266604lfr.2.2022.02.12.23.45.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 12 Feb 2022 23:45:03 -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 21D7j0BY010453 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 13 Feb 2022 08:45:02 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v7 06/13] sbuild: support of DEB_BUILD_PROFILES Date: Sun, 13 Feb 2022 08:44:52 +0100 Message-Id: <20220213074459.24200-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220213074459.24200-1-ubely@ilbers.de> References: <20220213074459.24200-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: q5jj58GyT68h 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 848ffad1..5511de64 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -40,10 +40,18 @@ dpkg_runbuild() { export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(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