Create a gist now

Instantly share code, notes, and snippets.

What would you like to do?
==> Determining latest git revision...
-> Version found: 20101209
==> Making package: zen-kernel 20101209-1 (Thu Dec 9 10:50:07 EST 2010)
==> Checking Runtime Dependencies...
==> Checking Buildtime Dependencies...
==> Retrieving Sources...
-> Found kernel26-zen.conf
-> Found kernel26-zen.preset
-> Downloading linux-2.6-zen.v2.6.36-zen0-full-git.tar.gz...
--2010-12-09 10:50:11--
Connecting to||:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 609853349 (582M) [application/x-gzip]
Saving to: `linux-2.6-zen.v2.6.36-zen0-full-git.tar.gz.part'
100%[==============================================================================================================================================>] 609,853,349 9.31M/s in 4m 3s
2010-12-09 10:54:14 (2.39 MB/s) - `linux-2.6-zen.v2.6.36-zen0-full-git.tar.gz.part' saved [609853349/609853349]
==> Validating source files with md5sums...
kernel26-zen.conf ... Passed
kernel26-zen.preset ... Passed
linux-2.6-zen.v2.6.36-zen0-full-git.tar.gz ... Passed
==> Extracting Sources...
-> Extracting linux-2.6-zen.v2.6.36-zen0-full-git.tar.gz with bsdtar
==> Starting build()...
-> Renaming snapshot directory...
-> Updating local tree...
remote: Counting objects: 2406, done.
remote: Compressing objects: 100% (1112/1112), done.
remote: Total 1782 (delta 1531), reused 865 (delta 669)
Receiving objects: 100% (1782/1782), 423.31 KiB | 293 KiB/s, done.
Resolving deltas: 100% (1531/1531), completed with 248 local objects.
From git://
bf6ef02..8dd4cb0 2.6.36-upstream-updates -> origin/2.6.36-upstream-updates
* [new branch] android-misc-2.6.35 -> origin/android-misc-2.6.35
* [new branch] android-misc-2.6.36 -> origin/android-misc-2.6.36
b27d635..f63accc cfs -> origin/cfs
390d81f..2cf0b0d master -> origin/master
615dd7a..1aa8ad9 master-2.6.35 -> origin/master-2.6.35
2a9d44b..3326779 misc-2.6.35 -> origin/misc-2.6.35
066cbeb..42e0e20 misc-2.6.36 -> origin/misc-2.6.36
+ dbf2925...50f3e0a squashfs -> origin/squashfs (forced update)
* [new branch] squashfs-2.6.35 -> origin/squashfs-2.6.35
* [new branch] toi-2.6.35 -> origin/toi-2.6.35
* [new branch] toi-2.6.36 -> origin/toi-2.6.36
+ 7a87180...b4b994f ureadahead -> origin/ureadahead (forced update)
3e48c4c..8ce2280 zen-tune -> origin/zen-tune
* [new tag] v2.6.35.9 -> v2.6.35.9
* [new tag] v2.6.36.1 -> v2.6.36.1
From git://
* [new tag] v2.6.36-zen1 -> v2.6.36-zen1
-> Attempting to merge changes...
CONFLICT (rename/add): Rename fs/squashfs/lzo_wrapper.c->fs/squashfs/lzma_wrapper.c in origin/master. fs/squashfs/lzma_wrapper.c added in HEAD
Adding as fs/squashfs/lzma_wrapper.c~HEAD instead
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging block/Makefile
Auto-merging drivers/char/vt.c
Auto-merging fs/Kconfig
Auto-merging fs/Makefile
Auto-merging fs/squashfs/Kconfig
CONFLICT (content): Merge conflict in fs/squashfs/Kconfig
Auto-merging fs/squashfs/Makefile
CONFLICT (content): Merge conflict in fs/squashfs/Makefile
Auto-merging fs/squashfs/decompressor.c
CONFLICT (content): Merge conflict in fs/squashfs/decompressor.c
Auto-merging fs/squashfs/squashfs.h
CONFLICT (content): Merge conflict in fs/squashfs/squashfs.h
Auto-merging include/linux/decompress/bunzip2_mm.h
CONFLICT (add/add): Merge conflict in include/linux/decompress/bunzip2_mm.h
Auto-merging include/linux/decompress/inflate_mm.h
CONFLICT (add/add): Merge conflict in include/linux/decompress/inflate_mm.h
Auto-merging include/linux/decompress/mm.h
Auto-merging include/linux/decompress/unlzo_mm.h
CONFLICT (add/add): Merge conflict in include/linux/decompress/unlzo_mm.h
Auto-merging kernel/printk.c
Auto-merging kernel/sysctl.c
Auto-merging lib/decompress_unlzma.c
Auto-merging mm/shmem.c
Automatic merge failed; fix conflicts and then commit the result.
==> ERROR: Merging failed...
-> Fixing local repository...
Previous HEAD position was a3dd510... Merge branch 'zen-tune'
Switched to branch 'master'
Your branch and 'origin/master' have diverged,
and have 142 and 5256 different commit(s) each, respectively.
Removing fs/squashfs/lzma_wrapper.c~HEAD
HEAD is now at 2cf0b0d Merge branch 'misc-2.6.36'
==> WARNING: Press ENTER if you want to continue or CTRL+C to abort...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment