From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a05:651c:1a06:: with SMTP id by6mr14064878ljb.268.1643114359727; Tue, 25 Jan 2022 04:39:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3c97:: with SMTP id h23ls2017233lfv.2.gmail; Tue, 25 Jan 2022 04:39:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJx56FyT5Ja4Xx2oBlujhNKJCoZs1mamW7bZYs4P3Wy6GXHHozSqZDhm8epBD3D1bP2/hGnH X-Received: by 2002:a05:6512:39d2:: with SMTP id k18mr16532474lfu.508.1643114358719; Tue, 25 Jan 2022 04:39:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643114358; cv=none; d=google.com; s=arc-20160816; b=xRO3D0tbmJkxogwmKR9QlZ9aSDrkT6TipZYp8v1lUUiv8etdVARt9bUSAP1kP09tmU FsFQGLC73QFNI8c9oPTZuhcOuovhub6PCvxiST/GQhiacstDBVdKKCCIyL+Catm4/mz8 HG5TQWNpCvX4pdN3qrMpL0s7l4xy/NxA/wBsjdblilD5E/W3lXIsSH71xV9Bmm1virXo xtp/G97XTvrYWZhewPOOPGEaM/V3DOOK8MGnsSAaLpjc+aM8YOrTp3UVaaU7um8hWje3 2tm1z1/7nXDjDuMmpPiVVWEVV4SeL3cXz1B2motIx67o+jU9nK4sdYTuI6GEQvMBk2N0 jD6g== 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=SqeyZwlA5qVP+vVj4eAeOslUk0SQdIGvmjRad0HSUR4=; b=UBkxpUmsKxz5z/6IdSFoB/Lj9hw6pSaW6QUX05Av+5+sQZTxB4u2Hi9XcfY1dAEzgj 1QDBS/Rj5flQGyz8ZIAp2o2o0v/AT86RrEnYEiGvHC7FK3f5VK8v7QuxkijLFXDmV3KM dKI+Mh6CLoEOZ4pJ6u+98vR1sBNqPFjl65sTxxzhYcLLmqoEORkkBLqQHLkmkLNG0PVi ZzWFigCRLUpXDbXUoo+EyirL9BEL5tmh6H9JrkJ0W7zbWFgiaM/zYjwZQ8gt7VV3Y5IH nedGl5o6ZNAmAD+N4D8Xn+sqoFOMdEGNnw4QOVAJ3nOO0McHW+viFR4Jh2//JOKWATzI dWCQ== 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 a6si748965lff.13.2022.01.25.04.39.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:39:18 -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 20PCdFmg019254 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jan 2022 13:39:17 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 06/12] sbuild: support of DEB_BUILD_PROFILES Date: Tue, 25 Jan 2022 13:39:09 +0100 Message-Id: <20220125123915.1053-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220125123915.1053-1-ubely@ilbers.de> References: <20220125123915.1053-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: Xp+02T/43Y2R 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 66539f48..8647d077 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -38,8 +38,16 @@ dpkg_runbuild() { schroot_create_configs + 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 + 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