From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:6870:e248:b0:f1:eb1f:945b with SMTP id d8-20020a056870e24800b000f1eb1f945bmr12073783oac.292.1653316605079; Mon, 23 May 2022 07:36:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6830:2a10:b0:605:54d2:50da with SMTP id y16-20020a0568302a1000b0060554d250dals2683799otu.8.gmail; Mon, 23 May 2022 07:36:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytXpKj9tm5S6pkTFeaY8roxHZnwc33WhMP/Ads1AcbwPA1An+eKDReP1uVXa/2yXqs9VJR X-Received: by 2002:a9d:2f61:0:b0:5e9:4bfb:61cc with SMTP id h88-20020a9d2f61000000b005e94bfb61ccmr8300799otb.355.1653316604373; Mon, 23 May 2022 07:36:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316604; cv=none; d=google.com; s=arc-20160816; b=VvUkjBVBt7g+L6V/OY9gUbZG6sdClP6d2n5rSyICGVkG50lEnl/0zkDJgifFcMoM9C Kx20k38O33guMr87qsphAI6l3/cfI9TMHjLgbZznWEYGuDGtmOQwFgSvdraTjv3EAwIZ yhnLWUUK2Jq5moU9HDPuBDMx7Gs2xQRsJyUOcHFCk9iPCEPpWTag1HHmXyhvcJwVyFDs sUs7Vu1wdlVXTyXo+6zo+7+4pgn1uWMIzQ/kOE98DecZ7UGjR1rR4KmwDPmXCj8YUBXK H7WwO8jWeFt61pkZ4AODrZtGuamAf1/RTazdAYfGmWOSDhwr1z9rfQPMe8cbLhs2m23+ /XCQ== 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=aHsF8V2B+0KWaLj09hAqCMxxu99d+/MKeJPnHyJox6v7OzgHaFe3X+P1lKoi3/xBC3 R8dINLOlsXhuTkucpzMgP5ihUgYuUaUVZaEgvbsGMkaMAppzgW4HllueEd8KlHuG1bnF OxgT5jqRAZiuovqM3ecWyS9RHXlcjF0dgPZiCxf5gsxnTgFO2V/jgdO+BG+lrrM0aV4Q qMpYL/0HnsfybYQSRdkMCI1i+THJDooagLWZbMqzFN9CpbFV1Yp3tELHp7Xvls2fcqlH z26BK5+1hhmSnJ2zeOZcamVgRPoZnlOigQHVDeoYMowkbR9Asmq6xV9oaEtnpytLbBg9 XU8g== 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 fq38-20020a0568710b2600b000e217d47668si1428773oab.5.2022.05.23.07.36.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 May 2022 07:36:44 -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 24NEaO3c024879 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 May 2022 16:36:42 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH v11 16/21] fix: support build of packages with epoch version Date: Mon, 23 May 2022 17:36:12 +0300 Message-Id: <20220523143617.24759-17-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: HrfYmzKJWdVi 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