Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Profile cleanups for package updates, 2020 edition #1783

Merged
merged 10 commits into from
Apr 4, 2022
Merged

Profile cleanups for package updates, 2020 edition #1783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
03c1e91
profiles: Drop dev-libs/elfutils from accept_keywords
krnowak Mar 9, 2022
339c99a
profiles: Drop net-libs/libnetfilter_queue from accept_keywords
krnowak Mar 9, 2022
6d914f6
profiles: Update accept_keywords for net-firewall/conntrack-tools
krnowak Mar 9, 2022
d163463
profiles: Drop outdated use flag for net-analyzer/tcpdump
krnowak Mar 9, 2022
b225d5c
profiles: Drop sys-fs/multipath-tools from accept_keywords
krnowak Mar 9, 2022
f07f040
profiles: Drop outdated use flag for net-dns/bind-tools
krnowak Mar 9, 2022
1ae8754
profiles: Drop net-libs/libnetfilter_conntrack from accept_keywords
krnowak Mar 9, 2022
f86b9b7
profiles: Disable pcre16 in dev-libs/libpcre2
krnowak Mar 29, 2022
08db994
profiles: Disable smi, ssl and samba in net-analyzer/tcpdump
krnowak Mar 29, 2022
a65300c
coreos/config: Workaround flaky checks in net-dns/bind-tools
krnowak Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions coreos/config/env/net-dns/bind-tools
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
# Work around failing OpenSSL feature detection.
EXTRA_ECONF="--without-ecdsa"
# Work around lame function attribute checks when cross-compiling.
# Linker emits a bunch of irrelevant warnings and that trips configure
# script up into thinking that those attributes are not
# supported. Upstream bind-tools already fixed that by being smarter
# and grepping for -Wattributes instead, but we are not yet packaging
# it. We also know that constructor and destructor attributes are
# supported - they are available since at least gcc 3.4.

EXTRA_ECONF+=" ax_cv_have_func_attribute_constructor=yes"
Copy link
Contributor

@tormath1 tormath1 Apr 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would almost be in favor of moving these options to the ebuild configuration step itself and move the ebuild to ::coreos-overlay to avoid spreading the configuration across various places...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that when I will focus more on the coreos-overlay packages, we will get to the point where we need to decide whether it is more important to keep the packages in portage-stable/gentoo at the expense of unified configuration, or to move them to coreos-overlay and modify them to our needs, but at a price of more maintainership effort needed.

For now, I'd say that I'd favor the former.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, bind-tools got a better check in newer versions, but gentoo is still packaging 9.16.x, instead of 9.18.x.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the lesser evil and allows us to consume unchanged upstream ebuilds in portage-stable.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'll try to make a patch for gentoo package that updates some m4 file, so we can eventually drop this file.

EXTRA_ECONF+=" ax_cv_have_func_attribute_destructor=yes"
4 changes: 1 addition & 3 deletions profiles/coreos/arm64/package.accept_keywords
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@
=dev-util/checkbashisms-2.21.4 ~arm64

=net-dns/c-ares-1.17.2 ~arm64
=net-firewall/conntrack-tools-1.4.5 ~arm64
=net-libs/libnetfilter_conntrack-1.0.8 ~arm64
=net-firewall/conntrack-tools-1.4.6-r1 ~arm64
=net-libs/libnetfilter_cthelper-1.0.0-r1 ~arm64
=net-libs/libnetfilter_cttimeout-1.0.0-r1 ~arm64
=net-libs/libnetfilter_queue-1.0.3 ~arm64
=net-misc/curl-7.79.1 ~arm64

=perl-core/File-Path-2.130.0 ~arm64
Expand Down
4 changes: 0 additions & 4 deletions profiles/coreos/base/package.accept_keywords
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
=dev-lang/rust-1.59.0 ~amd64 ~arm64
=virtual/rust-1.59.0 ~amd64 ~arm64

=dev-libs/elfutils-0.178 ~amd64

=dev-libs/libgcrypt-1.9.4 ~amd64 ~arm64

# needed for arm64 sdk
Expand All @@ -35,8 +33,6 @@

=sys-fs/cryptsetup-2.4.1-r1 ~amd64 ~arm64

=sys-fs/multipath-tools-0.8.5 ~amd64 ~arm64

=sys-libs/libseccomp-2.5.0 ~amd64 ~arm64

# We need 2.3.2, but it still marked as unstable on arm64. Can't
Expand Down
9 changes: 9 additions & 0 deletions profiles/coreos/base/package.use
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,12 @@ sys-apps/util-linux -su
# Enable kerberos support for NFS
net-fs/nfs-utils kerberos nfsv41 nfsv4 junction ldap libmount nfsdcld uuid
net-libs/libtirpc kerberos

# Disable enabled-by-default support for 16-bit characters, we didn't
# need it before, so we don't need it now.
dev-libs/libpcre2 -pcre16

# Disable extra stuff for tcpdump, there was no explanation why it was
# enabled by upstream. Samba was enabled to make some tests pass. But
# smi and ssl, no clue.
net-analyzer/tcpdump -ssl -smi -samba
4 changes: 0 additions & 4 deletions profiles/coreos/targets/generic/package.use
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dev-libs/dbus-glib tools
dev-libs/elfutils -utils
dev-libs/openssl pkcs11
dev-util/perf -doc -demangle -tui -ncurses -perl -python
net-analyzer/tcpdump -chroot
net-misc/dhcp -server
net-misc/ntp caps
sys-apps/smartmontools -daemon -update-drivedb -systemd
Expand All @@ -32,8 +31,5 @@ app-shells/bash -net vanilla
# needed by docker
sys-libs/libseccomp static-libs

# bind-tools' configure script breaks when cross-compiling with seccomp enabled
net-dns/bind-tools -seccomp

# Gentoo's new hardened profile disables PIC, but open-vm-tools needs it
app-emulation/open-vm-tools pic