From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6753266854416875520 X-Received: by 2002:ac2:5bc2:: with SMTP id u2mr2802618lfn.173.1572367468866; Tue, 29 Oct 2019 09:44:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9a49:: with SMTP id k9ls2628470ljj.8.gmail; Tue, 29 Oct 2019 09:44:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqyuSTFuqXpyog14KsI5thRMEJDfY4I9UtQF2j+vdBowMDspseqzXSDtTjwrKwET1QO+ZURd X-Received: by 2002:a2e:a409:: with SMTP id p9mr3442334ljn.186.1572367468336; Tue, 29 Oct 2019 09:44:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572367468; cv=none; d=google.com; s=arc-20160816; b=RP7dae4LouMjakCdZcYxHBB8D/fCmaiKGOw3D+hDWej+AQw9TpQUM8O42AJzwBzgCB 9ioDFWAyG6q7w3SQfnjkQyFnWTGYOVgMzdWL7VwIAt3aHkZ227a6lvfs71DVzZb/+YEq 1dMfulabGiRs8pVgFFRTyduh0j9+3ZlfRCLaPrXBRDE9sNglRBf4qYuy6VqsmUFhYZ0W AVCthKDBdjD0vWbXRE7eSn7c4ih8F/U+x0cSqUnqV3LjTV8nWkzNEQCeQb6FOTzTPMQ3 OUf0D0wF9D1rLEzQn5Oa0w5Ijgo07hlG9C4//ghQavGiskYF5KRn5Hp9u77+tSa11gbU 8pDQ== 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=uhUoEOEO/HYdPmxCmWSFBMMzp484bVPv7IMNs/wOy3FNWIbS+9CQbT2lKs0KOPk644 UV283yFdFFnhdfv0RPX47dhCADG/g3eI55SyZi9nzCbjZt7gHMmjGnfxFiBNV7A3xzF/ 1L+4JirrWrU7wWoMvt+IR2aPV5sxGF/VlgkzoGfFbyEP4+31FT9+moNOttnUX7CjdeIY +2n6zXCcuvwySsanN2O+xyEwqruKa3altQQGcY/mpGZXJ4nsdyenpLORpKIYW8lIKnOZ pJ11tEMgdGyPqDKA4M8ptyJW5SyMP5cDLbzSj+OB5KDAAsJTtZpWlab1ZRD4FTLKiKop aIaQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id z3si243130lfe.4.2019.10.29.09.44.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Oct 2019 09:44:28 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id x9TGiRwG000560 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 29 Oct 2019 17:44:27 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.153]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x9TGiQph006586; Tue, 29 Oct 2019 17:44:26 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: "Dalamagkidis, Konstantinos" , "Jan Kiszka" , Henning Schild Subject: [PATCH 1/5] debianize: only prepend changelog when our entry is not there Date: Tue, 29 Oct 2019 17:44:20 +0100 Message-Id: <20191029164424.14681-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191029164424.14681-1-henning.schild@siemens.com> References: <20191029164424.14681-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Eqjzyu8tHbz0 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