From 3164ae5fe0c926913e0d549e7e80c61576ee816c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 27 Aug 2013 20:33:03 -0700 Subject: [PATCH] fix(sys-apps/baselayout): Don't install /etc/issue on target systems. This is handled in /run by coreos-init scripts. --- ...layout-2.2-r100.ebuild => baselayout-2.2-r101.ebuild} | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-2.2-r100.ebuild => baselayout-2.2-r101.ebuild} (97%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r101.ebuild similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r101.ebuild index 87bec47c8d..e77d8f3d6e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r101.ebuild @@ -12,7 +12,9 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="build kernel_linux" +IUSE="build cros_host kernel_linux" + +RDEPEND="cros_host? ( !coreos-base/coreos-init )" pkg_setup() { multilib_layout @@ -172,6 +174,11 @@ src_install() { # rc-scripts version for testing of features that *should* be present echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release + + if use !cros_host; then + # Don't install /etc/issue since it is handled by coreos-init + rm "${D}"/etc/issue + fi } pkg_postinst() {