Merge pull request #25 from marineam/bootstrap

Bootstrap

sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild

@@ -0,0 +1 @@
+core-admin-0.0.1.ebuild

sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild

@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2013 Brandon Philips. All rights reserved.
+# Distributed under the terms of the MIT License
+# $Header:$
+#
+
+EAPI=2
+CROS_WORKON_COMMIT="54aba86ecd7cd32c3488df9dc9beab27b37cec0b"
+CROS_WORKON_PROJECT="coreos/core-admin"
+CROS_WORKON_LOCALNAME="core-admin"
+CROS_WORKON_REPO="git://github.com"
+inherit toolchain-funcs cros-workon
+
+DESCRIPTION="systemd over rest"
+HOMEPAGE="https://github.com/coreos/core-admin"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.0.2"
+
+src_compile() {
+	export GOPATH="${S}"
+	go get
+	go build -o ${PN} || die
+}
+
+src_install() {
+	dobin ${S}/${PN}
+}

sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild

@@ -7,6 +7,7 @@
 EAPI=2
 CROS_WORKON_PROJECT="coreos/core-admin"
 CROS_WORKON_LOCALNAME="core-admin"
+CROS_WORKON_REPO="git://github.com"
 inherit toolchain-funcs cros-workon
 
 DESCRIPTION="systemd over rest"

sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild

@@ -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
-
-}

sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild

@@ -38,7 +38,8 @@ RDEPEND="app-arch/bzip2
 	sys-apps/rootdev
 	sys-fs/e2fsprogs
 	virtual/udev"
-DEPEND="dev-cpp/gmock
+DEPEND="coreos-base/system_api
+	dev-cpp/gmock
 	dev-cpp/gtest
 	cros_host? ( dev-util/scons )
 	${RDEPEND}"

sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf

@@ -1 +1 @@
-LATEST_RELEASE_CHROME_BINHOST=http://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/chrome-27.05.11.033811/packages/
+LATEST_RELEASE_CHROME_BINHOST=""

sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf

@@ -1 +1 @@
-PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/amd64-generic/paladin-R26-3659.0.0-rc7/packages/ https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/x86-generic/paladin-R26-3659.0.0-rc7/packages/"
+PREFLIGHT_BINHOST=""

sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf

@@ -1 +1 @@
-TOT_CHROME_BINHOST="http://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/chrome-26.05.11.214444/packages/"
+TOT_CHROME_BINHOST=""

sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf

@@ -1,3 +1,3 @@
-SDK_LATEST_VERSION="2013.03.07.000000"
+SDK_LATEST_VERSION="20130621235834"
-BOOTSTRAP_LATEST_VERSION="20130130"
+BOOTSTRAP_LATEST_VERSION="20130621235834"
 TC_PATH="2013/03/%(target)s-2013.03.07.000000.tar.xz"

sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host

@@ -7,7 +7,7 @@ LDFLAGS="-Wl,-O2 -Wl,--as-needed"
 FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
           -ebuild-locks parallel-install sandbox -strict userfetch userpriv
           usersandbox -unknown-features-warn"
-USE="-openrc"
+
 # Since our portage comes from version control, we redirect distfiles
 DISTDIR="/var/lib/portage/distfiles"
 
@@ -39,12 +39,13 @@ PKGDIR="/var/lib/portage/pkgs"
 
 PORT_LOGDIR="/var/log/portage"
 
-source /usr/local/portage/coreos/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf
+# Our first round of binary packages!
-FULL_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/amd64-host/chroot-2013.02.04.090227/packages/"
+# legacy contains the old x86_64-cros-linux-gnu toolchain since I haven't
-PORTAGE_BINHOST="$PREFLIGHT_BINHOST $FULL_BINHOST"
+# rebuilt it yet. 20130621235834 contains everything built by bootstrap_sdk
-
+PORTAGE_BINHOST="
-# expat needed for XML parsing in GDB, but enable globally as overhead is tiny.
+    http://storage.core-os.net/coreos/sdk/experimental/legacy/pkgs/
-USE="${USE} -cups hardened cros_host multilib pic pie -introspection expat"
+    http://storage.core-os.net/coreos/sdk/experimental/20130621235834/pkgs/
+"
 
 GENTOO_MIRRORS="
 	http://gentoo.osuosl.org/

sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target

@@ -10,9 +10,6 @@ ACCEPT_KEYWORDS="amd64"
 # Common settings across all board targets.
 source make.conf.common
 
-# Recommended x86-specific USE flags.
-USE="${USE} mmx sse sse2 dri hardened"
-
 # Recommended MARCH_TUNE, CFLAGS, etc.
 MARCH_TUNE=""
 

sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target

@@ -13,7 +13,6 @@ HOSTCC=x86_64-pc-linux-gnu-gcc
 LDFLAGS="-Wl,-O2 -Wl,--as-needed"
 
 ACCEPT_KEYWORDS="${ARCH}"
-USE="${ARCH} zlib bindist cros-debug -introspection cmt"
 
 # Be sure we don't overwrite pkgs from another sysroot.
 PKGDIR=${ROOT}packages/

sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults

@@ -119,7 +119,9 @@ PYTHONDONTWRITEBYTECODE="1"
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
 # Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE
