Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

patch rejected

Help
Zamek
2010-03-02
2013-04-15
  • Zamek
    Zamek
    2010-03-02

    hello All,

    Sorry I am new in colibri. I downloaded kernel src from kernel.org (linux-2.6.32.8) and patch from here.
    I tried to patch with:
    zcat linux-2.6.32.8-Colibri.diff.gz | patch -p1

    Some of changes can finished, but there are a lot of rejected changes listed below. What do I wrong?

    patching file arch/arm/configs/colibri_pxa270_defconfig
    Hunk #1 FAILED at 1.
    Hunk #2 FAILED at 130.
    Hunk #3 FAILED at 309.
    Hunk #4 FAILED at 335.
    Hunk #5 FAILED at 351.
    Hunk #6 FAILED at 492.
    Hunk #7 FAILED at 711.
    Hunk #8 FAILED at 759.
    Hunk #9 FAILED at 871.
    Hunk #10 FAILED at 932.
    Hunk #11 FAILED at 947.
    Hunk #12 FAILED at 1014.
    Hunk #13 FAILED at 1024.
    Hunk #14 FAILED at 1156.
    Hunk #15 FAILED at 1180.
    Hunk #16 FAILED at 1253.
    Hunk #17 FAILED at 1293.
    Hunk #18 FAILED at 1354.
    Hunk #19 FAILED at 1398.
    Hunk #20 FAILED at 1435.
    Hunk #21 FAILED at 1454.
    21 out of 21 hunks FAILED - saving rejects to file arch/arm/configs/colibri_pxa270_defconfig.rej
    patching file arch/arm/mach-pxa/colibri-pxa270.c
    Hunk #1 FAILED at 21.
    Hunk #2 FAILED at 31.
    Hunk #3 FAILED at 40.
    Hunk #4 FAILED at 48.
    Hunk #5 FAILED at 112.
    Hunk #6 FAILED at 127.
    6 out of 6 hunks FAILED - saving rejects to file arch/arm/mach-pxa/colibri-pxa270.c.rej
    patching file arch/arm/mach-pxa/include/mach/colibri.h
    Hunk #1 FAILED at 1.
    Hunk #2 FAILED at 29.
    2 out of 2 hunks FAILED - saving rejects to file arch/arm/mach-pxa/include/mach/colibri.h.rej
    patching file drivers/pcmcia/Kconfig
    Hunk #1 FAILED at 221.
    1 out of 1 hunk FAILED - saving rejects to file drivers/pcmcia/Kconfig.rej
    patching file drivers/pcmcia/Makefile
    Hunk #1 FAILED at 76.
    1 out of 1 hunk FAILED - saving rejects to file drivers/pcmcia/Makefile.rej
    The next patch would create the file drivers/pcmcia/pxa2xx_colibri.c,
    which already exists!  Assume -R? 
    Apply anyway? 
    Skipping patch.
    1 out of 1 hunk ignored

    thx
    Zamek

     
  • MinimumLaw
    MinimumLaw
    2010-03-04

    Ok, Let's try again =)

    workstation:~ alex$ wget -c http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.8.tar.bz2
    -2010-03-04 07:13:26-  http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.8.tar.bz2
    Распознаётся www.kernel.org (www.kernel.org)… 204.152.191.37, 130.239.17.4, 149.20.20.133, …
    Устанавливается соединение с www.kernel.org (www.kernel.org)|204.152.191.37|:80… соединение установлено.
    Запрос HTTP послан, ожидается ответ… 200 OK
    Длина: 64371968 (61M)
    Saving to: «linux-2.6.32.8.tar.bz2»

    100% 64 371 968   419K/s   в 2m 32s  

    2010-03-04 07:15:58 (414 KB/s) - «linux-2.6.32.8.tar.bz2» saved

    workstation:~ alex$ bzcat linux-2.6.32.8.tar.bz2 | tar -xf-
    workstation:~ alex$ cd linux-2.6.32.8
    workstation:linux-2.6.32.8 alex$ wget http://ignum.dl.sourceforge.net/project/tocolinux/kernel/2.6.32.8/linux-2.6.32.8-Colibri.diff.gz
    -2010-03-04 07:19:03-  http://ignum.dl.sourceforge.net/project/tocolinux/kernel/2.6.32.8/linux-2.6.32.8-Colibri.diff.gz
    Распознаётся ignum.dl.sourceforge.net (ignum.dl.sourceforge.net)… 62.109.128.5
    Устанавливается соединение с ignum.dl.sourceforge.net (ignum.dl.sourceforge.net)|62.109.128.5|:80… соединение установлено.
    Запрос HTTP послан, ожидается ответ… 200 OK
    Длина: 11353 (11K)
    Saving to: «linux-2.6.32.8-Colibri.diff.gz»

    100% 11 353      58,5K/s   в 0,2s    

    2010-03-04 07:19:03 (58,5 KB/s) - «linux-2.6.32.8-Colibri.diff.gz» saved

    workstation:linux-2.6.32.8 alex$ gzcat linux-2.6.32.8-Colibri.diff.gz | patch -p1
    patching file arch/arm/configs/colibri_pxa270_defconfig
    Hunk #1 FAILED at 1.
    Hunk #2 succeeded at 124 (offset -6 lines).
    Hunk #3 FAILED at 303.
    Hunk #4 FAILED at 314.
    Hunk #5 FAILED at 330.
    Hunk #6 FAILED at 465.
    Hunk #7 FAILED at 683.
    Hunk #8 FAILED at 730.
    Hunk #9 FAILED at 841.
    Hunk #10 FAILED at 902.
    Hunk #11 FAILED at 916.
    Hunk #12 FAILED at 983.
    Hunk #13 FAILED at 993.
    Hunk #14 succeeded at 1111 with fuzz 1 (offset -18 lines).
    Hunk #15 succeeded at 1129 (offset -23 lines).
    Hunk #16 FAILED at 1201.
    Hunk #17 FAILED at 1241.
    Hunk #18 FAILED at 1265.
    Hunk #19 FAILED at 1309.
    Hunk #20 FAILED at 1346.
    Hunk #21 FAILED at 1365.
    18 out of 21 hunks FAILED - saving rejects to file arch/arm/configs/colibri_pxa270_defconfig.rej
    patching file arch/arm/mach-pxa/colibri-pxa270.c
    patching file arch/arm/mach-pxa/include/mach/colibri.h
    patching file drivers/pcmcia/Kconfig
    patching file drivers/pcmcia/Makefile
    patching file drivers/pcmcia/pxa2xx_colibri.c
    workstation:linux-2.6.32.8 alex$

    Hm…. Realy kernel config not patched… Save vanilla arch/arm/configs/colibri_pxa270_defconfig and reconfigure kernel after code path was applyed, Most nedded files
    arch/arm/mach-pxa/colibri-pxa270.c
    arch/arm/mach-pxa/include/mach/colibri.h
    drivers/pcmcia/Kconfig
    drivers/pcmcia/Makefile
    drivers/pcmcia/pxa2xx_colibri.c
    patched successfuly and can produce code.

     
  • Zamek
    Zamek
    2010-03-08

    Hi "MinimumLaw",

    thx for reply. I check and compare my kernel and patch, and I gaot some different:
    Kernel 2.6.32.8 from kernel.org.
    in arch/arm/configs/colibri_pxa270_defconfig:

    #
    # Automatically generated make config: don't edit
    # Linux kernel version: 2.6.29-rc8
    # Fri Mar 13 16:18:17 2009
    #
    in patch for 2.6.32.8:

    -- linux-2.6.32.8/arch/arm/configs/colibri_pxa270_defconfig 2010-02-16 11:50:28.000000000 +0300
    +++ linux-2.6.32.8-Colibri/arch/arm/configs/colibri_pxa270_defconfig 2010-02-12 16:33:12.000000000 +0300
    @@ -1,7 +1,7 @@
    #
    # Automatically generated make config: don't edit
    -# Linux kernel version: 2.6.32.8
    -# Tue Feb 16 11:50:28 2010
    +# Linux kernel version: 2.6.32.6
    +# Wed Jan 27 15:06:10 2010

    ok, I downloaded 2.6.32.6, but its colibri_pxa270_defconfig has
    # Automatically generated make config: don't edit
    # Linux kernel version: 2.6.29-rc8
    # Fri Mar 13 16:18:17 2009
    #

    Where did you download your original kernel?

    thx,
    Zamek

     
  • MinimumLaw
    MinimumLaw
    2010-03-10

    Ok! I got vanilla kernel from kernel.org. If you (realy?) need in kernel 2.6.32.8:
    1. Get vanilla 2.6.32.8 kernel ( http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.8.tar.bz2 )
    2. Save backup copy arch/arm/configs/colibri_pxa270_defconfig
    3. Apply patch
    4. Restore arch/arm/configs/colibri_pxa270_defconfig
    5. run make defconfig or copy colibri_pxa270_defconfig to .config and run make menuconfig (ARCH=arm MACH=COLIBRI CROSSCOMPILE= etc…) and reconfigure you kernel (you may add USB, SD/MMC, Video, CF suppot enable)

    Now, I want make U-Boot more poverful for this board (like support boot from MMC cards) and don't work on kernel. But I try to post kernel patch for actual kernel from kernel org.

     
  • Ala Makota
    Ala Makota
    2010-05-23

    Hi minimumlaw,

    thank you for your great contribution into developing embedded linux for Colibri.

    How can I apply you path into linux kernel 2.6.32.8? I'm very new to this stuff…

    Could you as well explain it more:
    2. Save backup copy arch/arm/configs/colibri_pxa270_defconfig
    3. Apply patch
    4. Restore arch/arm/configs/colibri_pxa270_defconfig
    5. run make defconfig or copy colibri_pxa270_defconfig to .config and run make menuconfig (ARCH=arm MACH=COLIBRI CROSSCOMPILE= etc…) and reconfigure you kernel (you may add USB, SD/MMC, Video, CF suppot enable)

    Looking forward to your reply.

    Kind Regards,