Comments

Pi to 3.7.5, with a few Patches.. — 6 Comments

  1. Hi,

    I’m struggling to add the incremental patches on:

    apf@ip-10-246-145-148:~/PI/3.7/linux-RPi$ bzip2 -dc patch-3.7.2.bz2 | patch -p1
    patching file Makefile
    Hunk #1 FAILED at 1.
    1 out of 1 hunk FAILED — saving rejects to file Makefile.rej
    patching file arch/arm/kernel/swp_emulate.c
    patching file arch/arm/mach-realview/include/mach/board-eb.h
    patching file arch/arm/mm/cache-v7.S
    patching file arch/arm/mm/mmu.c
    patching file arch/arm64/include/asm/pgtable.h
    patching file arch/arm64/include/asm/unistd32.h
    patching file arch/arm64/kernel/signal.c
    patching file arch/cris/include/asm/io.h
    patching file arch/sparc/crypto/aes_asm.S
    patching file arch/sparc/crypto/aes_glue.c
    patching file arch/sparc/crypto/camellia_glue.c
    patching file arch/sparc/crypto/des_asm.S
    patching file arch/sparc/crypto/des_glue.c
    patching file arch/sparc/include/asm/hugetlb.h
    patching file arch/x86/kernel/hpet.c
    Reversed (or previously applied) patch detected! Assume -R? [n]
    Apply anyway? [n]
    Skipping patch.
    2 out of 2 hunks ignored — saving rejects to file arch/x86/kernel/hpet.c.rej
    patching file arch/x86/pci/common.c
    patching file drivers/acpi/battery.c
    Reversed (or previously applied) patch detected! Assume -R? [n]
    Apply anyway? [n]
    Skipping patch.
    6 out of 6 hunks ignored — saving rejects to file drivers/acpi/battery.c.rej
    patching file drivers/acpi/scan.c
    patching file drivers/acpi/sleep.c
    Hunk #3 FAILED at 557.
    Hunk #4 succeeded at 1056 (offset 8 lines).
    1 out of 4 hunks FAILED — saving rejects to file drivers/acpi/sleep.c.rej
    patching file drivers/acpi/video.c
    Hunk #1 succeeded at 395 (offset 6 lines).
    Hunk #2 succeeded at 453 with fuzz 1 (offset 14 lines).
    patching file drivers/acpi/video_detect.c
    Reversed (or previously applied) patch detected! Assume -R? [n] ^C

    Doesn’t look good.
    Have I done something daft?
    I just checked out the 3.7.y branch, and then tried to apply the 3.7.2 patch.

    • It looks like you are trying to apply the standard 3.7.2 patch? The patches you need are the incremental ones, in ftp://ftp.kernel.org/pub/linux/kernel/v3.0/incr/

      Get the Pi 3.7.1 code from GitHub, then apply (in sequence) patch-3.7.1-2.bz2 patch-3.7.2-3.bz2 patch-3.7.3-4.bz2 patch-3.7.4-5.bz2
      – there may be some ‘fuzz/offset’ messages, but the patches should apply OK.. You will end up with the Pi version of 3.7.5..

Leave a Reply

Your email address will not be published.

This site uses Akismet to reduce spam. Learn how your comment data is processed.