From adf6418fac56629292c05e08cb68d3165d7a05c8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 28 Dec 2016 16:52:02 -0800 Subject: [PATCH] profiles: disable systemd+gnutls globally instead of for targets only The flag is harmless in the SDK but unneeded. Keeping it disabled reduces the amount of diff noise when updating portage-stable/profiles. --- .../coreos-overlay/profiles/coreos/base/package.use | 5 +++-- .../profiles/coreos/targets/generic/package.use | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 5196ea6a52..732ded3933 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -36,8 +36,9 @@ net-analyzer/nmap ncat -lua # removes mta dependencies app-admin/sudo -sendmail -# use lzma which is the default on non-gentoo systems -sys-apps/systemd curl gcrypt lzma -lz4 +# use lzma which is the default on non-gentoo systems, avoid pulling in gnutls +sys-apps/systemd curl gcrypt lzma -lz4 -ssl +net-libs/libmicrohttpd -ssl # disable kernel config detection and module building net-firewall/ipset -modules diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index 1142d571d4..24bf0ed15e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -22,11 +22,11 @@ sys-libs/ncurses minimal sys-libs/pam -berkdb sys-libs/gdbm berkdb -# enable journal gateway and container features, avoid pulling in gnutls -sys-apps/systemd audit importd http nat -ssl +# enable journal gateway and container features +sys-apps/systemd audit importd http nat # epoll is needed for systemd-journal-remote to work. coreos/bugs#919 -net-libs/libmicrohttpd epoll -ssl +net-libs/libmicrohttpd epoll sys-boot/syslinux -custom-cflags