From 7bd16b8c0eccd212c925d97fb1d7215ef9f27e05 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 4 Dec 2013 16:34:10 -0800 Subject: [PATCH 1/2] fix(profiles): Use sys-block/thin-provisioning-tools-0.2.8-r1 This moves ruby from RDEPENDS to DEPENDS behind the 'test' USE flag. --- .../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 09ad5ab53e..8b81d913b6 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 @@ -69,3 +69,6 @@ =sys-fs/aufs-util-3* ~amd64 =sys-fs/aufs-headers-3* ~amd64 =dev-util/boost-build-1.52.0-r1 ~amd64 + +# Fixes ruby dependency +=sys-block/thin-provisioning-tools-0.2.8-r1 ~amd64 From 3341e004505b3b62b149d1e1c840547dd58c29db Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 4 Dec 2013 16:52:43 -0800 Subject: [PATCH 2/2] hack(coreos-base/hard-host-depends): Work around lvm's configure script path detection --- ...1-r155.ebuild => hard-host-depends-0.0.1-r156.ebuild} | 0 .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 9 +++++++++ 2 files changed, 9 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r155.ebuild => hard-host-depends-0.0.1-r156.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r155.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r156.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r155.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r156.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index 412281799b..f372563cfb 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -195,6 +195,15 @@ RDEPEND="${RDEPEND} dev-util/lcov " +# Pull tis into / or patch the lvm ebuild to configure with: +# --with-thin-check=/sbin/thin_check +# --with-thin-dump=/sbin/thin_dump +# --with-thin-repair=/sbin/thin_repair +# This will work for now until the proper fix is merged upstream. +RDEPEND="${RDEPEND} + >=sys-block/thin-provisioning-tools-0.2.8-r1 + " + # Uninstall these packages. RDEPEND="${RDEPEND} !net-misc/dhcpcd