From 18db4d8f8675616563ef6182adad2a64a373efe7 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 20 Jun 2013 17:50:17 -0400 Subject: [PATCH] add(sys-apps/efunctions): Replace coreos-base version with generic one. This version of efunctions does not depend on cros workon and git to install and thus is suitable for bootstrapping. It also uses the original author as the upstream rather than a coreos mirror. Since it is not coreos specific any more I've moved it to sys-apps. Added to both system and bootstrap package sets. For extra fun it is also in my new systemd-only Gentoo overlay: https://github.com/marineam/systemd-only-overlay --- .../efunctions/efunctions-9999.ebuild | 39 ------------------- .../default/linux/package.accept_keywords | 2 +- .../profiles/default/linux/package.mask | 3 ++ .../profiles/default/linux/packages | 1 + .../profiles/default/linux/packages.build | 1 + .../sys-apps/efunctions/Manifest | 1 + .../sys-apps/efunctions/efunctions-1.ebuild | 39 +++++++++++++++++++ 7 files changed, 46 insertions(+), 40 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/Manifest create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/efunctions-1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild deleted file mode 100644 index e4f0d0463e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2013 Brandon Philips. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 -# $Header:$ -# - -EAPI=3 -CROS_WORKON_PROJECT="coreos/efunctions" -CROS_WORKON_LOCALNAME="efunctions" -inherit eutils cros-workon - -DESCRIPTION="standalone replacement for functions.sh" -HOMEPAGE="https://bitbucket.org/coreos/efunctions" -SRC_URI="" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -src_install() { - emake DESTDIR="${D}" install || die - - # make functions.sh available in /etc/init.d - # Note: we cannot replace the symlink with a file here, or Portage will - # config-protect it, and etc-update can't handle symlink to file updates - dodir etc/init.d - dosym ../../usr/lib/efunctions/functions.sh /etc/init.d/functions.sh - - local dst_dir=/usr/lib/${PN} - dodir $dst_dir || die - insinto $dst_dir - - doins ${S}/functions.sh - doins -r ${S}/efunctions - - fperms -R +x $dst_dir - -} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords index 7cef49f6cf..1506117e7d 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords @@ -84,7 +84,7 @@ =dev-lang/go-1.1 ~amd64 # Replace the function.sh script in baselayout -=coreos-base/efunctions-9999 ~amd64 ~x86 +=sys-apps/efunctions-1 ~amd64 ~x86 # Projects we are actively hacking on in coreos =coreos-base/update_engine-9999 ~amd64 ~x86 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask index 01622cffaf..4a1e4af959 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask @@ -13,3 +13,6 @@ # libpng security vulnerability fix