Hello, On Tue, Apr 13, 2010 at 09:13:02AM +0200, Jose Luis Perez Diez wrote: > A Dimarts, 13 de d'abril de 2010 05:20:29, Rafael Ignacio Zurita va escriure: > > Hello, I am trying to clone the development kernel tree (kernel.git) > > from git.openmoko.org, but I am getting an error. > > ... > > remote: fatal: Out of memory? mmap failed: Cannot allocate memory > > remote: aborting due to possible repository corruption on the remote side. > > .... > > The repository needs some maintenance :| > > You could get a targz of the repository from the shr build host > http://shr.bearstech.com/sources/git_git.openmoko.org.git.kernel.git.tar.gz > or from > http://downloads.openmoko.org/developer/sources/git_git.openmoko.org.git.kernel.git.tar.gz > > untar it cd to it an use git porcelain to get the latest changes.
I tried the tar.gz workaround following the instructions at : http://wiki.openmoko.org/wiki/Kernel#Building_the_andy-tracking_branch But then I always get "Cannot merge" when git pull. For the http://build.shr-project.org/sources/git_git.openmoko.org.git.kernel.git.tar.gz file I get : r...@nodo3:~/openmoko/linux-2.6$ git pull remote: Counting objects: 342324, done. remote: Compressing objects: 100% (54542/54542), done. remote: Total 315446 (delta 258483), reused 312525 (delta 256180) Receiving objects: 100% (315446/315446), 92.16 MiB | 105 KiB/s, done. Resolving deltas: 100% (258483/258483), completed with 11442 local objects. >From git://git.openmoko.org/git/kernel ee4642a..973a41f andy-tracking -> origin/andy-tracking * [new branch] andy-tracking-nohist -> origin/andy-tracking-nohist * [new branch] ar6000-2.6.31 -> origin/ar6000-2.6.31 * [new branch] ar6000-2.6.32 -> origin/ar6000-2.6.32 + 9aa190a...d9235e3 balaji-tracking -> origin/balaji-tracking (forced update) * [new branch] bq27000-2.6.31 -> origin/bq27000-2.6.31 * [new branch] bq27000-2.6.32 -> origin/bq27000-2.6.32 * [new branch] drm-tracking -> origin/drm-tracking * [new branch] gdrm-2.6.32 -> origin/gdrm-2.6.32 * [new branch] glamo-2.6.31 -> origin/glamo-2.6.31 * [new branch] glamo-2.6.32 -> origin/glamo-2.6.32 * [new branch] gta01-machine-2.6.31 -> origin/gta01-machine-2.6.31 * [new branch] gta02-machine-2.6.31 -> origin/gta02-machine-2.6.31 * [new branch] gta02-machine-2.6.32 -> origin/gta02-machine-2.6.32 * [new branch] gta02-machine-devices-2.6.31 -> origin/gta02-machine-devices-2.6.31 * [new branch] gta02-machine-devices-2.6.32 -> origin/gta02-machine-devices-2.6.32 * [new branch] gta02-vibrator-2.6.31 -> origin/gta02-vibrator-2.6.31 * [new branch] jbt6k74-2.6.31 -> origin/jbt6k74-2.6.31 * [new branch] jbt6k74-2.6.32 -> origin/jbt6k74-2.6.32 b460dd0..557e993 master -> origin/master * [new branch] master-nohist -> origin/master-nohist 794516c..2515f9a mokopatches-tracking -> origin/mokopatches-tracking * [new branch] mokopatches-tracking-nohist -> origin/mokopatches-tracking-nohist * [new branch] om-2.6.31 -> origin/om-2.6.31 * [new branch] om-extra-2.6.31 -> origin/om-extra-2.6.31 * [new branch] om-gta01-2.6.31 -> origin/om-gta01-2.6.31 * [new branch] om-gta02-2.6.31 -> origin/om-gta02-2.6.31 * [new branch] om-gta02-2.6.32 -> origin/om-gta02-2.6.32 * [new branch] om-s3c-2.6.31 -> origin/om-s3c-2.6.31 * [new branch] om-s3c-2.6.32 -> origin/om-s3c-2.6.32 * [new branch] pcf50606-2.6.31 -> origin/pcf50606-2.6.31 * [new branch] pcf50633-2.6.31 -> origin/pcf50633-2.6.31 * [new branch] pcf50633-2.6.32 -> origin/pcf50633-2.6.32 * [new branch] pending-tracking -> origin/pending-tracking * [new branch] pending-tracking-nohist -> origin/pending-tracking-nohist * [new branch] platform_battery-2.6.31 -> origin/platform_battery-2.6.31 * [new branch] platform_battery-2.6.32 -> origin/platform_battery-2.6.32 * [new branch] proposed -> origin/proposed * [new branch] s3c-touchscreen-2.6.31 -> origin/s3c-touchscreen-2.6.31 * [new branch] s3c-touchscreen-2.6.32 -> origin/s3c-touchscreen-2.6.32 cfea911..f19f259 stable -> origin/stable 1b17c67..893e864 stable-tracking -> origin/stable-tracking * [new branch] stable-tracking-nohist -> origin/stable-tracking-nohist * [new branch] wm8753-2.6.31 -> origin/wm8753-2.6.31 * [new branch] wm8753-2.6.32 -> origin/wm8753-2.6.32 Updating b460dd0..557e993 error: Entry '.mailmap' would be overwritten by merge. Cannot merge. And using the http://downloads.openmoko.org/developer/sources/git_git.openmoko.org.git.kernel.git.tar.gz file I get : r...@nodo3:~/openmoko/linux-2.6$ git pull remote: Counting objects: 344198, done. remote: Compressing objects: 100% (54743/54743), done. remote: Total 317311 (delta 260134), reused 314398 (delta 257838) Receiving objects: 100% (317311/317311), 92.36 MiB | 125 KiB/s, done. Resolving deltas: 100% (260134/260134), completed with 11442 local objects. >From git://git.openmoko.org/git/kernel * [new branch] andy-tracking -> origin/andy-tracking * [new branch] andy-tracking-nohist -> origin/andy-tracking-nohist * [new branch] ar6000-2.6.31 -> origin/ar6000-2.6.31 * [new branch] ar6000-2.6.32 -> origin/ar6000-2.6.32 * [new branch] balaji-tracking -> origin/balaji-tracking * [new branch] bq27000-2.6.31 -> origin/bq27000-2.6.31 * [new branch] bq27000-2.6.32 -> origin/bq27000-2.6.32 * [new branch] drm-tracking -> origin/drm-tracking * [new branch] gdrm-2.6.32 -> origin/gdrm-2.6.32 * [new branch] glamo-2.6.31 -> origin/glamo-2.6.31 * [new branch] glamo-2.6.32 -> origin/glamo-2.6.32 * [new branch] gta01-machine-2.6.31 -> origin/gta01-machine-2.6.31 * [new branch] gta02-machine-2.6.31 -> origin/gta02-machine-2.6.31 * [new branch] gta02-machine-2.6.32 -> origin/gta02-machine-2.6.32 * [new branch] gta02-machine-devices-2.6.31 -> origin/gta02-machine-devices-2.6.31 * [new branch] gta02-machine-devices-2.6.32 -> origin/gta02-machine-devices-2.6.32 * [new branch] gta02-vibrator-2.6.31 -> origin/gta02-vibrator-2.6.31 * [new branch] jbt6k74-2.6.31 -> origin/jbt6k74-2.6.31 * [new branch] jbt6k74-2.6.32 -> origin/jbt6k74-2.6.32 4991408..557e993 master -> origin/master * [new branch] master-nohist -> origin/master-nohist * [new branch] mokopatches-tracking -> origin/mokopatches-tracking * [new branch] mokopatches-tracking-nohist -> origin/mokopatches-tracking-nohist * [new branch] om-2.6.31 -> origin/om-2.6.31 * [new branch] om-extra-2.6.31 -> origin/om-extra-2.6.31 * [new branch] om-gta01-2.6.31 -> origin/om-gta01-2.6.31 * [new branch] om-gta02-2.6.31 -> origin/om-gta02-2.6.31 * [new branch] om-gta02-2.6.32 -> origin/om-gta02-2.6.32 * [new branch] om-s3c-2.6.31 -> origin/om-s3c-2.6.31 * [new branch] om-s3c-2.6.32 -> origin/om-s3c-2.6.32 * [new branch] pcf50606-2.6.31 -> origin/pcf50606-2.6.31 * [new branch] pcf50633-2.6.31 -> origin/pcf50633-2.6.31 * [new branch] pcf50633-2.6.32 -> origin/pcf50633-2.6.32 * [new branch] pending-tracking -> origin/pending-tracking * [new branch] pending-tracking-nohist -> origin/pending-tracking-nohist * [new branch] platform_battery-2.6.31 -> origin/platform_battery-2.6.31 * [new branch] platform_battery-2.6.32 -> origin/platform_battery-2.6.32 * [new branch] proposed -> origin/proposed * [new branch] s3c-touchscreen-2.6.31 -> origin/s3c-touchscreen-2.6.31 * [new branch] s3c-touchscreen-2.6.32 -> origin/s3c-touchscreen-2.6.32 + a7abe2b...f19f259 stable -> origin/stable (forced update) * [new branch] stable-tracking -> origin/stable-tracking * [new branch] stable-tracking-nohist -> origin/stable-tracking-nohist * [new branch] wm8753-2.6.31 -> origin/wm8753-2.6.31 * [new branch] wm8753-2.6.32 -> origin/wm8753-2.6.32 Updating 4991408..557e993 error: Entry 'MAINTAINERS' would be overwritten by merge. Cannot merge. -- Rafael Ignacio Zurita
