diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild new file mode 120000 index 0000000000..3187faa5c7 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild new file mode 100644 index 0000000000..425ac63652 --- /dev/null +++ b/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} +} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild index bd6fa74e23..084a98749a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild +++ b/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" 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/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild index c9c9e9c873..bb090c9be3 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild +++ b/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}" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf index 12364a8a0c..db55ee61b7 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf +++ b/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="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf index 45ade49817..b875cb5810 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf +++ b/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="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf index c03d854246..bef59debb5 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf +++ b/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="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf index c267e59b2f..78fecc3128 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf +++ b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf @@ -1,3 +1,3 @@ -SDK_LATEST_VERSION="2013.03.07.000000" -BOOTSTRAP_LATEST_VERSION="20130130" +SDK_LATEST_VERSION="20130621235834" +BOOTSTRAP_LATEST_VERSION="20130621235834" TC_PATH="2013/03/%(target)s-2013.03.07.000000.tar.xz" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host index d0b74f78ee..530737c52c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host +++ b/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 -FULL_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/amd64-host/chroot-2013.02.04.090227/packages/" -PORTAGE_BINHOST="$PREFLIGHT_BINHOST $FULL_BINHOST" - -# expat needed for XML parsing in GDB, but enable globally as overhead is tiny. -USE="${USE} -cups hardened cros_host multilib pic pie -introspection expat" +# Our first round of binary packages! +# legacy contains the old x86_64-cros-linux-gnu toolchain since I haven't +# rebuilt it yet. 20130621235834 contains everything built by bootstrap_sdk +PORTAGE_BINHOST=" + http://storage.core-os.net/coreos/sdk/experimental/legacy/pkgs/ + http://storage.core-os.net/coreos/sdk/experimental/20130621235834/pkgs/ +" GENTOO_MIRRORS=" http://gentoo.osuosl.org/ diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target index 6f52f288da..75eb28c028 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target +++ b/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="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target index 9665e0bb0a..7240076555 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target +++ b/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/ diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults index 9cb50de537..ae189e38fe 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults @@ -119,7 +119,9 @@ PYTHONDONTWRITEBYTECODE="1" # Jorge Manuel B. S. Vicetto (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 (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. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/packages b/sdk_container/src/third_party/coreos-overlay/profiles/base/packages index c8cfbb1778..c084acd8eb 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/packages +++ b/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 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..33981c6761 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,13 +84,7 @@ =dev-lang/go-1.1 ~amd64 # Replace the function.sh script in baselayout -=coreos-base/efunctions-9999 ~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 +=sys-apps/efunctions-1 ~amd64 ~x86 #=dev-libs/libxml2-2.9.0-r1 ~amd64 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