From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7186516587736727552 X-Received: by 2002:a17:907:8288:b0:835:5593:ef6b with SMTP id mr8-20020a170907828800b008355593ef6bmr3241396ejc.374.1673255995602; Mon, 09 Jan 2023 01:19:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:40cf:b0:488:1679:c417 with SMTP id z15-20020a05640240cf00b004881679c417ls3577974edb.1.-pod-prod-gmail; Mon, 09 Jan 2023 01:19:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXs3iob920WAav23+azmuDByh+++/IwTS3DbwQlPrCORlabrpeciO7U+RWbwwCbsEtilohEE X-Received: by 2002:a05:6402:2a04:b0:47a:f54c:1ba4 with SMTP id ey4-20020a0564022a0400b0047af54c1ba4mr61160046edb.25.1673255993988; Mon, 09 Jan 2023 01:19:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673255993; cv=pass; d=google.com; s=arc-20160816; b=IxtpNnS1jGtnFM2/4vxaKCVI/XUcdyfxpM9prV4EPsjqYSCJjykUYjYSQJqTRhprhN GFa5eBHaRYNJKFs52BvPzLpEq8I7p9CRdYMU3innJTTN+8dPkxdHI2xjQV+XW3NsksXu 4vNb59firwwnze/D1VJRb2hKa3vCJ1+28QA4V6cR7fV755a3gte/mFr946BJ2iV3FTig 2MsYY2UrGFyTY2Q3uWXYGeDWmkfPqS7Q0y6zp4e2t4c+ehmi+TD1K2otbiMRzPDsYFGS rTxLuGNmyzINp6yD6cLS/myStJ0pGK/IuMUZc64jK+ISEnhqBNeN2oRhFOZ3bXn/L7Um UKFg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=73k3HTAMbp2QHMWX7acvL3dXYIGkcVAzw8vvULmEkIE=; b=phqsKBqmihIPHFNKfFV3nHeV+AiCvQCNDg/no4rOquVioIdaEfvtvwyv3cLkvIP7Fq ukBlYWVChHejrix8nEpyX14eP+h0jdlgIgN22rKthyyl7rT/u3JP5NrE65eWyIdIezzc 4qXFWojgbHDnWsM9+5iveV3jnwnYDlPUQVQJm74CFMBv2Pc2VcRFJuObPTcPsTsyL8w/ dp6ojLURDCsItAlB1ixG5WiF1OyV0eFHHo6k9T012Cgn/48yZhpkJxeSVG+G8QBNhDYM cc2CpZjRPwxvA5zru2YMZfuutjmhvzvalaZ9W7hjKU+zOxSLSuSI13Tgvy1r8VntYkex SS/g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=l0YKWNVR; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.249.66 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2066.outbound.protection.outlook.com. [40.107.249.66]) by gmr-mx.google.com with ESMTPS id s1-20020aa7d781000000b0046c3ce626bdsi325121edq.2.2023.01.09.01.19.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jan 2023 01:19:53 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.249.66 as permitted sender) client-ip=40.107.249.66; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=l0YKWNVR; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.249.66 as permitted sender) smtp.mailfrom=henning.schild@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=XIW83por6FnujNAmXay3t2asT9xm2giSjzvLhXSC6TeLwis33nKqapP9goGJQVdLY2I3ddnO8PhEykamjcQFomg7AqWzfuiZYxyZBwMP8a43T8wEfWrs+mRnrnJTpQqQHLoQEzUqqkI02Y+Jbmt1wCjbYCR6758zrbIbkBIlzp74hwM89YupTzN4z2AFfRmlu6/69FDwFnD9B68x/m8a9tk9n02Oo2xBtD1NnuHCMC3HTd6fEtN+50ueeE7wB02IvwNnKMkRfIJFcaRwMzxrA4UhTkWl3jW5tjbKxW+Lzx5zpC005aTg6tYBtvuiHuxh/d1bKZDiFeqyJ7i6rFWXEw== 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=73k3HTAMbp2QHMWX7acvL3dXYIGkcVAzw8vvULmEkIE=; b=YD+pjHWAdI+9i6SKv2a12Ot44/FqY3oxlf2cgGGJuAWtLhad39UqyL6P86TsufQ4pTbwlNDTMyoJwBoe1av2dhFiNxgKe/e0/V9/YH/8WdcKox50+4aG4Ubqfga/i64nJnbhzDtCYVUB7rB9o89nDww/YhnkFma/nDaq/25l9kGzhlKsFxKviSxScIVqaSigHHr3zP7OCj5k40b5Jnivu3j7/79ABndUq1egZyHrjYjENhMbkbCrx6Mj/eSBIEEsxR03bzRv5aoz5LrDplva1fMAO8K0wQEpvILN065Obuzpcyp9nLyOnQAv9JK3bzFvmDBcuHph2uarVPcphgsclg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=73k3HTAMbp2QHMWX7acvL3dXYIGkcVAzw8vvULmEkIE=; b=l0YKWNVRovk/+kHHrwcUZvjLoZn3O61kDdEXd5IGHuuJFRxgMJHGkas5PRepDi4QUZb0JerW/VpTON4F3s/7gU+v3iJ4KsZkjkWmyX+4E1JRB5h/sKgA/HEw5pmtWieaQL41mZCAOEJMI9xBWrwbACQCiA8gdBk6P8gIILNPNn4nQe97oMyKqEUw+uF1iW3zVTSH+aabVXCn3IbEyKtzaD2nEUQe+58tDRwE2tApq8a/pvTkXRJnOywMku4D6Yst1OlEVSlBBQxAOGNookUThiRkHzUkX/42gwpgd9bK5Hu7C2+hyyvdTb5K1Hg/QB2OyAaAad3MZW248nJ0iJz02Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by VI1PR10MB3326.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:139::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Mon, 9 Jan 2023 09:19:37 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79%3]) with mapi id 15.20.5986.018; Mon, 9 Jan 2023 09:19:37 +0000 Date: Mon, 9 Jan 2023 10:19:29 +0100 From: Henning Schild To: Felix Moessbauer Cc: isar-users@googlegroups.com, jan.kiszka@siemens.com, venkata.pyla@toshiba-tsip.com Subject: Re: [PATCH 1/3] make deb_add_changelog idempotent Message-ID: <20230109101929.6e3eb90e@md1za8fc.ad001.siemens.net> In-Reply-To: <20230109051428.450854-2-felix.moessbauer@siemens.com> References: <20230109051428.450854-1-felix.moessbauer@siemens.com> <20230109051428.450854-2-felix.moessbauer@siemens.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.35; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH2PR07CA0056.namprd07.prod.outlook.com (2603:10b6:610:5b::30) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|VI1PR10MB3326:EE_ X-MS-Office365-Filtering-Correlation-Id: d077edb5-af6c-4875-9305-08daf222a13e X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iWr6XBxIZx3OTpIO7zMo0XRyV3F1/8iZKNZA7MW9ibc9uzheDCaHC5FSlrQeJICRNlcUqV33EQ/B8OzsMig+y2nwwRrxaa87RfyQOybmccG9OWrymadMPCmdGrjM2Q6NxHLe5IkAtHFnmddyJgY9PpDoOaUt3xC/kCMoPcDAfUS340c8sR9kWDP3xFz8CN3qNPV4+rma0MO0CktXE0KfziDOt+rlxGQ80O3eiynbcfEkrgAngeIi5whENZ3HRwlHiwHfyG2Wgh78Xb9ZDjmNGtZALUKFYYh0IcHG/VEj2pI5fQNTVdnXxJHgwtJ9Yz8q44eDOcMBSrGemXEZkLO8Tk+iLa5YOO/V+upr9VoYuRHiKtXZNNWqpas8jrR3oPJ4qNpr2MGEmb7K4yugAFyycborOnZoEU3tAyMCuGkZkrUDlCSu8QCXlnVZGNCj0Kp+gBDq1+QeAOecq41C8MYq7ohCAXhMihUAAVeyPy2jBTkXe8qEISAo8zcLIC34fKXz3Jyxyj+PZDx8bm7akDgcUo85r+1Goyl58aE+Hzh2mmqYj/1LA6eEDbePl8QzlT5QafCyTpNxsMM8WahrxfWHaCOe9HG5v0RTVAUFiaw7QCcrctcTg8y8lBBPn8/CIrZf/PO+v97OFC4NADwbYScKibOg5eTEdtRwpCq/x18MrBuFRiHQQwZ7kMxOZazI+xWEnQsLcv/O/fEkB1ZCt7U0CJyGdJB67C3x8B5jj2xBz8s= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(366004)(136003)(396003)(39860400002)(346002)(376002)(451199015)(2906002)(5660300002)(8936002)(6862004)(6512007)(9686003)(26005)(41300700001)(44832011)(86362001)(4326008)(8676002)(66476007)(66556008)(66946007)(38100700002)(82960400001)(186003)(1076003)(6666004)(83380400001)(478600001)(6506007)(6486002)(316002)(6636002)(207903002)(219803003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Xtqh2g1pOuO0Jsm4uLJ7mpxfHxgaY2756HZK3+vjkdcxABFjX+3BfKDAaG2O?= =?us-ascii?Q?UtwaJ2DKNQH5IRmlJU+ThTcec0XbFRz0RIdWpRWKpmPbBtz6Vwmxf4Rg3awQ?= =?us-ascii?Q?bKfKvsHyGBKfOibBbUTs8Vu6uBix5ngMH4XHpNA8hfOTzRmKhn5ecNkHX9GD?= =?us-ascii?Q?YuBDAfckqBfStecjYxi4uvXdy1UTXN7G++WSvhKz+4A5WPX1owAEAoq0H9Xl?= =?us-ascii?Q?Slxo8Mj+cuYt+B8siE5YTc8I75cJxpbEL4CFRxpRv8y9OtuzF03AkaE6yDvq?= =?us-ascii?Q?V61Yzl3UYDA8Khq6qE5U7MDPddD5EaMUHRfi9zh4sqEiURG1XcsAByrvIXlg?= =?us-ascii?Q?BNrxLFHKtNPXbvxmfENm29mfR/qkgcAT1YYprxr1ByzklNXEVBWr/9UHp6YV?= =?us-ascii?Q?K5FTfriykSXmVCrigIQ6fky1r1Rg0CJNSuTvZvCfBamfuwedMCKeXFjQQJ4Z?= =?us-ascii?Q?ibgL02G+Y0NgNkMzjSnm63NR9EeKfCTGtDBGBlW9NsRstjVfqK8PqgPdxq/J?= =?us-ascii?Q?hUABK/CrqMdAeuetvxfwV+H6XmNJlZH6NBJCA7DxOBnPJ1zEebBN19OyCDX/?= =?us-ascii?Q?U/RlNOfnyzeLeaH9tY847m4iRBGX8lzADGn6ysSX+2VD5pUlTPlznTgtZP/O?= =?us-ascii?Q?TsrwaPvNPIM6Rzl1klpjJqO4fTOEw34oUECNoIn2wINxb9fdmARKptZ5Pmz1?= =?us-ascii?Q?hR67pxDuNo3EpaBc6XGFQTEcuW93v9ZGt2JsskIcxghjoH94sNGetPCHGL/I?= =?us-ascii?Q?Vq9sWuGViVbokMBo4jBSUCcoeuioY5W2VXhDZqB4+T4iSuA5efNpPzS5DIeO?= =?us-ascii?Q?Lu3j+xC+7p+IV4hzBHN3e9mSXesAFIZfzJvADQW0hk+c+nt5y5srtRa7imMY?= =?us-ascii?Q?gZbCfOaRbw00gLyNo4i6qk87xrvVtg/RYaYILErlZNGgJHeObHxbwrrgc8mW?= =?us-ascii?Q?NdIn+Zdhfl2YnjO3uPnN9xe4vtk/lS07OzBAsTrrsOXwxZdAy+FdkAAUvwmv?= =?us-ascii?Q?P33FgIgIsNwztfj3E71VdiB/Uv56ilTOofXCG/ViqMnmsoR8vMo4D64BHA1f?= =?us-ascii?Q?A2FBWuEJg0+hfaX1XpbJxhHHU7EFUIIaxDJ7G4Ir3ocAqn2VxuSggCUZQ6d7?= =?us-ascii?Q?YfnriQT0j0b5y8MiUH0T/gFamDs6/dKHd2cljwOaDFAZfj/MiyJ2mtJ1O6xh?= =?us-ascii?Q?apwdJROuR9vB2JReDC8lMvOxWwewKoAkhsKyVUg5C6UDSfMfg8OPLUVIlqi6?= =?us-ascii?Q?qrRhMlCfdwt8hkLst03M43Z5rki+4hUZwfRgnAu/0KvuAMGboGS631gFmkkF?= =?us-ascii?Q?9bnIDln2x1lTT2s9o+37zgdP2WSWR+9fjYONqXAwUJdz1EMSOr6FKT+2ta2Z?= =?us-ascii?Q?wNHwP7ejEUot/7lvWTru6HuXLlemmqywxRZSvh1OVNOciJU2oxVEO4umeCCS?= =?us-ascii?Q?Nuew1Db0fxszxxo1mqvQcpRiqAPh5o8e3/wJgLFmGTS+Gf+vyYE57vnRtQPg?= =?us-ascii?Q?qxk1777UOkSVa0O8JtbhhGmYEQwsxfY8EKbqZHKwIlwTsoXpJalMEs6B4zW6?= =?us-ascii?Q?6vJPUkfmR7sVey6IUHnbP4n0AZE8ES7rV2fkEwzf6GqvqFQJfuEYnkImlj+P?= =?us-ascii?Q?Kw=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d077edb5-af6c-4875-9305-08daf222a13e X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2023 09:19:37.5463 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jnAE2a+sbmfzv43HhNlyW6MEYx2CkhicldsolXrxGnj3JJXVDh4OIpilIBrFamXQgb6uRpLsPgMKSNcjRgLQvpyox2Iri2Rg3j7+oW9yAlg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3326 X-TUID: J0xim1ZpEay0 Am Mon, 9 Jan 2023 05:14:26 +0000 schrieb Felix Moessbauer : > Previously, the deb_add_changelog function considered an > auto-generated changelog as a base to add changes on top. This > behavior is not idempontent on subsequent invocations of the function > (e.g. on partial rebuilds). This lead to both reproducability issues, > as well as unclean changelog files having multiple "generated by > ISAR" entries. Can you provide an example of that? Like how the wrong changelog would look like and why it would be wrong. partial rebuilds (especially when code was modified inbetween) are hard to argue in the context of reproducible builds. > This patch changes this implementation in a way to always create a > (possibly empty) orig changelog on the first invocation. On subequent > invocations, the orig changelog is only considered as provided by the > user, if it is not empty. > > Signed-off-by: Felix Moessbauer > --- > meta/classes/debianize.bbclass | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/meta/classes/debianize.bbclass > b/meta/classes/debianize.bbclass index d125256..34347b5 100644 > --- a/meta/classes/debianize.bbclass > +++ b/meta/classes/debianize.bbclass > @@ -15,7 +15,9 @@ MAINTAINER ??= "Unknown maintainer > " deb_add_changelog() { > changelog_v="${CHANGELOG_V}" > timestamp=0 > - if [ -f ${S}/debian/changelog ]; then > + # we have a changelog and that is not autogenerated > + # (when autogenerated, changelog.orig is empty) > + if [ -f ${S}/debian/changelog ] && [ -s > ${WORKDIR}/changelog.orig ]; then if [ ! -f ${WORKDIR}/changelog.orig can that condition inside the condition still be met? Henning > ]; then cp ${S}/debian/changelog ${WORKDIR}/changelog.orig > fi > @@ -34,10 +36,12 @@ ${PN} (${changelog_v}) UNRELEASED; urgency=low > > -- ${MAINTAINER} ${date} > EOF > - if [ -f ${WORKDIR}/changelog.orig ]; then > - # prepend our entry to the original changelog > - echo >> ${S}/debian/changelog > - cat ${WORKDIR}/changelog.orig >> > ${S}/debian/changelog > + # ensure that we always start with the orig version of the > + # changelog on repeated invocations (e.g. on partial > rebuilds) > + touch ${WORKDIR}/changelog.orig > + # prepend our entry to the original changelog > + echo >> ${S}/debian/changelog > + cat ${WORKDIR}/changelog.orig >> ${S}/debian/changelog > fi > > if [ -f ${WORKDIR}/changelog ]; then