From 00c4953f9a0e2967c2cbffc790ea4c952b678b77 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 14 Jan 2014 17:25:32 -0800 Subject: [PATCH] feat(coreos-base/coreos-init): add symlink-usr flag support Via https://github.com/coreos/init/pull/34 --- ...t-0.0.1-r31.ebuild => coreos-init-0.0.1-r32.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-0.0.1.ebuild | 10 +++++++--- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 8 ++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r31.ebuild => coreos-init-0.0.1-r32.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r31.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r32.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r31.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r32.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild index f4f37a6ee7..115d9b7a7b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="8c14083fd2c53798a84c470b7bb3ecaabb17d940" +CROS_WORKON_COMMIT="3bc9aad424c62af50c5df7b32351bf96b2750ec6" CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_LOCALNAME="init" EGIT_REPO_URI="https://github.com/coreos/init" @@ -17,7 +17,7 @@ SRC_URI="" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 arm x86" -IUSE="test" +IUSE="test symlink-usr" # Daemons we enable here must installed during build/install in addition to # during runtime so the systemd unit enable step works. @@ -36,7 +36,11 @@ RDEPEND="${DEPEND} " src_install() { - default + if use symlink-usr ; then + emake DESTDIR="${D}" install-usr + else + emake DESTDIR="${D}" install + fi # Set the default target to multi-user not graphical, this is CoreOS! dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index e625a35a3f..deecc632dc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -16,7 +16,7 @@ SRC_URI="" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="test" +IUSE="test symlink-usr" # Daemons we enable here must installed during build/install in addition to # during runtime so the systemd unit enable step works. @@ -34,7 +34,11 @@ RDEPEND="${DEPEND} " src_install() { - default + if use symlink-usr ; then + emake DESTDIR="${D}" install-usr + else + emake DESTDIR="${D}" install + fi # Set the default target to multi-user not graphical, this is CoreOS! dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target