From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6753266854416875520 X-Received: by 2002:ac2:5097:: with SMTP id f23mr3494061lfm.90.1573154003232; Thu, 07 Nov 2019 11:13:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:289:: with SMTP id b9ls1854628ljo.10.gmail; Thu, 07 Nov 2019 11:13:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwGzcAKREmvO1lK3OexjMeRQeCnlCQZgZv6KB1cNoGr/YT47zHE43h0X+Uozl7wWS5R/NMB X-Received: by 2002:a2e:b5a2:: with SMTP id f2mr3587074ljn.108.1573154002680; Thu, 07 Nov 2019 11:13:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573154002; cv=none; d=google.com; s=arc-20160816; b=Y+PIOS0EIHPV2z8iBmJY108ogr6NRVTThL68MLDsyK96mmifE46uBXGq6bt4l6ejLl QqS9DinRgyjIuGEHJHOxrXPCIZXpQ0hzm410KotfgB0G7y7yedLffjjZu1YWghai6Zoe sbJ7sZ7Y+EWMzl+VfG0AxU+driddT2sLOqb8XVX8wliYOJ6LnvnYzqBgSRlRfKTnshnA 7UFhh2ZS+Oe4Kh9pllKra8MO3HVsSbF/dlzrKyqKkfn8LWoPsh866duw+9ErZ/xRVmEm aonZIbIwjc4WJ70qN2pZ2sU9V1WVvvmW8swJ4o6wVTsPrmmDlpbiBpUhIKkuyRpoWtpN NDOQ== 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=08wmbHovBxAjPOD55QBFE1KoyEsz5Ic7ws97+DFlMxUH+NT3Ev8yLsQKd6En+LNXuK e65aAqpGGHqEOovcD3BgOl2Tzij0AUFNXsraJzG7K20Wr7g38YT9InBfl+J2PNg7msW6 3Qeds8b4c5gRCw3Fw1VuNXCwrMebbJQYVpmDJgx1rrGjHiMka2iWwiC/aVrMOelt44l1 Jzbt8+rsHFPy5nZqgnCd+OKOpVGuXCySKoL0Wi9YqLg75Wrk4kU+48ZFuecDtTtVUw5S J8DZESkrJxBTEJm/CPDnRHw1lk+jT/FXQTqWfaVrbYsmvUyYMTXfRheGKdIinhUQaJuK e85A== 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 v82si203988lfa.3.2019.11.07.11.13.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Nov 2019 11:13:22 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xA7JDKVO005265 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 7 Nov 2019 20:13:20 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.32]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xA7JDJe6019192; Thu, 7 Nov 2019 20:13:19 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , "Dalamagkidis, Konstantinos" , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 1/4] debianize: only prepend changelog when our entry is not there Date: Thu, 7 Nov 2019 20:13:15 +0100 Message-Id: <20191107191318.11348-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191107191318.11348-1-henning.schild@siemens.com> References: <20191107191318.11348-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: s4WXEA/cwAac 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