From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:6512:36d0:b0:442:4cb2:df5 with SMTP id e16-20020a05651236d000b004424cb20df5mr1737237lfs.648.1647492627926; Wed, 16 Mar 2022 21:50:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls2950144lfb.1.gmail; Wed, 16 Mar 2022 21:50:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+snz4VQwmIO3dr1KdBvR2DjSxFz9ie6/CeTNKE91YroEmFNymiG2bm+o41m1sGrBwbkmR X-Received: by 2002:a05:6512:13a7:b0:447:3dac:7a03 with SMTP id p39-20020a05651213a700b004473dac7a03mr1849364lfa.362.1647492626879; Wed, 16 Mar 2022 21:50:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647492626; cv=none; d=google.com; s=arc-20160816; b=fU2LNgeCMGQZg69UjXgViwbQv4bvWTarTWLQfuo98OPnMl+bwvUz8xpVC7KkfITsr3 x5VG71h7Elv2DnRiusRZWzvTCU3q4XXQ1NsB67+VMpQpDQfKcD8VWs9+uZvoTvMPeCLB 4FC+ndBpynDx28URl1LHugSFbZ827E9a/sooGAC0d1sg6vJN/HG9WMDRuDrdc4p0F7Va +TWyZucwYrFyBh/mHS5vabXHokvE3n6xvbRc782BW3Kq6DJyUAwYom51qRVdJH1W7FYm PKn+hYOROQtoDoTgVums80ZO/v9n2uxZQKeusjV4mOUl7F9lMPCOlLOebOTYLepiMeU2 KWtQ== 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=8ml5HZeRa+zw0TR56+KUshIqiodO3necX1beHsLWRYM=; b=Dclo93e5mCgadaNwrwV2owNCQ0qVdue0XJoeCmF0PDcFOcp+pc1K8okYqB4J6VxCX8 luYQG6NhvWdEYnMYDifweCU0m7Y2GaIAP2aW+9KONBqjOgwKijUoHSqjMUdfX86+OMVi /JqYpKFjym5ONkdaRO5WCI1gj805B2YgolbHngQaTUcTpOtqA061LlOllLnzeYp0UxZ9 ACehnBrcwdMIlpSIdqh4xxpnNIl6toQjK3xlKjTHzVPRqxQXBUX+CaPUmGq7RtPN0DKj iHj14iCn/JYrr4QcKmHEZnFqnmjUgLCZWwlZdN/y54e5mIbaLVi5vlkms4Pr6U0lo2m0 uBUQ== 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 bu30-20020a056512169e00b0044842a98a98si220712lfb.2.2022.03.16.21.50.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 21:50:26 -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 22H4oLHk025716 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Mar 2022 05:50:26 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 13/16] sbuild: Use .dsc file instead of source directory. Date: Thu, 17 Mar 2022 05:50:18 +0100 Message-Id: <20220317045021.4018-14-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: xCXTI6PfAsED This makes build more Debian-like and avoids additional execution of "dh clean" by sbuild before dependencies resolved and build started. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 2392d894..da3b3ede 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -61,6 +61,10 @@ dpkg_runbuild() { echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG} + # Create a .dsc file from source directory to use it with sbuild + sh -c "cd ${WORKDIR}; dpkg-source -q -b ${PPS}" + DSC=$(head -n1 ${WORKDIR}/${PPS}/debian/changelog | awk '{gsub(/[()]/,""); printf "%s_%s.dsc", $1, $2}') + sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles} \ --no-run-lintian --no-run-piuparts --no-run-autopkgtest \ @@ -68,7 +72,7 @@ dpkg_runbuild() { --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ --finished-build-commands="cp -n --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/ || :" \ --debbuildopts="--source-option=-I" \ - --build-dir=${WORKDIR} ${WORKDIR}/${PPS} + --build-dir=${WORKDIR} --dist="isar" ${WORKDIR}/${DSC} deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}" } -- 2.20.1