From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a05:651c:179e:: with SMTP id bn30mr5501877ljb.167.1644738306379; Sat, 12 Feb 2022 23:45:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1a26:: with SMTP id by38ls2074022ljb.5.gmail; Sat, 12 Feb 2022 23:45:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwm6K/bbBLu7uax8WPZvnGxT4M/IgUdLbEGFBcIrDzVbwMtNJMQ6u4nVmkIvCeBLhfmlsmO X-Received: by 2002:a2e:a546:: with SMTP id e6mr5720008ljn.368.1644738305470; Sat, 12 Feb 2022 23:45:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644738305; cv=none; d=google.com; s=arc-20160816; b=UipitjqTOB+w27Xn3D7z5Q5IoNaWP3j6Y7lfjoxOtz+8JVEyhUr8cBCTiSZbqsgDP1 nev3VnTbyebXwHXFDk2YKNBfp2jN9JSCtDQjjMtP233J+6Ej/mUQfrjMoJyFMiUO9pD0 8HAIv+LNGqWc7Rybp8hE8x18+7oyZum2TfSIzBKCsDX+orOqNvS1OPWZ9v/k8r1L2OiP 2j2Xr8tbz3Ss9uMUWJBzlLz/DkSSP0OMJ6UqiuDZ74lMTvK8obmBm5Xi9J/fRFYvXeLF Nl5iPvJIaSEaLv1hTRaDmLO6Fo1wcvpCmZTdHw2hehDc2uNG9NN2eIT7kcdwN+E9h4jq 3j+Q== 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=zfa2cEGepqsGlCriajbHdbEcjIuVaS1Zd2PYkhjO0ng=; b=Fxqd5Y+XKrVbU2lxMGxEKxqY4A8zaOn42mDSOzRxY7bq8l3rg/XyVkwh7wqEHn+3fp QNNqYDmH2hDCxVEjJFRJ/RhTXnjir6sRWxF0TQIgR4WSCqR2uscUdkCiITgh8v05FMJa U4Kim9tz0R/2EGpwKDAME8PcYQUzESqlD5TsUno7rtg7awkJpxeYe43RvJxH/6GURLpi 0A1FqM+EfHgqsiFcT326fFIZ/FAIroDJWiAkJQZYygh0s0duSehyruE9GGwu9KN0t4b+ lVWkLxP0pQWQdEP8wERZKuc3bzb+cQtnR68HxRH5v998CKtNmTdITklNUcGmT+CF2JHK gxvQ== 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 b8si609225ljf.3.2022.02.12.23.45.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 12 Feb 2022 23:45:05 -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 21D7j0Bf010453 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 13 Feb 2022 08:45:04 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v7 13/13] sbuild: Use .dsc file instead of source directory. Date: Sun, 13 Feb 2022 08:44:59 +0100 Message-Id: <20220213074459.24200-14-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: oMtgo+lZW04R 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 3cd40ba8..19bd582d 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -69,6 +69,10 @@ dpkg_runbuild() { export SBUILD_CONFIG="${SBUILD_CONFIG}" + # Create a .dsc file from source directory to use it with sbuild + dpkg-source -q -b ${WORKDIR}/${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 \ @@ -76,7 +80,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