From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a50:cc89:0:b0:400:8f82:99e8 with SMTP id q9-20020a50cc89000000b004008f8299e8mr2531173edi.7.1647492628516; Wed, 16 Mar 2022 21:50:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d302:0:b0:40b:657:ac46 with SMTP id p2-20020aa7d302000000b0040b0657ac46ls455112edq.3.gmail; Wed, 16 Mar 2022 21:50:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjUna0Y632NnWe3qGtD6lURkag2YB7yMn80X9kBoNKTVNIxGfzckfEPgEt9Wr7+5otDjwL X-Received: by 2002:a50:dacb:0:b0:416:ac0f:cee2 with SMTP id s11-20020a50dacb000000b00416ac0fcee2mr2455882edj.199.1647492627559; Wed, 16 Mar 2022 21:50:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647492627; cv=none; d=google.com; s=arc-20160816; b=NW5cCl2Rp4O8a3eiHBXEKG4osVbut3ttuIKhUbHisvlBiUdwG7AKcWSJbpZC6LNjMH 2dfRYqOXo1WxeJkX64NtstK6VUqxHuKDT76mKoVjevFfiX0227LKWCEDfCCcEHEekO2W tqyjfkmDnr4Y6CPTSgkgZ5QAKeu9OYQQCrpPZLK0HCBvnCctI0ww575JHRfCNENzNL0j EEqdJT2XV6bYHRYgO7dpp/d2cClEqwWSOWQPGJRyK9V41qkQ6S5PWWuFTgObAS528+EX 75B3OAOyg2dHgOxJRELOpfajlZRXYFacbI5X1KjKRnnvfTcL+o+ePgT9zRljhoLuFXNf Gmfg== 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=3f7gEfbLEM4MNnXH+ssGHvvF/u42TxhLMhKmrDnTjoQ=; b=gb+iEjUBgKQzOZulB7+a+W0tDr1ALZmDIw9rjCmS1gFX7JpvFv0kS/EEt/zZ2p1i9j kHMW+RP48PEZ7oJtjmcH6MdWDGLMVrFZ2QtLZp+N9NEa82lqYlv+JfRVDHyhiBac8qA0 lbN5Q+j5Gn5cvILngZE8b3LAXDAgDXkI70DG1QcURvOweA4/I2qgmwyxj50e4BO+2UX6 rZvUUWGukbXgyPjv1b4fIdaiCkVcVa5sbcZkSl2oFC/Gg9Wln0Mdt6VslWQj5sU+/ZNU RdWDaPKxkvnvqWn8iw5oAXtcm3e0tBLrpcEoExuVwLQPEXUgt+CzBUYO41flz9oTmIH/ pwvQ== 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 s11-20020a056402520b00b004162c540122si183971edd.4.2022.03.16.21.50.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 21:50:27 -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 22H4oLHn025716 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Mar 2022 05:50:27 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 16/16] fix: support build of packages with epoch version Date: Thu, 17 Mar 2022 05:50:21 +0100 Message-Id: <20220317045021.4018-17-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: 9+rJz7AyM1a7 From: Felix Moessbauer This patch reworks the logic how the DSC file for building with sbuild is located. By that, we do not rely on implementation details of dpkg-source regarding the name of the generated .dsc file. Instead, we remove all *.dsc files in advance, let dpkg-source generate the file and use a find to locate the generated one. By that, package versions with epochs (e.g. "1:1.0.0") are supported. Signed-off-by: Felix Moessbauer --- meta/classes/dpkg.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 9b9de236..e4d9519f 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -77,8 +77,10 @@ dpkg_runbuild() { echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG} # Create a .dsc file from source directory to use it with sbuild + DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog) + find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -delete sh -c "cd ${WORKDIR}; dpkg-source -q -b ${PPS}" - DSC=$(head -n1 ${WORKDIR}/${PPS}/debian/changelog | awk '{gsub(/[()]/,""); printf "%s_%s.dsc", $1, $2}') + DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -print) sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles} \ @@ -89,7 +91,7 @@ dpkg_runbuild() { --finished-build-commands="cp -n --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/ || :" \ --finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \ --debbuildopts="--source-option=-I" \ - --build-dir=${WORKDIR} --dist="isar" ${WORKDIR}/${DSC} + --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE} sbuild_dpkg_log_export "${WORKDIR}/rootfs/dpkg_partial.log" deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}" -- 2.20.1