Merge pull request #108 from marineam/kernel

Kernel updates
This commit is contained in:
Greg Kroah-Hartman 2013-07-22 10:17:14 -07:00
commit f580a19177
6 changed files with 10 additions and 5 deletions

View File

@ -12,11 +12,11 @@ To bump to a new version do the following:
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
[remote "github"]
url = git@github.com:coreos/linux.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/github/*
[branch "master"]
remote = origin
remote = github
merge = refs/heads/master
[remote "linus"]
url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
@ -37,8 +37,8 @@ To bump to a new version do the following:
5) git pull . aufs/aufs-3.8
6) git push origin coreos/v3.8.8
6) git push github coreos/v3.8.8
7) git checkout coreos/master && git reset --hard coreos/v3.8.8 && git push -f origin coreos/master
7) git checkout coreos/master && git reset --hard coreos/v3.8.8 && git push -f github coreos/master
Then you can bump the hash in the ebuild and move it to the new version here.

View File

@ -6,6 +6,7 @@ EAPI=4
CROS_WORKON_COMMIT="60757f78d6dbd86e935b4de43d61547174228cb7"
CROS_WORKON_REPO="git://github.com"
CROS_WORKON_PROJECT="coreos/linux"
CROS_WORKON_LOCALNAME="linux"
inherit cros-workon cros-kernel2
DEPEND="

View File

@ -7,6 +7,7 @@ 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="

View File

@ -7,6 +7,7 @@ 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="

View File

@ -7,6 +7,7 @@ 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="

View File

@ -7,6 +7,7 @@ CROS_WORKON_COMMIT="7ef4061b8f08fe9914584f1211a3583e643651d5"
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="