From 39d77f26b633b8946db9ff5dbeb44ed2606302cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Wed, 8 Sep 2021 14:54:54 +0200 Subject: [PATCH] distro/rhel90: always install docs in the rpm stage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we firstly introduced the v2 manifests, we excluded docs from all rpm stages because it doesn't make sense to include docs in edge images. However, when we ported the other image types to v2, we left the flag on. The side effect of --excludedocs is that we no longer install man pages into the image. This the default behaviour of rpm and can be seen here: https://github.com/rpm-software-management/rpm/blob/b88f43b9a3bf39a92ba8ca511d33fdc60f399c1e/macros.in#L555 This is actually quite a major regression in non-edge images, thus this commit reverts this setting. It would be great to have the option not to install docs in some rpm stages but as this is a difficult topic and we're already past the deadline, we will consider this in the future. Signed-off-by: Ondřej Budai --- internal/distro/rhel90/stage_options.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/distro/rhel90/stage_options.go b/internal/distro/rhel90/stage_options.go index 3d08e997c..7456136fc 100644 --- a/internal/distro/rhel90/stage_options.go +++ b/internal/distro/rhel90/stage_options.go @@ -29,10 +29,6 @@ func rpmStageOptions(repos []rpmmd.RepoConfig) *osbuild.RPMStageOptions { return &osbuild.RPMStageOptions{ GPGKeys: gpgKeys, - Exclude: &osbuild.Exclude{ - // NOTE: Make configurable? - Docs: true, - }, } }