From b4272247fb6fe53ddca5ab87c214061126101412 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 3 May 2017 20:46:50 -0700 Subject: [PATCH] profiles: clean up some redundant versions --- .../coreos/arm64/package.accept_keywords | 10 +++---- .../profiles/coreos/arm64/package.provided | 1 - .../coreos/base/package.accept_keywords | 30 +------------------ .../profiles/coreos/base/package.mask | 2 -- .../coreos/targets/generic/package.provided | 1 - 5 files changed, 5 insertions(+), 39 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index ad401bb5a8..bc08910a44 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -1,11 +1,10 @@ # arm64 keywords # Keep these in alphabetical order. -=app-admin/sudo-1.8.16 ~arm64 -=app-arch/unzip-6.0_p20 ~arm64 =app-crypt/gnupg-2.1.15 ~arm64 -=app-crypt/pinentry-0.9.7 ~arm64 =app-editors/vim-8.0.0106 ~arm64 +=app-shells/bash-completion-2.4-r1 ~arm64 +=app-shells/gentoo-bashcomp-20140911 ~arm64 =app-text/asciidoc-8.6.9-r3 ~arm64 =dev-cpp/gflags-2.1.2 ~arm64 =dev-cpp/glog-0.3.1 ** @@ -15,8 +14,6 @@ =dev-libs/libevent-2.1.8 ~arm64 =dev-libs/libksba-1.3.5-r1 ~arm64 =dev-libs/liblinear-210-r1 ~arm64 -=dev-libs/libxml2-2.9.4-r1 ~arm64 -=dev-libs/npth-1.2 ~arm64 =dev-libs/nspr-4.13.1 ~arm64 =dev-libs/nss-3.29.5 ~arm64 =dev-libs/userspace-rcu-0.9.1 ** @@ -37,11 +34,12 @@ =sys-apps/lshw-02.17b-r2 ** =sys-apps/rng-tools-5-r2 ** =sys-apps/smartmontools-6.4 ** +=sys-apps/util-linux-2.28.2 ~arm64 =sys-block/parted-3.2-r1 ~arm64 -=sys-devel/bison-3.0.4-r1 ~arm64 =sys-fs/cryptsetup-1.7.2 ** =sys-fs/lsscsi-0.28 ** =sys-fs/mdadm-3.4 ** =sys-fs/quota-4.02 ** =sys-fs/squashfs-tools-4.3-r2 ~arm64 +=sys-libs/libcap-ng-0.7.8 ~arm64 =virtual/perl-Data-Dumper-2.158.0-r1 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided index 9f6f778817..4e24a6a221 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided @@ -1,7 +1,6 @@ # arm64 provided dev-libs/gobject-introspection-1.40.0-r1 -dev-util/boost-build-1.55.0 # build errors net-dns/bind-tools-9.10.1_p1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index dd23b48065..48e6bb44a3 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -10,14 +10,6 @@ =dev-util/perf-4.9.13 ~amd64 =sys-libs/libnih-1.0.3 ~amd64 -# Get updated core code -=net-misc/tlsdate-0.0.5 ~amd64 -=dev-libs/libgpg-error-1.10-r1 ~amd64 -=net-misc/dhcp-4.2.2-r1 ~amd64 - -# CRIU dependencies -=dev-libs/protobuf-c-0.15 ~amd64 - # Everything needed for the boot engine >=sys-apps/kexec-tools-2.0.4-r1 ~amd64 sys-kernel/dracut ~amd64 @@ -32,9 +24,6 @@ dev-python/oauth2client dev-python/protorpc net-misc/gsutil -# Fixes XML validation failure and python eclass usage -=dev-lang/yasm-1.2.0-r1 - # efitools and dependency libraries for signing kernel images >=sys-boot/gnu-efi-3.0u ~amd64 >=app-crypt/efitools-1.4.1-r2 ~amd64 @@ -47,26 +36,12 @@ dev-util/checkbashisms ~app-emulation/xen-tools-4.4.1 ~app-emulation/xen-pvgrub-4.4.1 -# Fixes a few bugs but has not yet been marked stable upstream. -=app-arch/lbzip2-2.5 - -# required by systemd v229 -=sys-apps/util-linux-2.27.1 - -# 1.5 has fixed version string. coreos/bugs#455 -=app-misc/jq-1.5-r1 ~amd64 ~arm64 - # https://bugs.gentoo.org/show_bug.cgi?id=548158 =sys-apps/gentoo-functions-0.10 # Avoid cross compile error with amd64 stable (elfutils-0.158). =dev-libs/elfutils-0.161 ~amd64 -# Provides useful new pages like loop(4) -=sys-apps/man-pages-4.00 -# Fixes conflict with man-pages 4.00 -=sys-apps/attr-2.4.47-r2 - # newer btrfs-progs improve things like preserving capabilities in send/receive # https://github.com/coreos/bugs/issues/923 =sys-fs/btrfs-progs-4.2.2 ~amd64 ~arm64 @@ -74,13 +49,10 @@ dev-util/checkbashisms # Get a newer version of pylint =dev-python/astng-0.21.1 ~amd64 =dev-python/pylint-0.23.0 ~amd64 -=dev-python/pyusb-0.4.3 ~amd64 +=dev-python/pyusb-1.0.0 ~amd64 =dev-lang/nasm-2.09.10 ~amd64 -# use this wget to get slotted openssl dep. -=net-misc/wget-1.17.1-r1 ~amd64 ~arm64 - # Older versions of sssd fail to build =sys-auth/sssd-1.13.1 ~amd64 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index 2b39d4ee92..b03bf171c2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -7,8 +7,6 @@ # version of these packages even if a newer stable version becomes # available in portage: ->=net-misc/tlsdate-0.0.6 - # Stick with python 2 for now >=dev-lang/python-3 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided index 4ce50f6322..0ee711be30 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided @@ -5,7 +5,6 @@ # disable them and we have no need/use for them in prod images. # pulled in by app-crypt/pinentry -app-admin/eselect-pinentry-0.3 app-eselect/eselect-pinentry-0.4 # pulled in by app-editors/vim