From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7004736244321091584 X-Received: by 2002:a1c:3945:: with SMTP id g66mr10063881wma.49.1630917248348; Mon, 06 Sep 2021 01:34:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f614:: with SMTP id w20ls2887822wmc.2.canary-gmail; Mon, 06 Sep 2021 01:34:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhrljTQLSdzSKkTgWdMrr3AdQzWovA4yFhWp+M9XQ3+j/I2mSoEuy8IYDINsQhx1awOxEh X-Received: by 2002:a1c:f713:: with SMTP id v19mr10139379wmh.188.1630917247396; Mon, 06 Sep 2021 01:34:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630917247; cv=none; d=google.com; s=arc-20160816; b=DCtlj1+3pFBP3fLE/XOJacOi7gEeJO5v/Cl3+sqZZRcDEGnc/7Z1DOMuHnPRDAQwTt EihHJyMJqyOSqR5/zlVKEDVGSwsjY3KOSJuKeRkkuCYeb5XyvS+EnZs8s3njZQjBzG8X hqTvTCKlmpAkGkVXJ63brGNIJGRrw+qeeqhIcft3BpPADHhOMn3AOq5UB/s5s2azMiBV aKkgogu3QVGEe0y0es6H1LUNulQFPc/nm0x9WykMkBdM2ktel3Py1I0uvM8n2U2qjAhs RzP1svPoj4F3zr6mkC3WWP9bsAmR13VNIBOen9fwZrnBoXextGxX5Kn+AxtLHnGxAtfl VvIg== 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=Q5RmFguqoAU81uJH/F6YBgM0ixRjhOZ6FUAhX5lg0CY=; b=uw9sOYxTSuW4LxTLI8lZntR6oa44akGAdsTxfBV6nMqO/lfUiiqS+bulQBUivy9Quy yjka+dnlbdnXJp+beRyOP5Akmc0U13j6JCLOAaXRhJXN6i61s+Pjfo4cfYr6mm8f2pC0 3OwLTBYEoj5iGWpXd6/BIlFFBIyDF20hcty/WjkY6v0BXBC77fsQ78WjNSMP2ZEDkh2Q gLmJOva0wkLLCUJC4OE3D+fq3eLZ8uy7N6klL7xIh1EX+JcUxe/7bp0vLcM17hwD4Mmv wCs2CBnq/FG2fGBJDsyesxKKk2hVr3njGQZQWvzTnXk9+tK2ZOR5erOHQbFOTLPoikec zDbA== 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 o2si326655wme.0.2021.09.06.01.34.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Sep 2021 01:34:07 -0700 (PDT) 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 1868Y6Y9002060 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 6 Sep 2021 10:34:07 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1868Y6W9001575; Mon, 6 Sep 2021 10:34:06 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Cedric Hombourger , Henning Schild Subject: [PATCH 2/3] debianize: prepend changelog entries Date: Mon, 6 Sep 2021 10:34:02 +0200 Message-Id: <20210906083403.25163-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210906083403.25163-1-henning.schild@siemens.com> References: <20210906083403.25163-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Yc0C+ulLvHop Make sure to include the upstream changelog and prepend our entry. Before that change i.e. hello would end up with a changelog containing only our entry. After that we will get the full upstream changelog and our prepended entry. Signed-off-by: Henning Schild --- meta/classes/debianize.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index e6a300700a5f..386c34149b5b 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -34,6 +34,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 + fi + if [ -f ${WORKDIR}/changelog ]; then latest_version=$(dpkg-parsechangelog -l ${WORKDIR}/changelog -S Version) if [ "${latest_version}" = "${changelog_v}" ]; then -- 2.32.0