From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7004736244321091584 X-Received: by 2002:ac2:558e:: with SMTP id v14mr8989827lfg.424.1630917248869; Mon, 06 Sep 2021 01:34:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:55b7:: with SMTP id y23ls692207lfg.1.gmail; Mon, 06 Sep 2021 01:34:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfYVh0jkX+EcLZciZ2WdpDT8cJp5ZPPI2dwoVrI+sWDp/GlGo/gSuT969oH1+MLZakDKWI X-Received: by 2002:a05:6512:1397:: with SMTP id p23mr4457274lfa.39.1630917247772; 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=YdrdCR2IfkrRvrMGNrNbjG94yayrNb2GtyGJZ1PXDAd5Yci17GW6tcUeu4y1WYwUay XRYO/2RpNrsWHOKoysI3fBxAo4FRei5WGnRMStGoSPU+9xU1FzANiZMjinkz2obMuJiN DRjdgbhynisDPdwf+PphIJ3dPAT523t0urt0u+p+qcqCHuP5poFwcoPfn1p9EgNFAdmB 3NG/GrL5gKRnsFV4XmyghEJxW+jE1OJuy+jCkZC0RVTvS2hacC2e/RKoVf9D8HK1JQ80 clYoFn1sCcdaJFGHP4w+hYRzMCOMaRRlDntWig3xnnKI5jBR4CAhp4pFtCwLYDZg9fT+ wsJg== 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=LhtPFd4i3R222chV2hONvHUmnAi/Y0rDAaQCUewnXuQ=; b=Q8dzBqM+bX/5BuHxcCzNWGPBR5vgxIagxRo3N1X5bFRxByDd8UyetHbzM1OGixPO1s wra1hnelHcwK+A168p7sUg8JzVaxEtDjsiiAbv2OegJxAEvNNuA+zacxLOAj6hyjdoAt fg1BFHfra6ACH+oV9PkGctMyP72XOw5fRKmsXEgse6KgrpKlBzJM+RI3/0Q+Xra4qH6b Hcd3O3e3Vi0Rdy1GRgQJbYdWw4OwW1mhsBDifd4L+BSovi31y314P6rgGfq2GGPLVYII n2wAyqSrwXCKnc1gZQYpV4TDXF0k023Kb13LhKDfurRsQb1YDFc0eBlSQCWQ9Or40J2l NNjg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id i12si388032lfc.10.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.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 1868Y6Jm028056 (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 1868Y6WA001575; Mon, 6 Sep 2021 10:34:06 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Cedric Hombourger , Henning Schild , Venkata.Pyla@toshiba-tsip.com Subject: [PATCH 3/3] isar-exclude-docs: include "native" package changelogs Date: Mon, 6 Sep 2021 10:34:03 +0200 Message-Id: <20210906083403.25163-3-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: QGSJ0XaJOG0L So called "native" packages will put the debian changelog into the package as "changelog" and not "changelog.Debian". dh_installchangelogs(1) We have the file from ubuntu and with this change we start doing things differently. For isar "raw" packages will be "native" so we probably want that no matter what ubuntu might think. I still started a discussion on the topic. https://github.com/tianon/docker-brew-ubuntu-core/issues/216 This was found when working on reproducible builds, for some reason the changelogs of the raw packages did not differ, because they are not in the rootfs. Reported-by: Signed-off-by: Henning Schild --- meta/recipes-support/isar-exclude-docs/files/isar-exclude-docs | 2 +- meta/recipes-support/isar-exclude-docs/files/postinst | 2 +- .../{isar-exclude-docs_0.1.bb => isar-exclude-docs_0.2.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/isar-exclude-docs/{isar-exclude-docs_0.1.bb => isar-exclude-docs_0.2.bb} (100%) diff --git a/meta/recipes-support/isar-exclude-docs/files/isar-exclude-docs b/meta/recipes-support/isar-exclude-docs/files/isar-exclude-docs index 5bec6260fddd..a77a47d1fe01 100644 --- a/meta/recipes-support/isar-exclude-docs/files/isar-exclude-docs +++ b/meta/recipes-support/isar-exclude-docs/files/isar-exclude-docs @@ -8,4 +8,4 @@ path-exclude=/usr/share/doc/* path-include=/usr/share/doc/*/copyright # ... and Debian changelogs -path-include=/usr/share/doc/*/changelog.Debian.* +path-include=/usr/share/doc/*/changelog.* diff --git a/meta/recipes-support/isar-exclude-docs/files/postinst b/meta/recipes-support/isar-exclude-docs/files/postinst index f6c0d1b2df52..d34c04ea47f0 100644 --- a/meta/recipes-support/isar-exclude-docs/files/postinst +++ b/meta/recipes-support/isar-exclude-docs/files/postinst @@ -4,4 +4,4 @@ # what we delete needs to be in sync with the dpkg configuration we ship rm -rf /usr/share/man/* -find /usr/share/doc/ -type f ! -name "copyright" ! -name "changelog.Debian.*" -exec rm -rf {} \; +find /usr/share/doc/ -type f ! -name "copyright" ! -name "changelog.*" -exec rm -rf {} \; diff --git a/meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.1.bb b/meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.bb similarity index 100% rename from meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.1.bb rename to meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.bb -- 2.32.0