From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a5d:59a3:0:b0:203:d9fa:6968 with SMTP id p3-20020a5d59a3000000b00203d9fa6968mr3553492wrr.585.1647415581128; Wed, 16 Mar 2022 00:26:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6d8d:0:b0:203:dadb:4a0c with SMTP id l13-20020a5d6d8d000000b00203dadb4a0cls931506wrs.1.gmail; Wed, 16 Mar 2022 00:26:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1nUlbZ1r1OK/CTDlx1j+H5pCfQA6tMxGHOKRcqrk4y5650w1enRWD1XPg2A6hLUpPOmxl X-Received: by 2002:adf:8bd4:0:b0:1ed:c1f8:3473 with SMTP id w20-20020adf8bd4000000b001edc1f83473mr24223685wra.435.1647415580208; Wed, 16 Mar 2022 00:26:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647415580; cv=none; d=google.com; s=arc-20160816; b=ZK3Tupk3ybTBW6U37SS60z0Ysq8BRm04n5tf4s/aE3nF5OBBsbTBOY2u1Co5y51imb 6ZnhUCgRAQPAoayOy0+YW8kqed/PkL3JsLhZpJWTIJ6hPNz3P6vyhiDhDZJbxwd8J6IT RqwPud58Wy3yq/IplZGFlvTKyGUs3X6BaYi4OMMM+/Fuk9f2VXRb1G4bXAq8719CQnWx xqBnPf9HblDvFkQUNwLaWb0JpizX0jxkLRy44HmO7bHTo2dJnix+aDYfkyZBoSnzERzw 29FFuUKS5fqi5oauoZ9PzKB82mOLxC3dPfV8FCEHuFsvwaQKM+ryFQLgheTOHzxuBv96 YKOQ== 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=vWmf7C3g/MhKorqoyI5xbk3+O7+rB1C7znEgGFANM2MrNrrG1huL3NaqYErzkPk+VW gXLhra3GhdO9sH+FB5fK1/fIIa/abKG87zkyynPHwICimtF/WhTeAkZCdYpCQTtiiL3z ovX5RVMRi69H/2RTWLNe/Tlq5MhueC+1SKWCDj0tnI65faJ/IKJrb7RElLjlZQXyBtzP gRMvDIi1mdkN+44A4WIqSfApGVJwy3FJ8VuYC4PsNNpJm+B/V3dpbO4qSNcoufX2EI4r tnbwCd3leFyAT7Ac/TpBYxKgIymq6BI3XGDrsn1ZHzcHV34rNCWdwSll2pgGAiu1Vwy7 0pdw== 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 l3-20020a7bcf03000000b00389c3dbea83si282180wmg.2.2022.03.16.00.26.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 00:26:20 -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 22G7Q7dr021517 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Mar 2022 08:26:19 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 13/15] sbuild: Use .dsc file instead of source directory. Date: Wed, 16 Mar 2022 08:26:05 +0100 Message-Id: <20220316072607.20518-14-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220316072607.20518-1-ubely@ilbers.de> References: <20220316072607.20518-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: JSvI+ygfSpPR 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