-BOOTSTRAP_USE="cxx unicode"
+# threads is included to work around a use dep issue in our old python ebuilds
+# curl is included to let stage2 fetch toolchains from git
+BOOTSTRAP_USE="cxx unicode threads curl"
 
 # Mike Gilbert <floppym@gentoo.org> (15 May 2012)
 # Default target(s) for python-r1.eclass
@@ -134,6 +136,10 @@ PYTHON_SINGLE_TARGET="python2_6"
 USE_EXPAND="${USE_EXPAND} BOARD_USE CROS_WORKON_TREE TESTS U_BOOT_CONFIG_USE U_BOOT_FDT_USE"
 USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE"
 
+# Extra use flags for Core OS SDK (and possibly targets)
+# Previously defined in make.conf
+USE="${USE} hardened cros_host pic pie expat -introspection -cups -openrc"
+
 # Default licenses that are accepted for ChromiumOS builds.
 # If you want to accept more, use the --accept_licenses flag
 # when running setup_board.

sdk_container/src/third_party/coreos-overlay/profiles/base/packages

@@ -43,7 +43,7 @@
 *sys-apps/gawk
 *sys-apps/grep
 *sys-apps/net-tools
-#*>=sys-apps/portage-2.0.51.22
+*sys-apps/portage
 *sys-process/procps
 *sys-process/psmisc
 *sys-apps/sed
@@ -71,5 +71,4 @@
 *virtual/modutils
 *virtual/os-headers
 *virtual/pager
-*virtual/portage
 *virtual/ssh

sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords

@@ -84,13 +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
-
-# Used on the host
-=coreos-base/core-admin-9999	~amd64 ~x86
 
 #=dev-libs/libxml2-2.9.0-r1 ~amd64
 

sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask

@@ -13,3 +13,6 @@
 
 # libpng security vulnerability fix
 <media-libs/libpng-1.2.44
+
+# Replaced by sys-apps/efunctions
+coreos-base/efunctions

sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages

@@ -12,3 +12,4 @@
 #*sys-apps/busybox
 *sys-apps/man-pages
 *sys-apps/util-linux
+*sys-apps/efunctions

sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build

@@ -5,9 +5,6 @@
 # This file describes the packages needed to build a stage1 based on this
 # profile.  Packages in this file are built in order.
 
-# While shadow could be in here, it breaks stage 1 and stage 2 building for the
-# releases.  PLEASE DO NOT ENABLE THIS UNLESS YOU HAVE THOROUGHLY TESTED IT!
-
 app-arch/bzip2
 app-arch/gzip
 app-arch/tar
@@ -20,13 +17,16 @@ sys-devel/libtool
 sys-apps/baselayout
 sys-apps/coreutils
 sys-apps/diffutils
+sys-apps/efunctions
 sys-apps/file
 sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
 sys-apps/less
 sys-apps/net-tools
+sys-apps/portage
 sys-apps/sed
+sys-apps/shadow
 sys-apps/texinfo
 sys-devel/binutils
 sys-devel/bison
@@ -39,4 +39,3 @@ sys-devel/patch
 virtual/editor
 virtual/libc
 virtual/os-headers
-virtual/portage

sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc

@@ -0,0 +1,2 @@
+amd64   default/linux/amd64/10.0            dev
+amd64   default/linux/amd64/10.0/coreos     dev

sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults

@@ -1,8 +1,8 @@
 # Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-USE="acpi usb pam -cairo -X"
+USE="bindist cros-debug acpi usb pam"
-
+USE="${USE} -cros_host -expat -pic -pie -cairo -X"
 USE="${USE} -acl -cracklib -gpm -ipv6 -openmp -python -sha512"
 USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"
 

sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/Manifest

@@ -0,0 +1 @@
+DIST efunctions-1.tar.gz 1903 SHA256 c8f3056accc0406197f6b32c85b4e87ed9ab683392beb99e1fab0d53017fdcd4 SHA512 48250736f27fed8e8d3a91a94d816115a3f971fa6e4df5b31a771a3cd80edc887d7683850c2c4e0bf58675b4dd8a23eb28a04c8b4332a95cfe86b0409ca0843b WHIRLPOOL 331557e81da1f06aeeeec63a306167d3b76e50c70f0cd6ac44eb66f31617df688c182077dc2a01417a119370e555c62d8443dc3160c5193c6a18e6840aac5094

sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/efunctions-1.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit multilib vcs-snapshot
+
+DESCRIPTION="Stand-alone and portable version of Gentoo's functions.sh"
+HOMEPAGE="https://github.com/marcusatbang/efunctions"
+GIT_COMMIT=b35f73e902fc0a6977260a1d6e8b287ae3b1c82a
+SRC_URI="${HOMEPAGE}/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+
+# FIXME(marineam): The origional functions.sh claims 2-clause BSD but
+# efunctions has no license declared. Assume it is unchanged until I
+# contact the author and get that sorted out...
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!sys-apps/openrc
+	!<sys-apps/baselayout-2.0
+	!coreos-base/efunctions
+	"
+
+src_install() {
+	local dst_dir=/usr/$(get_libdir)/${PN}
+
+	dodir etc/init.d
+	dosym ../..${dst_dir}/functions.sh /etc/init.d/functions.sh
+
+	dodir $dst_dir
+	insinto $dst_dir
+	doins ${S}/functions.sh
+	doins -r ${S}/efunctions
+
+	fperms -R +x $dst_dir
+}