From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114179385042665472 X-Received: by 2002:a17:906:1018:b0:718:dd3f:f28c with SMTP id 24-20020a170906101800b00718dd3ff28cmr16808294ejm.55.1656398982363; Mon, 27 Jun 2022 23:49:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:3f8e:b0:726:b004:f241 with SMTP id hr14-20020a1709073f8e00b00726b004f241ls2335809ejc.1.gmail; Mon, 27 Jun 2022 23:49:41 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vT+1uolYB3tfV21JdQs16CD9t0p6/lID6oxNKSF9JJ1Le2DSalLPlDJ9Jw7dwLB1XT7omq X-Received: by 2002:a17:907:3f04:b0:6e8:4b0e:438d with SMTP id hq4-20020a1709073f0400b006e84b0e438dmr16612698ejc.391.1656398981512; Mon, 27 Jun 2022 23:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656398981; cv=none; d=google.com; s=arc-20160816; b=ompNgnEAGCp/NLUMbs3Qt8aLAjbYTJaJiRHcR7rvxY5ycbb00eTRwbbPqDjEGWiW6i 923dr+zH1I7ihg0YmPVRjC0Dwp1UNBjYv95OhBI9VaeXJQkyg4vXKQxe6VGW5pE1UemE O8E/tYDRC7kkoCcgRim9yQh2nIzrxZ42jyz2/1NPMH5RTcfcA9nBa0ocs49HwU6E8tOI BK8ZXFpFGUAsOZ1eWWXDq0M3mizVh4M1G7mIFTHBmk9vUqKpGWKvvZXhOJ3nRJLcS7Qg OQMZwOk7j7KOirTm//WaYsTrnrueVmhmZwv0F105A623dHbheavuLofnTOHbeBO7iPM7 1m5A== 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=5G73lOa31bzP4aBydFzUZOrrBKKl2qun+ZXnlvWRzLA=; b=CNIRnHji+lWySPg5Szf6At4Cqvva8Bm/CpqAJPZjl8A60WvmYiYc2rpjiRKCq7Dcsl ueToIDmAWsMwMEr/DiddWkgSCD+6w5xj0lZWuhxOai41Gw5FXHqjgnQyAab0vOvKU5XT uGMnVxdCXvYan1wo7ePQWNhORpuiRH3vPXYV94gW4ZtOEIkfDf1p64BcwqJzyjU1DkjZ Gwj9gu9MZsX0KuedchxPcpU1W6ZXcTbZwQTkDiyQCvI/pF/VzCGtZUCHpaw4IzMyu+qP 6E8BEX8gKEDyqrnZ2UcUNizj5oB3KeRuuwX380WqnC79mVrWMYqw1U4uLo/VkNYdjpdZ rFlg== 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 e24-20020a50fb98000000b00435a7649ad4si645580edq.5.2022.06.27.23.49.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 23:49: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-172-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.172] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25S6nMSK030758 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jun 2022 08:49:40 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH v12 16/21] fix: support build of packages with epoch version Date: Tue, 28 Jun 2022 09:49:08 +0300 Message-Id: <20220628064913.27938-17-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220628064913.27938-1-amikan@ilbers.de> References: <20220628064913.27938-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: 5D2zhLbxQBd+ 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 a0544d5..3dda7d2 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.17.1