From ecf53d9c33ba30156611bd7f340bbc083baf08fc Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 17 Dec 2015 09:19:22 -0800 Subject: [PATCH 1/2] Revert "profiles/coreos/base/package.accept_keywords: remove unused sys-process/criu dependency dev-libs/protobuf-c-0.15" This reverts commit 038c121d28c358c15136d7792e662390b11fd7b7. --- .../profiles/coreos/base/package.accept_keywords | 3 +++ 1 file changed, 3 insertions(+) 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 e30f5f3413..c6131d6ac6 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 @@ -15,6 +15,9 @@ =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 From ac406bac2c63e43e2902907d45485f8700552aad Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 17 Dec 2015 10:07:33 -0800 Subject: [PATCH 2/2] profiles: fix package.accept_keywords Broken by 3ad7eb629fbafe4277b0c6ff71bc40f893929399. --- .../profiles/coreos/base/package.accept_keywords | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 c6131d6ac6..477537c4f4 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 @@ -90,9 +90,9 @@ dev-util/checkbashisms =sys-fs/btrfs-progs-4.2.2 ~amd64 ~arm64 # 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/astng-0.21.1 ~amd64 +=dev-python/pylint-0.23.0 ~amd64 +=dev-python/pyusb-0.4.3 ~amd64 -=dev-lang/nasm-2.09.10 amd64 x86 +=dev-lang/nasm-2.09.10 ~amd64