From ae43aaf5df66c20a1f8ea9d81dc87e0e82a565c2 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 30 Jul 2013 13:02:17 -0400 Subject: [PATCH 1/4] add(coreos-devel/coreos-buildbot): Add ebuild for our buildbot tools. Creating a new category for this, coreos-base is overused and dev-python didn't seem right for custom infrastructure tools. Going forward I'd like to put SDK and build host specific stuff in this category when previously coreos-base would be used. Things that actually land in images would stick with coreos-base. --- .../coreos-buildbot-0.0.1.ebuild | 36 +++++++++++++++++++ .../coreos-overlay/profiles/categories | 1 + 2 files changed, 37 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild new file mode 100644 index 0000000000..94818b857a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2013 The CoreOS Authors. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python{2_6,2_7} ) + +CROS_WORKON_COMMIT="f52f87d06afa1b1eb8e350f6bdea153b2a7c74cb" +CROS_WORKON_PROJECT="coreos/coreos-buildbot" + +inherit cros-workon distutils-r1 + +DESCRIPTION="Tools and modules for CoreOS BuildBots" +HOMEPAGE="https://github.com/coreos/coreos-buildbot" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +RDEPEND="${PYTHON_DEPS} + dev-python/pyflakes[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/twisted + dev-util/buildbot + " +DEPEND="${RDEPEND}" + +DOCS=( README.md ) + +python_test() { + # Note: Current stable versions of twisted don't use the python-r1 eclass + # but there is some special magic in the trial wrapper to use the right + # python version based on EPYTHON which is exported by python-r1. + trial coreos || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/categories b/sdk_container/src/third_party/coreos-overlay/profiles/categories index c2958b13e3..6c9a7f4078 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/categories +++ b/sdk_container/src/third_party/coreos-overlay/profiles/categories @@ -25,6 +25,7 @@ app-vim app-xemacs chromeos-base coreos-base +coreos-devel dev-ada dev-cpp dev-db From 0c564ebf7854c124f23f8b68b3fe85df677c6aef Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 30 Jul 2013 13:10:34 -0400 Subject: [PATCH 2/4] add(coreos-devel/*-depends): Meta ebuilds for buildhost and SDK. Create a meta-ebuild for the SDK based on the packages currently listed explicitly in bootstrap_sdk.sh and a buildhost ebuild that expands on that, adding packages that are required in containers used by build slave instances. --- .../buildhost-depends-0.0.1.ebuild | 22 ++++++++++++++++ .../sdk-depends/sdk-depends-0.0.1.ebuild | 26 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild new file mode 100644 index 0000000000..3d0013803a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 2013 The CoreOS Authors +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="Meta ebuild for everything that should be on build hosts." +HOMEPAGE="http://coreos.com/docs/sdk/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND=" + coreos-devel/coreos-buildbot + coreos-devel/sdk-depends + dev-util/buildbot-slave + dev-util/catalyst[ccache] + " +RDEPEND="${DEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild new file mode 100644 index 0000000000..8ee220e81a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2013 The CoreOS Authors +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="Meta ebuild for everything that should be in the SDK." +HOMEPAGE="http://coreos.com/docs/sdk/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND=" + app-admin/sudo + app-arch/pbzip2 + app-shells/bash-completion + coreos-base/coreos-base + coreos-base/hard-host-depends + dev-python/setuptools + net-misc/curl + sys-devel/crossdev + " +RDEPEND="${DEPEND}" From 5f2f390b9a084576f8a3dd208c1d20a2dcad08cf Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 30 Jul 2013 13:41:23 -0400 Subject: [PATCH 3/4] fix(profiles): Set use flags required by buildhost-depends --- .../coreos-overlay/profiles/default/linux/package.use | 4 ++++ .../coreos-overlay/profiles/targets/coreos/package.use | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use index 704cb92c80..8fe6e5994b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use @@ -64,3 +64,7 @@ app-emulation/xen-tools -ocaml -hvm -xend -pygrub -qemu -flask -screen -doc amd6 >=virtual/jpeg-0 static-libs >=media-libs/libjpeg-turbo-1.2.0-r1 static-libs sys-apps/gptfdisk -icu + +# for build hosts +dev-util/catalyst ccache +dev-lang/python sqlite diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use index d7903be478..b07becfbf6 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use @@ -75,3 +75,6 @@ dev-libs/libxml2 python x11-libs/cairo X sys-boot/syslinux -custom-cflags + +# only needed on build hosts +dev-lang/python -sqlite From 9d975a3dd76db8b4ca3cb10f545d7075a26f09a5 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 30 Jul 2013 16:52:26 -0400 Subject: [PATCH 4/4] fix(coreos-devel/coreos-buildbot): Update git commit hash Merged, use fresh new merge hash. --- .../coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild index 94818b857a..a3c01eaa54 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild @@ -4,7 +4,7 @@ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) -CROS_WORKON_COMMIT="f52f87d06afa1b1eb8e350f6bdea153b2a7c74cb" +CROS_WORKON_COMMIT="3e4b20f67839aa541839eca6b4b7274d5ad1932c" CROS_WORKON_PROJECT="coreos/coreos-buildbot" inherit cros-workon distutils-r1