diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README index e6cd42d5a1..8ee417150e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README @@ -31,14 +31,17 @@ To bump to a new version do the following: 3) git fetch --all -3) git checkout -b 'coreos/v3.8.8' +3) git checkout -b 'coreos/v3.10.10' -4) git reset --hard v3.8.8 +4) git reset --hard v3.10.10 -5) git pull . aufs/aufs-3.8 +5) git pull . aufs/aufs-3.10 -6) git push github coreos/v3.8.8 +5a) apply any coreos-specific patches that are not yet upstream (i.e. 9p patch) + that happened to be in a previous kernel branch. -7) git checkout coreos/master && git reset --hard coreos/v3.8.8 && git push -f github coreos/master +6) git push github coreos/v3.10.10 + +7) git checkout coreos/master && git reset --hard coreos/v3.10.10 && git push -f github coreos/master Then you can bump the hash in the ebuild and move it to the new version here. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.10.ebuild similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.10.ebuild index 26e8e0c371..1b75efc020 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.10.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $ EAPI=4 -CROS_WORKON_COMMIT="690868ea535f744ddc7bce065b2d566726a3e1c3" +CROS_WORKON_COMMIT="b42005e8756c65262c1bde050003fb339a380606" CROS_WORKON_REPO="git://github.com" CROS_WORKON_PROJECT="coreos/linux" CROS_WORKON_LOCALNAME="linux" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.9.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.9.ebuild deleted file mode 100644 index ffe97a3508..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.9.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $ - -EAPI=4 -CROS_WORKON_COMMIT="efe35239c35c5158494b368001dfe8fa9f9dac84" -CROS_WORKON_REPO="git://github.com" -CROS_WORKON_PROJECT="coreos/linux" -CROS_WORKON_LOCALNAME="linux" -CROS_WORKON_OUTOFTREE_BUILD=0 -inherit cros-workon cros-kernel2 - -DEPEND=" - sys-devel/bc - sys-kernel/bootengine -" - -DESCRIPTION="CoreOS kernel" -HOMEPAGE="http://www.kernel.org" -SRC_URI="${KERNEL_URI}" - -KEYWORDS="amd64 arm x86" -IUSE="deblob" - -src_prepare() { - epatch "${FILESDIR}"/no_firmware.patch -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.3.ebuild deleted file mode 100644 index f4e2bc5588..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.3.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $ - -EAPI=4 -CROS_WORKON_COMMIT="7b9ce275ba971f101e88ba7c3710f0fd32a370a8" -CROS_WORKON_TREE="0ff44b050e7f57e7d3743a44af2c9211da30bdb4" -CROS_WORKON_REPO="git://github.com" -CROS_WORKON_PROJECT="coreos/linux" -CROS_WORKON_LOCALNAME="linux" -inherit cros-workon cros-kernel2 - -DEPEND=" - sys-devel/bc -" - -DESCRIPTION="CoreOS kernel" -HOMEPAGE="http://www.kernel.org" -SRC_URI="${KERNEL_URI}" - -KEYWORDS="amd64 arm x86" -IUSE="deblob" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.5-r1.ebuild deleted file mode 100644 index e433b4743a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.5-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $ - -EAPI=4 -CROS_WORKON_COMMIT="da3093ad9f44ba53c3f254b4392f3c742dee41d3" -CROS_WORKON_TREE="0ff44b050e7f57e7d3743a44af2c9211da30bdb4" -CROS_WORKON_REPO="git://github.com" -CROS_WORKON_PROJECT="coreos/linux" -CROS_WORKON_LOCALNAME="linux" -inherit cros-workon cros-kernel2 - -DEPEND=" - sys-devel/bc -" - -DESCRIPTION="CoreOS kernel" -HOMEPAGE="http://www.kernel.org" -SRC_URI="${KERNEL_URI}" - -KEYWORDS="amd64 arm x86" -IUSE="deblob" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.5-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.5-r2.ebuild deleted file mode 100644 index 87a560b221..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.5-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $ - -EAPI=4 -CROS_WORKON_COMMIT="da3093ad9f44ba53c3f254b4392f3c742dee41d3" -CROS_WORKON_TREE="0ff44b050e7f57e7d3743a44af2c9211da30bdb4" -CROS_WORKON_REPO="git://github.com" -CROS_WORKON_PROJECT="coreos/linux" -CROS_WORKON_LOCALNAME="linux" -CROS_WORKON_OUTOFTREE_BUILD=0 -inherit cros-workon cros-kernel2 - -DEPEND=" - sys-devel/bc -" - -DESCRIPTION="CoreOS kernel" -HOMEPAGE="http://www.kernel.org" -SRC_URI="${KERNEL_URI}" - -KEYWORDS="amd64 arm x86" -IUSE="deblob" - -src_prepare() { - epatch "${FILESDIR}"/no_firmware.patch -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.8.ebuild deleted file mode 100644 index 88ecc0b17a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.9.8.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $ - -EAPI=4 -CROS_WORKON_COMMIT="7ef4061b8f08fe9914584f1211a3583e643651d5" -CROS_WORKON_TREE="0ff44b050e7f57e7d3743a44af2c9211da30bdb4" -CROS_WORKON_REPO="git://github.com" -CROS_WORKON_PROJECT="coreos/linux" -CROS_WORKON_LOCALNAME="linux" -CROS_WORKON_OUTOFTREE_BUILD=0 -inherit cros-workon cros-kernel2 - -DEPEND=" - sys-devel/bc -" - -DESCRIPTION="CoreOS kernel" -HOMEPAGE="http://www.kernel.org" -SRC_URI="${KERNEL_URI}" - -KEYWORDS="amd64 arm x86" -IUSE="deblob" - -src_prepare() { - epatch "${FILESDIR}"/no_firmware.patch -}