From c5137ff7f2eb5aae62d4229279b59021a64a673f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 23 Jun 2015 18:56:28 -0400 Subject: [PATCH] profiles: replace efunctions with gentoo-functions in @system --- .../profiles/coreos/base/package.accept_keywords | 5 ----- .../coreos-overlay/profiles/features/systemd/packages | 2 +- .../coreos-overlay/profiles/features/systemd/packages.build | 2 +- 3 files changed, 2 insertions(+), 7 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 22b625068c..21f2b22b55 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 @@ -26,11 +26,6 @@ =app-benchmarks/i7z-0.27-r1 ~amd64 =dev-libs/opencryptoki-2.4.2 ~amd64 -# Replace the function.sh script in baselayout -=sys-apps/efunctions-1 ~amd64 ~x86 - -#=dev-libs/libxml2-2.9.0-r1 ~amd64 - # CRIU dependencies =dev-libs/protobuf-c-0.15 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages index 2d4ed12f5b..92783beb68 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages @@ -1,4 +1,4 @@ # Add systemd to the 'system' set -*sys-apps/efunctions +*sys-apps/gentoo-functions *sys-apps/systemd -*sys-apps/openrc diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build index 12a43c51e8..a3d7e98b94 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build @@ -1,3 +1,3 @@ sys-apps/dbus -sys-apps/efunctions +sys-apps/gentoo-functions -sys-apps/openrc