From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7074970847230820352 X-Received: by 2002:a19:7507:0:b0:448:75c5:da2e with SMTP id y7-20020a197507000000b0044875c5da2emr9815058lfe.206.1647270025602; Mon, 14 Mar 2022 08:00:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:b05:b0:448:696a:ea62 with SMTP id w5-20020a0565120b0500b00448696aea62ls2217768lfu.0.gmail; Mon, 14 Mar 2022 08:00:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgdQtFgdzM+3Od0VtniIxzkrKtj1TPIjN2B1oqjQY21RXNzTmC+WxodCSNbBdpx0UtjBY3 X-Received: by 2002:ac2:4c07:0:b0:448:3661:520 with SMTP id t7-20020ac24c07000000b0044836610520mr13438892lfq.205.1647270024792; Mon, 14 Mar 2022 08:00:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1647270024; cv=pass; d=google.com; s=arc-20160816; b=YjMKF2o3V0y+SJVl73B31AbzAfg8JfhKOByhyjrQFgFl9/rAYvXkOdH+hDYVDDRpXT 6McoJtcqmSVwAddRuMlf8qP5Xa6Xr/BC2CcdLvNFa7/CcHVQWrBfrc5JtYL/0N5ismqd wRe3NGkKyF2Pbj7sbpCSPQbvJLN2dtRdKMos7kG4Q6V8d7ddWxSHdOG29skv1DI1K+kk d1O/ZZjYBvmbuIdcxo1+8X/iDG7Gj0/CVSO+NWVTsgsPojdSNa2xWJTzgSOZAgD0uoFq C+7YBS+d0BpGBUUiIvanOyRZaX7+EwNzwzL/GDm/bmvjHapzEqs+1aSCQV5TdgaEhTfF jNmQ== ARC-Message-Signature: i=2; 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:cc:to:from:dkim-signature; bh=8YXFynTJpd8/MLxGvMh9E74taBDkOh2dkUPrW/mUCho=; b=TavFssWG40+91t7FNPufaQWK18gelY4Z6wKIxZ1bLZPJfosxgqi55dfWDQs3mHlPMC rlv6gyegtXU+oTZMCYgJaUqbcLGonsjrPcaDrRp+KCzX940J3PouBExgJZ857euJgZ0+ dkSj4o+l4w7NSI7ZTdNG2x/xIiTNJC5UdY8N+XJqZMaqDPkMAY5BApdUkz3qihDSdT+7 H2AyIk88/OkSHv4E46DSK41BqS3sURAY3IU6aPxmQGFSH0iHhJJYJarwIH+pnpR2/jr3 EcHrKG3Cugu1d39fMp/MSAYX6329JmyNJv4zKMe7v8eJ74czCa2ASjPht5l49EVDvlfa zG6w== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=x2qdc+AT; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe0d::620 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0620.outbound.protection.outlook.com. [2a01:111:f400:fe0d::620]) by gmr-mx.google.com with ESMTPS id a9-20020ac25049000000b004487cee8a6csi609070lfm.11.2022.03.14.08.00.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Mar 2022 08:00:24 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe0d::620 as permitted sender) client-ip=2a01:111:f400:fe0d::620; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=x2qdc+AT; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe0d::620 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F9ESp7D3Y8C+WfldsIuN7cNT0FUTS+ZHwP/KRzXSo4Xd1iTtQSjTkwSodwRZyw8mHxWeAzzmcv9zrN5EYV+rlsCimehPGmsvc0Nu2EeJWwZCoYW7xkTLCneYMtPykboDQwtG2nwrmlnUuDVA20yxiPYfzKNKeTVtkxbat3T2KrVTgrC2nbHaitptAMX4vT8SmD2EhywwiBLLnTkxSbDDJrK26/VoeZRG8ZeTV7yZN1Nzg8lNFQQ81VX49oBrx1890Y730J7cB1kGUN2TY/hFXk7Y7i+/RzQ86k7ypUzUHc7Gu/lp/++iE6h2ojnD7g/1j8RnN0OJNJdQ9ac3ETeonA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8YXFynTJpd8/MLxGvMh9E74taBDkOh2dkUPrW/mUCho=; b=Cylu8xmjLWLRLlrxOXpkfPewMsfPU5SxIz36i6k0V4ie2CBa+tGp4QXHXdnxOCQYhvATfO6IU/baOpK7ktYab8bzKPjcHARTxVhb5UIkdOUzwjhTYfO2xul3hVCeDz/My4PjtmpXw1+Rq3ySElSedLuzrW7yD5XkCh/1gAFjjyqTjc8bW5ddHXnjW66IPcfVO52SJVbzjxuNJmhAegVKHDaSdNVNN/4MmIcu4OKI197tvQJP6B85hjYvMXsrVFaxpA15P1my1vM1rHIfrYsHgTcn/Ipp6rqSNjxYPq5TliAIlV/XRT6qdAMvQXFjlls220bWvLoNvzokNle5NZ08ng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8YXFynTJpd8/MLxGvMh9E74taBDkOh2dkUPrW/mUCho=; b=x2qdc+ATLA1XYyHRhwiDsCMxuamzKxprkbNXXNjCDj3+9NCKiwXMu3ATmoQgSQx1CGli1gLFLYNkRhvCu3aBaF0vX6tOHRSJo2qdd/SJPRFcJcJGYvqZFSwj/gFMULW+7sJh+iBILoJ7TOI/8EfRDqRE/y1hLtZrYFXbDI1McZFxYVvGTslJZvM2vTTloLhT8r4j4BksdBE0WUd1tINUKwb34rNLgBFJS8n8eWQREJB2GrZ0VSXMRRowIKOZsAo0YI8X5k2oZ01ba6UXRk2xbPm8syELWNAuj9nAoeR6+XKpI04HXDzHQqZ5uDwi8dP9IRo9rU/KW/0wqLq6kb7AQA== Received: from AS9PR06CA0388.eurprd06.prod.outlook.com (2603:10a6:20b:460::31) by AM7PR10MB3253.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:10c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.23; Mon, 14 Mar 2022 15:00:23 +0000 Received: from VE1EUR01FT103.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:460:cafe::4e) by AS9PR06CA0388.outlook.office365.com (2603:10a6:20b:460::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26 via Frontend Transport; Mon, 14 Mar 2022 15:00:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by VE1EUR01FT103.mail.protection.outlook.com (10.152.3.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5081.10 via Frontend Transport; Mon, 14 Mar 2022 15:00:22 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Mon, 14 Mar 2022 16:00:22 +0100 Received: from felix-dev.test (144.145.220.67) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Mon, 14 Mar 2022 16:00:21 +0100 From: Felix Moessbauer To: CC: , , Felix Moessbauer Subject: [PATCH 19/19] fix: support build of packages with epoch version Date: Mon, 14 Mar 2022 15:59:46 +0100 Message-ID: <20220314145946.1254164-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220314145946.1254164-1-felix.moessbauer@siemens.com> References: <20220314145946.1254164-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: felix.moessbauer@siemens.com X-Originating-IP: [144.145.220.67] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--13.479900-8.000000 X-TMASE-MatchedRID: ZKV5l6+rCbBD6DWt+2Yy8PjJ+1YTyVC1dHNiau83Du0SEYfcJF0pRU16 N0DD9tffycmFNidOeD0vb9ahPaDiEgmbL7abyWagGEa3thdUKv5POQHvrzcucz8Ckw9b/GFeTJD l9FKHbrmTU3CLdU2O74flp3MlOD0mF/FyJfYls9zNs+hSjQLHEA371ZuX6nuLggra2NOo2i2Kw+ tCzsQRb2FHVj+6F+rIgmLClVQDI5lFYf+oUI6xTEpZdQLWFhXGFGDwHFCuATSeAiCmPx4NwBnUJ 0Ek6yhjxEHRux+uk8h+ICquNi0WJONy3fSQ9tIDPD613wvOciJ+b0ETvyaRXI/bnfITU4YIftwZ 3X11IV0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--13.479900-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 1D445567CAE737410950FDCA96B5D6474F35BBA9F00A3235833AF56E3FD5C0E92000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e7be772-75e4-480d-dfdc-08da05cb5d52 X-MS-TrafficTypeDiagnostic: AM7PR10MB3253:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ysY0RCLlV5H+Bvi7fLRbXtljob0qWsgb+kfx2p8uyGqQN310Py/jlhWVxyyvFwi321RSfqSke4DVpwyb8g2Mw+ZgWW0gg4r1JabBnmKkYUevH9jaePk6/bJFvo58UFEdt5hPHHa2R4k4CRlRC1FFOPQMG90vVb4l1U5CgFdPURv5whaiglQlvMPgA/vmvUKEVh83E+5o7o1Dq4AxpL6Ebo5y9rNt2ipeGwt5dXxLIGxKGPJ6wdcws1fd4pHSuHnUvp+TzoJd+MM27/S3Obouwx0p2bympvAAnsGHrn6EuooMqYzJDBBmrbGXfW4pD0ND2ci5PaRQVnUHUNu+JJOuV6maAj3Add5pwAExzo1MlGRSbc7ebMsKLeb2H0lis2qBz0Yu+QcBNCNeBMN/1GEBN73N0n6Gc/D6e7yy2v27vVYUSin8tV/O/V1x1UUbQ1c2fub96FIKFaD4xnn25oPCK41hZLtZawjfeSMZLtMdJ7HUK352RQr3kd4amTZGTmw53GoVKfUPQcn5Nl6cIROCIL8g8uM40wcXCIz3Q/DJlwiKwbnbqN4SWGZkEERkqjY2fynCz5mFMOEvDhKLnlM0dWmKTe7lsOcJxayjcnSH6AeTlKhMQQdpCU0iskHtP6KsKbLOS46lrhpytO08qfBQAuP5BNZ2qPgkcrua13JYQ12gpuH29E9EyZcrne9k7C/AnA+9AxgwkqWumrK3kymjbMofLWJqv1gNzwXaMqvWlALiOXkAUVLwBD1p0ZEiAvHY X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(54906003)(82960400001)(81166007)(356005)(36756003)(4326008)(6666004)(5660300002)(8676002)(86362001)(316002)(6916009)(36860700001)(107886003)(8936002)(2906002)(1076003)(26005)(186003)(336012)(2616005)(956004)(16526019)(83380400001)(70206006)(40460700003)(70586007)(82310400004)(508600001)(44832011)(47076005)(36900700001)(360504008);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2022 15:00:22.7979 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e7be772-75e4-480d-dfdc-08da05cb5d52 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT103.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3253 X-TUID: FcgDctpY3IB5 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 126a4ee4..ae3430ab 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -76,8 +76,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} \ @@ -86,7 +88,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} --dist="isar" ${WORKDIR}/${DSC} + --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE} deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}" } -- 2.30.2