Merge pull request #186 from gregkh/kernel_update

bump(sys-kernel/coreos-kernel) bump to 3.10.10
This commit is contained in:
Brandon Philips 2013-08-29 12:07:59 -07:00
commit 6c00bee9ad
7 changed files with 9 additions and 131 deletions

View File

@ -31,14 +31,17 @@ To bump to a new version do the following:
3) git fetch --all 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. Then you can bump the hash in the ebuild and move it to the new version here.

View File

@ -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 $ # $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 EAPI=4
CROS_WORKON_COMMIT="690868ea535f744ddc7bce065b2d566726a3e1c3" CROS_WORKON_COMMIT="b42005e8756c65262c1bde050003fb339a380606"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
CROS_WORKON_PROJECT="coreos/linux" CROS_WORKON_PROJECT="coreos/linux"
CROS_WORKON_LOCALNAME="linux" CROS_WORKON_LOCALNAME="linux"

View File

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

View File

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

View File

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

View File

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

View File

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