From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:6000:11c5:b0:203:dc09:dfe8 with SMTP id i5-20020a05600011c500b00203dc09dfe8mr2293157wrx.499.1647492625272; Wed, 16 Mar 2022 21:50:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:790f:0:b0:389:cf0b:4f92 with SMTP id l15-20020a1c790f000000b00389cf0b4f92ls3890368wme.1.canary-gmail; Wed, 16 Mar 2022 21:50:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwG1ByBRoJ6ui6P6wHe7THPgiqZAzXKPeqsWtp6JBVNMTKuKLN8VMDb7lzEfoo1TslrumqP X-Received: by 2002:a05:600c:1c09:b0:389:cf99:59ac with SMTP id j9-20020a05600c1c0900b00389cf9959acmr9983089wms.66.1647492624441; Wed, 16 Mar 2022 21:50:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647492624; cv=none; d=google.com; s=arc-20160816; b=miSOM80wFRnFgvnfkyrxYm/cOv8li2Td8yOIrSTLArksJBHKaNyEwbWRwvE+yQ8if/ r3WceLaEg5X9aRMnJD2Z71lduXP4by5oUt37tFKRHtSMYUAqlTWSbif4xojxHbQdoDVu XrhqmYSTMAUYaNP4lUsR0/rXjUG8PbHcOxTbAAx8I78mhFQ/7UydkZKzx/mjmzADiDn0 OfLVBQ9S3BS4eLl1Z3M2bGTbgo4v7RnIuOF7LheW0yyyplMtfD/c5ZWVboabmUkPDVUV JyRYbdyj2HvCnVJzAAu9hPyNhLJnyw0G+GIHeC5V2fXIOK4ORr83A/3ZzKktHMeyHG/W yEUw== 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=THxJhCtWKZc/7tHSrZR4teVDw1p3IYiz2K0MhmNtX7VgOuRrQPMlVmiiFXNFFO83lr rHLOHl0pxgg3ukN9Zq98J5ps3Soz4u7iznY4KaYHWBHyJANOk+H0kXyg1bgniJ0F2XXA dn9a0os+DdzYelqT4oR4nfrZ5eJ/eztKrHLYlSsiz6+FAU20GproOByQzZK8TMneAFUQ hgHqZ17cKwtFiycu7tVtvY1VlSHwaR+EARluE7Kh1DcYCVlVLHDgtXqBudxo+3HctQIU ue5Qn95XRnPZJOR/1bj7bUv+m+DP3IhQvk9VRDyMCiapJitNQeh6jQmNSmqhUlW7zadC Rkuw== 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 c3-20020a1c3503000000b0038c6c8b7facsi219352wma.0.2022.03.16.21.50.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 21:50:24 -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 22H4oLHd025716 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Mar 2022 05:50:23 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 06/16] sbuild: Support of DEB_BUILD_PROFILES Date: Thu, 17 Mar 2022 05:50:11 +0100 Message-Id: <20220317045021.4018-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220317045021.4018-1-ubely@ilbers.de> References: <20220317045021.4018-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: NEoi6O24L6zH 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