creating a patchFirst Time
Code:
cd /usr/src
git clone git://zen-sources.org/zen/kernel.git zen-sources
cd zen-sources
make menuconfig
example:
Code: Select all
git diff v2.6.24 v2.6.24-zen1 > 2.6.24-zen1.patch Code: Select all
Update
Code:
cd /usr/src/zen-sources
git pull git pull
Auto-merged .gitignore
Auto-merged MAINTAINERS
Auto-merged Makefile
CONFLICT (content): Merge conflict in Makefile
Removed arch/mips/lasat/sysctl.h
Auto-merged drivers/ata/libata-scsi.c
Auto-merged drivers/char/Kconfig
Auto-merged drivers/char/drm/ati_pcigart.c
Auto-merged drivers/char/drm/drm.h
Auto-merged drivers/char/drm/drm_drv.c
CONFLICT (content): Merge conflict in drivers/char/drm/drm_drv.c
...
Automatic merge failed; fix conflicts and then commit the result.
first try:rmh3093 wrote: This usually happens when the branch you are trying to update has been rebased. The easiest way to get around this is to checkout a new copy of the branch. For example, if you are currently on the master branch you would do something like the following:
Code: Select all
git checkout -f && git pullCode: Select all
git reset --hard; git branch -M master master-old; git checkout -b master origin/master; git branch -D master-old; git checkout -f example:
Code: Select all
# git checkout master-develCode: Select all
git branche.g. master-light, then enter
Code: Select all
git branch master-light origin/master-light && git checkout master-lightyou want to check out a specific version?
Code: Select all
git checkout v2.6.25-rc5-zen01) checkout the linux-2.6 branch of linus (git.eu.kernel.org or git.kernel.org)
2) then merge both (e.g. it's in /usr/src/sources/linux-2.6)
3)
Code: Select all
git clone --reference /usr/src/sources/linux-2.6/ git://zen-sources.org/zen/kernel.gitcurrently (june 2008), there is 1 branch ( heads ):
- master (git checkout master) (e.g. v2.6.24-zen3)
the other "head"s are branches which are added to the main tree
the project's site can be reached over at:
www.zen-sources.org
the repo is reachable via:
http://zen-sources.org/cgi-bin/gitweb.c ... ;a=summary
edit (June 13th 2008) :
updated to newer zen-sources server + webpage-address
. We rebase branches to newest upstream version, so if another -rc comes out, we rebase every branch to that, remake master, pull all the branches in again, test-compile and run, fix stuff which breaks for us, tag and release. If other people find some shit not working, we make a hotfix.
