Skip to content

Commit

Permalink
Move documentation removal to toplevel manifest
Browse files Browse the repository at this point in the history
We do want docs for Fedora Silverblue at least.
  • Loading branch information
cgwalters committed Oct 6, 2020
1 parent 8d49032 commit cab3d07
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
8 changes: 0 additions & 8 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ check-groups:

default-target: multi-user.target

remove-files:
# We don't ship man(1) or info(1)
- usr/share/info
- usr/share/man
# Drop text docs too
- usr/share/doc


# ⚠⚠⚠ ONLY TEMPORARY HACKS ALLOWED HERE; ALL ENTRIES NEED TRACKER LINKS ⚠⚠⚠
# See also the version of this in fedora-coreos.yaml
postprocess:
Expand Down
7 changes: 7 additions & 0 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ remove-from-packages:
# overlay.d/14NetworkManager-plugins
- [NetworkManager, /usr/lib64/NetworkManager/.*/libnm-settings-plugin-ifcfg-rh.so]

remove-files:
# We don't ship man(1) or info(1)
- usr/share/info
- usr/share/man
# Drop text docs too
- usr/share/doc

# Things we don't expect to ship on the host. We currently
# have recommends: false so these could only come in via
# hard requirement, in which case the build will fail.
Expand Down
5 changes: 5 additions & 0 deletions tests/kola/misc-ro
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ if ! lsattr -d / | grep -qe '--i--'; then
fi
ok immutable bit

# See remove-files in the manifest
if test -d /usr/share/info; then
fatal "found /usr/share/info"
fi

switchroot_ts=$(get_journal_msg_timestamp 'Switching root.')
nm_ts=$(get_journal_msg_timestamp 'NetworkManager .* starting')
# by default, kola on QEMU shouldn't need to bring up networking
Expand Down

0 comments on commit cab3d07

Please sign in to comment.