[PATCH 1/2] isar-exclude-docs: remove only files in postinst

[PATCH 1/2] isar-exclude-docs: remove only files in postinst

[Henning Schild]

From: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>

That aligns us with the dpkg.conf.d snippet which in fact leaves empty
directories in place.

Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/recipes-support/isar-exclude-docs/files/postinst           | 2 +-
 .../{isar-exclude-docs_0.2.bb => isar-exclude-docs_0.2.1.bb}    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/isar-exclude-docs/{isar-exclude-docs_0.2.bb => isar-exclude-docs_0.2.1.bb} (100%)

diff --git a/meta/recipes-support/isar-exclude-docs/files/postinst b/meta/recipes-support/isar-exclude-docs/files/postinst
index d34c04ea47f0..581cdc1339e8 100644
--- a/meta/recipes-support/isar-exclude-docs/files/postinst
+++ b/meta/recipes-support/isar-exclude-docs/files/postinst
@@ -3,5 +3,5 @@
 # time and do not need to be "the first" package
 # what we delete needs to be in sync with the dpkg configuration we ship
 
-rm -rf /usr/share/man/*
+find /usr/share/man/ -type f -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.2.bb b/meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.1.bb
similarity index 100%
rename from meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.bb
rename to meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.1.bb
-- 
2.35.1

[PATCH 2/2] isar-exclude-docs: delete also links not just files

[Henning Schild]

From: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>

Do not match files but instead everything but directories. And also drop
the "-r" for the rm it is not needed.

Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/recipes-support/isar-exclude-docs/files/postinst         | 4 ++--
 ...{isar-exclude-docs_0.2.1.bb => isar-exclude-docs_0.2.2.bb} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/isar-exclude-docs/{isar-exclude-docs_0.2.1.bb => isar-exclude-docs_0.2.2.bb} (100%)

diff --git a/meta/recipes-support/isar-exclude-docs/files/postinst b/meta/recipes-support/isar-exclude-docs/files/postinst
index 581cdc1339e8..78e5d58354ea 100644
--- a/meta/recipes-support/isar-exclude-docs/files/postinst
+++ b/meta/recipes-support/isar-exclude-docs/files/postinst
@@ -3,5 +3,5 @@
 # time and do not need to be "the first" package
 # what we delete needs to be in sync with the dpkg configuration we ship
 
-find /usr/share/man/ -type f -exec rm -rf {} \;
-find /usr/share/doc/ -type f ! -name "copyright" ! -name "changelog.*" -exec rm -rf {} \;
+find /usr/share/man/ ! -type d -exec rm -f {} \;
+find /usr/share/doc/ ! -type d ! -name "copyright" ! -name "changelog.*" -exec rm -f {} \;
diff --git a/meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.1.bb b/meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.2.bb
similarity index 100%
rename from meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.1.bb
rename to meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.2.bb
-- 
2.35.1

Re: [PATCH 2/2] isar-exclude-docs: delete also links not just files

[Henning Schild]

I tried that manually and the result looks good. I also tested the
installation of "openjdk-11-jre-headless", did not work before as
reported by Roberto, works after.

It is really about doing what that dpkg.conf does, not about making
sure that package can be installed .. but it can now.

The ubuntu scripts make sure all is like dpkg.conf by re-installing all
packages that deployed anything to the excluded paths in their
containers and livecds. But that is really not nice so i would not want
to copy that pattern.

https://git.launchpad.net/livecd-rootfs/tree/live-build/auto/build#n197

Henning

Am Fri, 23 Sep 2022 16:53:32 +0200
schrieb Henning Schild <henning.schild@siemens.com>:

> From: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>
> 
> Do not match files but instead everything but directories. And also
> drop the "-r" for the rm it is not needed.
> 
> Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta/recipes-support/isar-exclude-docs/files/postinst         | 4
> ++-- ...{isar-exclude-docs_0.2.1.bb => isar-exclude-docs_0.2.2.bb} | 0
>  2 files changed, 2 insertions(+), 2 deletions(-)
>  rename
> meta/recipes-support/isar-exclude-docs/{isar-exclude-docs_0.2.1.bb =>
> isar-exclude-docs_0.2.2.bb} (100%)
> 
> diff --git a/meta/recipes-support/isar-exclude-docs/files/postinst
> b/meta/recipes-support/isar-exclude-docs/files/postinst index
> 581cdc1339e8..78e5d58354ea 100644 ---
> a/meta/recipes-support/isar-exclude-docs/files/postinst +++
> b/meta/recipes-support/isar-exclude-docs/files/postinst @@ -3,5 +3,5
> @@ # time and do not need to be "the first" package
>  # what we delete needs to be in sync with the dpkg configuration we
> ship 
> -find /usr/share/man/ -type f -exec rm -rf {} \;
> -find /usr/share/doc/ -type f ! -name "copyright" ! -name
> "changelog.*" -exec rm -rf {} \; +find /usr/share/man/ ! -type d
> -exec rm -f {} \; +find /usr/share/doc/ ! -type d ! -name "copyright"
> ! -name "changelog.*" -exec rm -f {} \; diff --git
> a/meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.1.bb
> b/meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.2.bb
> similarity index 100% rename from
> meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.1.bb
> rename to
> meta/recipes-support/isar-exclude-docs/isar-exclude-docs_0.2.2.bb

Re: [PATCH 2/2] isar-exclude-docs: delete also links not just files

[Roberto A. Foglietta]

[-- Attachment #1: Type: text/plain, Size: 827 bytes --]

Il giorno ven 23 set 2022 alle ore 18:30 Henning Schild <
henning.schild@siemens.com> ha scritto:

> I tried that manually and the result looks good. I also tested the
> installation of "openjdk-11-jre-headless", did not work before as
> reported by Roberto, works after.
>
> It is really about doing what that dpkg.conf does, not about making
> sure that package can be installed .. but it can now.
>
> The ubuntu scripts make sure all is like dpkg.conf by re-installing all
> packages that deployed anything to the excluded paths in their
> containers and livecds. But that is really not nice so i would not want
> to copy that pattern.
>
> https://git.launchpad.net/livecd-rootfs/tree/live-build/auto/build#n197


Thanks a lot for your effort in going deep into the question and verifying
the outcome. I appreciate that. R-

[-- Attachment #2: Type: text/html, Size: 1340 bytes --]

Re: [PATCH 1/2] isar-exclude-docs: remove only files in postinst

[Anton Mikanovich]

23.09.2022 17:53, Henning Schild wrote:
> From: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>
>
> That aligns us with the dpkg.conf.d snippet which in fact leaves empty
> directories in place.
>
> Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>

Patchset was applied to next, thanks.