From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041589411470901248 X-Received: by 2002:a05:6512:358c:: with SMTP id m12mr5484402lfr.167.1639497795642; Tue, 14 Dec 2021 08:03:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1320:: with SMTP id x32ls951496lfu.2.gmail; Tue, 14 Dec 2021 08:03:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJzxdLDtcltX0dBV1WeU1TWp5/VhESKgi08xbQvsT8SmLMgNQkvBydBG2pBLjmNpwnCROylT X-Received: by 2002:a05:6512:a8d:: with SMTP id m13mr5507986lfu.638.1639497794373; Tue, 14 Dec 2021 08:03:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639497794; cv=pass; d=google.com; s=arc-20160816; b=oI7e3Z0Q3t1mGHf2nDKd2wVXvIwVPRwyeJiGIY79h7hq224lt0xKlZ5M2lh4un4Bvw YFoa2WO+uJrou33RYp62WqAO1VfCNScN81iCQ90bERnVWAuFMRHQaNgy1nPJiBrO2k83 08pc9YYD9LPukxhxisZkzTiriDPw0LApuhNQhPm5LKTyhZ2+YjxWDgyjNh9aUBgKt5NK N1RhjMIcJnb3suwhEDI4jZxaUuV5Wd864ozF8Dte6xrnBjV/I/CXQyNqGuthjX9Dt0wc Wv8HYuJpNEJKfyB8ht8vnmaUNMEe/ORte68US5at4asXIRPN0VNOrzZtrX+62tlCeIf0 TPLQ== ARC-Message-Signature: i=2; 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:dkim-signature; bh=mAEQvO+QHSHSQPkzFrSUtgoGz8fjx1HoMWlGTUTiK/k=; b=VSz+5GcV1Mb/VxUW/62IvxZ52/nwH1kwVkrPmddCGf/pLlpsutJx6gYP/fwA3SQcxY LA84jJyGrd/j7agOvnsueu4vWkX3uXDrho00JmdE+XUPNksg+KZ3/Xev6vVi2rFDWcXI pSalmoRKSGB4Y6ElYVDneJ1JoFBisKltZRr6qhpDRRYnnkOmgoYVeVHQwaakjirok7p8 uL2T6W8T5XcvYGeTN+HiGbQNA4BOMF+9UnEtHV+XW0OpV+X+pH7HCtqfURVZ5QOMPyoL Tv79CWTSYP9FU9pnrqFMGgx3lQNVIV4R2CDMDGpyBrgjkv/fitBLyyp8usr+Ee+nt1Mz ltfQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=0Br1sojF; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe08::61c 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 EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on061c.outbound.protection.outlook.com. [2a01:111:f400:fe08::61c]) by gmr-mx.google.com with ESMTPS id u13si6184lff.9.2021.12.14.08.03.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 08:03:14 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe08::61c as permitted sender) client-ip=2a01:111:f400:fe08::61c; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=0Br1sojF; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe08::61c 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=PX9BU1O5vMcMijrc9/7vnmNlRZCcAxU0T9Xs/GUDTPr+IoLxwN7QT3cGwbDWccwHHY4kM6AiJIC06XA3yY5iYDv8YQYJrjDHAMGZmPlhtEqedvb/XZ6CR+vHOCaCvuJ/f+fdENoNbaZDAaNqS1h1yLrNd3olj6NiGXr01v7IyHVwDdMm3r/w4M1FQQ8qQffX1I+O7VZEqN+mGQOUXeH8tiqNQuKSugZbETQ1DQNrxjixqyY+EFZXLkbAb+TBtAViB9kD7HF2zKEVu0aFW2VnEtrrGUMfH8+RDsoapmygwohgE53eKEtJiK3eicl5sIs8Pox575uyfG975M42P7jfkA== 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=mAEQvO+QHSHSQPkzFrSUtgoGz8fjx1HoMWlGTUTiK/k=; b=W2dQ+Ad/0/yitpb4qxurC4KarTk1cQFuMxF6Qr7AI8J+L4d1EJElBEmWJ2Al5EgWu5FlRoJO6rllwCZNczKBJhZ267CttPBWW785EQbDB+jurFsBhhUiq8M0XI4XMjANOgVUWqW/7DhLsypPzN/Oax8wdmBUip6u/FfRIQwwcPfGhcnvvzNYhLJW7k4ODahNPxyUrxVarC5MvLwNPef393Jm1DiVnjqah6xQeNx+INwLUvUFAl3fZ8Bot//etUM+ZWYIpzEwC8N6/uU1NjH0cgUukUX5DVMrKH99B2gpvSMXCO/7+In28zsRIghsoUhtesbtnGsGGsazFTyKR4D2Mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=mAEQvO+QHSHSQPkzFrSUtgoGz8fjx1HoMWlGTUTiK/k=; b=0Br1sojFaioSmZ0+SWxLUHxnXv7P2MgyxmHLh+p4AoDwDgHtjgvIqa9P2frrTJAenkcDyoYddSYytx9fs0VxCp5nBP8YOHntW3XrgbsYJi+vDiTJEP61xkmx2r2CPnyZ5POI0RjVK8xar18HkzRihSmnZkIjAxZ3yET48AImjdZpDslDBL7QhuCh8brHojQppVE3N02X2PNtf48EOKrBe8wsFP956a4fJEbIcUuHd/9o0f1q1VqPNAM6BQKy7CbacLawpLmbVFMjVa1t1bS2PV4jE9yfMiVO5zROvOI141t39ga46EcQeqI3ULvhnp5NnW6omPyXjTqGogFiNRLpnw== Received: from SV0P279CA0031.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:12::18) by DB9PR10MB4508.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:22c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Tue, 14 Dec 2021 16:03:13 +0000 Received: from HE1EUR01FT061.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:12:cafe::5c) by SV0P279CA0031.outlook.office365.com (2603:10a6:f10:12::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17 via Frontend Transport; Tue, 14 Dec 2021 16:03:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT061.mail.protection.outlook.com (10.152.1.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Tue, 14 Dec 2021 16:03:12 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 14 Dec 2021 17:03:11 +0100 Received: from md1za8fc.ad001.siemens.net (139.25.69.80) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 14 Dec 2021 17:03:11 +0100 From: Henning Schild To: CC: , Henning Schild Subject: [PATCH v2 2/3] debianize: prepend changelog entries Date: Tue, 14 Dec 2021 17:03:03 +0100 Message-ID: <20211214160304.5027-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211214160304.5027-1-henning.schild@siemens.com> References: <20211214160304.5027-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.69.80] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cae76bf6-e93d-4dc7-60ba-08d9bf1b3b55 X-MS-TrafficTypeDiagnostic: DB9PR10MB4508:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2958; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AyHRZDrpUeJvev+vVf7FC9dnylmoKIGyYGW0F+f84F/JensvHplSxMqRnDB4WXM/uOHbEGuMQ7nqJkOXf5fw/QzfzPWEz1zL9hNnFIpPzJmZfZQXCBjw6weT27ezZZpHSVYgQpknppZerRJibIsBv7wMEkPK1jDZnYwC1pnU12NQ62BMHi39Wx4pLLKv+Ju+PbINCza/iIWfXVdrPKxUAxPs3+GIrjQ49QVac9IwsoYWC+lvG0czsUeCtzmdd1+IWRGTWIyQaXbsfU8AKz5JZN7FLkrZCcn3fWbjj/U7FPEAEJ4ZOhxTyEZob86cAl6B6uSlHdU1aw/SMIOcP48e946WtO0KOMVkY7pJECCW0lCUP6sP4HvV6HucVf++dWSc3bZV3iOiqUONc9OgW+/lLkaa2DJdvAx8zMjceTPAoCwRMLYYffdBsAv8rKL4WnsBeStzPnaEansJSh/XjNJxd4GcshA8RE/7FqAYk6xlUWYtQ9xJRjSnjR+D0H0m7HJvcN2Rzn9P43qJw91ZOU6gU6915UABkJniLaaY7LH+CrYdRmspEekw7yBEIYw779GIfb3N+cL/z94GJWpx4snWwEavjz3waBUQj8TOKo7DgsdYwNvNYBDdHafIu+eTHivbU6KP+WzEOS7S4aNEsCh9s4n4f2FUme9QjplGp9rkhCeOGDlQ6w+JoQoKlq7fsaA1V7srP/ieEkPzsPcXjhabEgYkjGXr0JrvTQ0OBBIuR5HEXog0jyXFaskbO7YuAiXA10BYGZQlvdGH6Vowf6/u3KRX8ZZYxUVfjgtTv5gOa44WnJE0GqI7HbxkNVqN6lypM8DQR5npAMfcBW6G053/WQ== X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(356005)(47076005)(16526019)(956004)(2906002)(70586007)(7636003)(36756003)(336012)(70206006)(6916009)(1076003)(6666004)(2616005)(7596003)(186003)(82960400001)(26005)(107886003)(82310400004)(316002)(44832011)(40460700001)(8936002)(5660300002)(8676002)(36860700001)(83380400001)(508600001)(86362001)(54906003)(4326008)(207903002)(219803003);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 16:03:12.8859 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cae76bf6-e93d-4dc7-60ba-08d9bf1b3b55 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT061.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB4508 X-TUID: o8ybMMnuUwYS 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 d315b5bf44a9..d125256a2285 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