From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6753266854416875520 X-Received: by 2002:a17:906:2552:: with SMTP id j18mr36726503ejb.244.1574673520410; Mon, 25 Nov 2019 01:18:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:ef07:: with SMTP id m7ls1915425eds.12.gmail; Mon, 25 Nov 2019 01:18:39 -0800 (PST) X-Google-Smtp-Source: APXvYqxEOFMk/G4QnCFRtC2/BWYNSqNKnb5g2f8XQFRvXZzE6BTLF0qrL4UNPI67e9R51/LtpgFz X-Received: by 2002:a1c:9e4c:: with SMTP id h73mr28831516wme.1.1574673500984; Mon, 25 Nov 2019 01:18:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574673500; cv=none; d=google.com; s=arc-20160816; b=RNCcluJGHEliUK2lkxood/dhEqNrLAShTvVxN5IrXnSuHirny/8YKfEjtDrvblV0AA 0PzVr0RCPw7A+sgNmcHuCgfdJma/mbbFf4HfnoklEuCs4mFljLorRD8r7XWwZk9gU1y/ z9nxUXtI7VhhQrtxUB9Q/KWwfYmQpE+/5YLT7zp16sgDvfjfGBCw2j1FFN4TJYElkfud smQGqAnPt2wtMq5QfV6Tom8zWPrNe/u8wPnh0WRO8KPLsXECBpQorBPC2LzmuTcjulCN OXoWrr5ito9WhdzdhveI1FC34KzpA2XU8JDULS0zFreUZsfvpaBGGzDn+/Vau7AuK50I LwaQ== ARC-Message-Signature: i=1; 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; bh=q7p3ahu+Xzjoo1fWCY7pX3G6FKN+sEtJYEcAmZo9rQw=; b=kfITQRSX2vxOOnRvjkgI6tNRbGa3NpACzqkc9JoRE9ZKN7KWm3QIKAAGMtiA7vMJaR LbH3vAdkA96yZT0+nwcKeczpHAZlI4LdQgCFnrXHFoscVDecnumbVX+JAxJc61Y9oPr4 acEiAZUtPyYkhEVQ0lwoV2WB2z0nENUuCbtrMrhrY9oNymywuuq7mFVYQGemAVrFkmct cn1utq/syOStmVwAyQA1P8HCKX4uq883VdZ5R90t9+H9im4UIPFRe4DJogoS64igYQzl eUKa+8Oxwfvt5kCvF7qBkZbU22krUHqPe9DMJm3gO/FxQhPZAy89hxeYDEcBJHiAyG+j aOwg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id l23si305007wmg.0.2019.11.25.01.18.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Nov 2019 01:18:20 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xAP9IJ9P017287 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Nov 2019 10:18:19 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.65]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xAP9IIdL024258; Mon, 25 Nov 2019 10:18:19 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , chombourger@gmail.com, Henning Schild Subject: [PATCHv3 1/4] debianize: only prepend changelog when our entry is not there Date: Mon, 25 Nov 2019 10:18:12 +0100 Message-Id: <20191125091815.27502-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191125091815.27502-1-henning.schild@siemens.com> References: <20191125091815.27502-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: IpnHp4v6WDD/ From: Henning Schild The default release and urgency might not fit everyone, make sure we do not prepend if that very release is already in the changelog. That allows anyone to choose what they want and prevent prepending. Signed-off-by: Henning Schild --- meta/classes/debianize.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index c231b41..33ab4f7 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -21,7 +21,15 @@ ${PN} (${CHANGELOG_V}) UNRELEASED; urgency=low -- ${MAINTAINER} ${date} EOF if [ -f ${WORKDIR}/changelog ]; then - echo >> ${S}/debian/changelog + if head -1 "${WORKDIR}"/changelog | \ + grep -q -e "^${PN} (${CHANGELOG_V})" + then + # entry for our version already there, use unmodified + rm ${S}/debian/changelog + else + # prepend our entry to an existing changelog + echo >> ${S}/debian/changelog + fi cat ${WORKDIR}/changelog >> ${S}/debian/changelog fi } -- 2.23.0