From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a17:90b:38cc:b0:1e0:1c6f:d3e3 with SMTP id nn12-20020a17090b38cc00b001e01c6fd3e3mr12885306pjb.86.1653316602047; Mon, 23 May 2022 07:36:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:254:b0:1e0:410d:b0ec with SMTP id fz20-20020a17090b025400b001e0410db0ecls2803151pjb.0.canary-gmail; Mon, 23 May 2022 07:36:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw97iADVHITfGjxf38xdwrN3LBlVkpjwkkz+HM8mOaUDSZsx9UGe+ed9r0PdTnUGEwT7EGe X-Received: by 2002:a17:902:a981:b0:156:52b2:40d6 with SMTP id bh1-20020a170902a98100b0015652b240d6mr23058748plb.34.1653316601264; Mon, 23 May 2022 07:36:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316601; cv=none; d=google.com; s=arc-20160816; b=mbhHt7wP6cMLRYJb1JZNld3W/w6QWE7v7sIhwstfACvytrTxanusJJxYrtScSfiiDc 8dWAcMfNwUuGcL+wz3pjv6vvUjeag7ZlYga2DdrtLL62G7G0Z3WQORDsCyWSpWUWC1tL UX1ZZMCqrOboCYkKlHp4rhN0tlP1C/IA35pAB+V/A5PymEHUnT413r4ilvX19TwlEM3g gluUkDdLX7elTLARXWWVTKIppFYBxAk5NC+i8M8G4zvzyx34yaYvFLqxtWByO15Ti5uP c4cLhFp8eRy6VXqx+PTqxlyQi0wsQ8a8OtHr0tn/21tjX/GAnlTmNe1DNWl2N1z5nCvN REFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=mzN06Xl5ouXVrpIO7tnutvcwNt4ghv6H8RfwalCDPiY=; b=k3q968EPMLRtT8uooVjQA9ynF6UbolNuE1aHwQOFhcYYOef6+tlvxNEEH5AlVgMOoZ J0F1JuTDjZwC/EnDVBXXC/0VrVF6a2IktlT0w7poSDCo7U+SjP0myZgAZ1/uofVSvKfT lnPPjbtIMhnDeZRWDjp4kDLqgbNEkST5UB2dWlBHl7Y4IEpBRfUKhZOlXGgCjnSkZ8wH 5lZHjUTSN3vt+WGcAt0EWKJ09npyCrD4QNqavgLsaJ69g6uJxUjv7AqUk6/WmZEz9gnC SZtTV6TrnosmIqHh4rx/+T8Qh40nODZqcb2c/ftLo0xGkbL9F2r47M//WIeIP/Y5pzkU EgiQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o17-20020a170903301100b00156542d2adasi337705pla.12.2022.05.23.07.36.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 May 2022 07:36:41 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-40-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.40] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24NEaO3Z024879 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 May 2022 16:36:39 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [PATCH v11 13/21] sbuild: Use .dsc file instead of source directory Date: Mon, 23 May 2022 17:36:09 +0300 Message-Id: <20220523143617.24759-14-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220523143617.24759-1-amikan@ilbers.de> References: <20220523143617.24759-1-amikan@ilbers.de> 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: 0f4pwEcOpMWl From: Uladzimir Bely 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 d92135c..564e654 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.17.1