From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:651c:887:b0:247:f630:d069 with SMTP id d7-20020a05651c088700b00247f630d069mr16966962ljq.514.1651761601395; Thu, 05 May 2022 07:40:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4c49:0:b0:472:627f:9c3c with SMTP id o9-20020ac24c49000000b00472627f9c3cls1215088lfk.3.gmail; Thu, 05 May 2022 07:40:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtOxZ3Xm13Ty1zdMRyO22qrlaZPe4Kt6gAkhCvGMIXCqBq+iuLeUNfziB3b1FSBeHdh2nX X-Received: by 2002:a05:6512:3987:b0:472:5e91:ad1 with SMTP id j7-20020a056512398700b004725e910ad1mr15449525lfu.458.1651761600378; Thu, 05 May 2022 07:40:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651761600; cv=none; d=google.com; s=arc-20160816; b=0iuZfJfOutW3YP3sC5F2WIzZC/06a90927siJDqlp+2bzXlm03Nrw1DEZxC4rPZaUO bK3jTDNyZiW224PnbOuqizG5u9IalC3PnAqSMQZagFRENTNmCmOVE4DrBduRt+GIfiCJ UbFxt6laydfReCTRS7GUD9ROaWjwqWlIWw0bZoEBIpyhmGmPq2P6mhkPatYmTfXCC9FR NeiBy6d2nKcakLGNv6X6gC5oRD1VhuqBUXVFyRzH5AgwhUyE6GfF+/PVn/yvvxncULlE Sj7r0kfE8OczfX7Adh94YS9/aPTvKuVYQCwN3VAcXf2wVVcxp9+7/WMDbMW3PvyVmKU2 C1LA== 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=UWKYxPUGFf1TvPb1zhJVwhF4bHl+8f/PgR33nWtreABHAlZpVV2ICc0oQS50Wgf1X8 7jlifPt7NtMl5iDLYOz/AqHbiMZWpkG/YutCReTUbbCMO976lF1brlgl2NHTomxCTqST 7sKeqyVQhnr7wGwk/WM5an0b17u1aZeXiFGSyocNgswKMsPkyggYO3oPXRAqiIteXEDP BXUObNRF+/o2a+9vRunUKPQnmbnpxEESi8N+0K407gvG2fdCiza29q9PlIp6HNQB2CLq sNmQMwEmFLTp4pRf6iMaLWpYke89FN+31IcINHqps6N4Dh/tKB/qqrlW14EceKQKchRp wH2g== 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 s1-20020a056512214100b00471902f5be2si95964lfr.3.2022.05.05.07.40.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 07:40:00 -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-0-74-214-37.mgts.dynamic.pppoe.byfly.by [37.214.74.0] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 245Edf7i014026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 May 2022 16:39:59 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH v10 16/19] fix: support build of packages with epoch version Date: Thu, 5 May 2022 17:39:31 +0300 Message-Id: <20220505143934.16096-17-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505143934.16096-1-amikan@ilbers.de> References: <20220505143934.16096-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: 3hjtDXmEdScA 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