From 4273459bfe4cc665e4935dfb6aef4d3f239e38ed Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 3 Mar 2016 13:06:51 -0800 Subject: [PATCH 1/5] app-emulation/rkt: remove old ebuild --- .../app-emulation/rkt/rkt-0.16.0-r1.ebuild | 135 ------------------ 1 file changed, 135 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.16.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.16.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.16.0-r1.ebuild deleted file mode 100644 index 8cde2cd03a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.16.0-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=yes -AUTOTOOLS_IN_SOURCE_BUILD=yes - -inherit autotools-utils flag-o-matic systemd toolchain-funcs -inherit cros-workon - -CROS_WORKON_PROJECT="coreos/rkt" -CROS_WORKON_LOCALNAME="rkt" -CROS_WORKON_REPO="git://github.com" - -if [[ "${PV}" == "9999" ]]; then - KEYWORDS="~amd64" -else - KEYWORDS="amd64" - CROS_WORKON_COMMIT="c742464af051aa7075819278ca8c30f701e2cf9c" # v0.16.0 -fi - -PXE_VERSION="794.1.0" -PXE_SYSTEMD_VERSION="222" -PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" -PXE_FILE="${PN}-pxe-${PXE_VERSION}.img" - -SRC_URI="rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )" - -DESCRIPTION="A CLI for running app containers, and an implementation of the App -Container Spec." -HOMEPAGE="https://github.com/coreos/rkt" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_src +actool" -REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_src )" - -COMMON_DEPEND="sys-apps/acl" -DEPEND="|| ( ~dev-lang/go-1.4.3 >=dev-lang/go-1.5.3 ) - app-arch/cpio - sys-fs/squashfs-tools - dev-perl/Capture-Tiny - rkt_stage1_src? ( - >=sys-apps/systemd-222 - app-shells/bash - ) - ${COMMON_DEPEND}" -RDEPEND="!app-emulation/rocket - actool? ( !app-emulation/actool ) - rkt_stage1_host? ( - ~sys-apps/systemd-222 - app-shells/bash - ) - ${COMMON_DEPEND}" - -BUILDDIR="build-${P}" - -STAGE1INSTALLDIR="/usr/share/rkt/" -STAGE1FIRST="" -STAGE1FLAVORS="" - -function add_stage1() { - if [[ ${STAGE1FIRST} == "" ]]; then - STAGE1FIRST=$1 - STAGE1FLAVORS=$1 - else - STAGE1FLAVORS="${STAGE1FLAVORS},$1" - fi -} - -src_configure() { - local myeconfargs=() - - if use rkt_stage1_coreos; then - add_stage1 "coreos" - myeconfargs+=( --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" ) - myeconfargs+=( --with-coreos-local-pxe-image-systemd-version=v"${PXE_SYSTEMD_VERSION}" ) - fi - if use rkt_stage1_fly; then - add_stage1 "fly" - fi - if use rkt_stage1_host; then - add_stage1 "host" - fi - if use rkt_stage1_src; then - add_stage1 "src" - fi - - myeconfargs+=( --with-stage1-flavors="${STAGE1FLAVORS}" ) - myeconfargs+=( --with-stage1-default-location="/usr/share/rkt/stage1-${STAGE1FIRST}.aci" ) - - # Go's 6l linker does not support PIE, disable so cgo binaries - # which use 6l+gcc for linking can be built correctly. - if gcc-specs-pie; then - append-ldflags -nopie - fi - - export CC=$(tc-getCC) - export CGO_ENABLED=1 - export CGO_CFLAGS="${CFLAGS}" - export CGO_CPPFLAGS="${CPPFLAGS}" - export CGO_CXXFLAGS="${CXXFLAGS}" - export CGO_LDFLAGS="${LDFLAGS}" - export BUILDDIR - - autotools-utils_src_configure -} - -src_install() { - dodoc README.md - use doc && dodoc -r Documentation - use examples && dodoc -r examples - use actool && dobin "${S}/${BUILDDIR}/bin/actool" - - dobin "${S}/${BUILDDIR}/bin/rkt" - - einfo The following stage1 ACIs have been installed to ${STAGE1INSTALLDIR}: - insinto ${STAGE1INSTALLDIR} - for stage1aci in "${S}/${BUILDDIR}"/bin/stage1-*.aci; do - doins "${stage1aci}" - einfo $(basename "${stage1aci}") - done - - systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service - systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer - systemd_enable_service multi-user.target ${PN}-gc.timer - systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service - systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket - systemd_enable_service sockets.target ${PN}-metadata.socket - - insinto /usr/lib/sysusers.d/ - newins "${FILESDIR}"/sysusers.conf ${PN}.conf -} From a9ab1f1f87a1880c3a80711d48c1486d22f44429 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 3 Mar 2016 13:07:19 -0800 Subject: [PATCH 2/5] app-emulation/rkt: use slot operator for go dependency --- .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 37ca82573e..7ecba28b00 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -39,7 +39,7 @@ REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_s COMMON_DEPEND="sys-apps/acl tpm? ( app-crypt/trousers )" -DEPEND="|| ( ~dev-lang/go-1.4.3 >=dev-lang/go-1.5.3 ) +DEPEND="|| ( ~dev-lang/go-1.4.3:= >=dev-lang/go-1.5.3:= ) app-arch/cpio sys-fs/squashfs-tools dev-perl/Capture-Tiny From 5f62d88cabca4fb343fe7b2801162143557f3094 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 3 Mar 2016 13:07:54 -0800 Subject: [PATCH 3/5] eclass/coreos-go: use slot operator for go dependency --- .../src/third_party/coreos-overlay/eclass/coreos-go.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass index 869fa99006..6b56bb9170 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass @@ -13,7 +13,7 @@ inherit flag-o-matic multiprocessing toolchain-funcs -DEPEND="dev-lang/go" +DEPEND="dev-lang/go:=" # @FUNCTION: go_get_arch # @USAGE: export GOARCH=$(go_get_arch) From e0c444ae1ad9a710b7aaca16b711809322da76ff Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 3 Mar 2016 13:21:26 -0800 Subject: [PATCH 4/5] app-emulation/docker: prune 1.7.1 --- .../docker/docker-1.7.1-r6.ebuild | 281 ------------------ 1 file changed, 281 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r6.ebuild deleted file mode 100644 index 54bbf645ae..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r6.ebuild +++ /dev/null @@ -1,281 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.4.0.ebuild,v 1.1 2014/12/12 18:53:23 xarthisius Exp $ - -EAPI=5 - -DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level" -HOMEPAGE="https://www.docker.com" - -CROS_WORKON_PROJECT="coreos/docker" -CROS_WORKON_LOCALNAME="docker" -CROS_WORKON_REPO="git://github.com" - -if [[ ${PV} == *9999 ]]; then - DOCKER_GITCOMMIT="unknown" - KEYWORDS="~amd64 ~arm64" -else - CROS_WORKON_COMMIT="df2f73db381b1fa09ffc173179dc92f490f8c23c" # v1.7.1 with backports - DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" - KEYWORDS="amd64 arm64" -fi - -inherit bash-completion-r1 linux-info multilib systemd udev user cros-workon - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs +btrfs contrib +device-mapper doc experimental lxc +overlay vim-syntax zsh-completion" - -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies -CDEPEND=" - >=sys-kernel/coreos-kernel-3.18.0 - >=dev-db/sqlite-3.7.9:3 - device-mapper? ( - >=sys-fs/lvm2-2.02.89[thin] - ) -" - -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.3 - btrfs? ( - >=sys-fs/btrfs-progs-3.16.1 - ) -" - -# For CoreOS builds coreos-kernel must be installed because this ebuild -# checks the kernel config. The kernel config is left by the kernel compile -# or an explicit copy when installing binary packages. See coreos-kernel.eclass -DEPEND+="sys-kernel/coreos-kernel" - -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies -RDEPEND=" - ${CDEPEND} - - !app-emulation/docker-bin - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - - lxc? ( - >=app-emulation/lxc-1.0.7 - ) - aufs? ( - || ( - sys-fs/aufs3 - sys-kernel/aufs-sources - ) - ) -" - -RESTRICT="installsources strip" - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~DEVPTS_MULTIPLE_INSTANCES - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED - ~CPUSETS - ~MACVLAN ~VETH ~BRIDGE - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT ~NF_NAT_NEEDED - - ~POSIX_MQUEUE - - ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED - ~RESOURCE_COUNTERS - ~CGROUP_PERF - ~CFS_BANDWIDTH -" - -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" - -pkg_setup() { - if kernel_is lt 3 8; then - eerror "" - eerror "Using Docker with kernels older than 3.8 is unstable and unsupported." - eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies" - die 'Kernel is too old - need 3.8 or above' - fi - - # for where these kernel versions come from, see: - # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* - if ! { - kernel_is ge 3 16 \ - || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ - || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ - || { kernel_is 3 12 && kernel_is ge 3 12 25; } - }; then - ewarn "" - ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" - ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" - ewarn "" - ewarn "See also https://github.com/docker/docker/issues/2960" - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - # TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this - # an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - if use overlay; then - CONFIG_CHECK+=" - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL - " - fi - - linux-info_pkg_setup -} - -src_prepare() { - # allow user patches (use sparingly - upstream won't support them) - epatch_user -} - -go_get_arch() { - echo ${ARCH} -} - -src_compile() { - # if we treat them right, Docker's build scripts will set up a - # reasonable GOPATH for us - export AUTO_GOPATH=1 - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - if gcc-specs-pie; then - sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - - sed -i "s/LDFLAGS_STATIC_DOCKER='/LDFLAGS_STATIC_DOCKER='-extldflags -fno-PIC /" hack/make/dynbinary || die - grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed' - fi - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - # Docker uses the host files when testing, so force docker - # to not use dm_task_deferred_remove to cover cross builds. - DOCKER_BUILDTAGS+=' libdm_no_deferred_remove' - - # https://github.com/docker/docker/pull/13338 - if use experimental; then - export DOCKER_EXPERIMENTAL=1 - else - unset DOCKER_EXPERIMENTAL - fi - - export GOARCH=$(go_get_arch) - export CGO_ENABLED=1 - export CC=$(tc-getCC) - export CXX=$(tc-getCXX) - - # time to build! - ./hack/make.sh dynbinary || die 'dynbinary failed' - - # TODO get go-md2man and then include the man pages using docs/man/md2man-all.sh -} - -src_install() { - VERSION=$(cat VERSION) - newbin bundles/$VERSION/dynbinary/docker-$VERSION docker - exeinto /usr/libexec/docker - newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - exeinto /usr/lib/coreos - doexe "${FILESDIR}/dockerd" - - systemd_newunit "${FILESDIR}/docker.service-1.7" docker.service - systemd_dounit "${FILESDIR}/docker.socket" - systemd_newunit "${FILESDIR}/early-docker.service-1.7" early-docker.service - systemd_dounit "${FILESDIR}/early-docker.socket" - systemd_dounit "${FILESDIR}/early-docker.target" - - insinto /usr/lib/systemd/network - doins "${FILESDIR}"/50-docker{,-veth}.network - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - if use doc; then - # TODO doman contrib/man/man*/* - - docompress -x /usr/share/doc/${PF}/md - docinto md - dodoc -r docs/sources/* - fi - - dobashcomp contrib/completion/bash/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - if use contrib; then - mkdir -p "${D}/usr/share/${PN}/contrib" - cp -R contrib/* "${D}/usr/share/${PN}/contrib" - fi -} - -pkg_postinst() { - udev_reload - - elog "" - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot, add Docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog "" - - # create docker group if the code checking for it in /etc/group exists - enewgroup docker - - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog " usermod -aG docker youruser" - elog "" -} From 5c90b10e89dcb84fa6e502cebcdd48fad1ca3a88 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 3 Mar 2016 13:23:46 -0800 Subject: [PATCH 5/5] app-emulation/docker: add DEPEND on slotted dev-lang/go --- .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index bf6f9ddede..1b49fea4ef 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -40,6 +40,8 @@ CDEPEND=" DEPEND=" ${CDEPEND} + dev-lang/go:= + btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )