Skip to contentSkip to conversation

Problem patching linux

Buildroot Will Wagner 2 participants 2 messages Mar 14, 2008

lore
Share & tools
lore
#0 lore raw

Hi All,

I have a custom board in target/device/my_board. Inside that folder I have a kernel_patches folder and I have changed the config so that it should apply my patches.

It all works when applying the patches for the kernel headers, but it fails to patch the actual kernel. This is because of the different ways the patch-kernel.sh script is called.

In kernel-headers-new.makefile it is:

	toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) 
$(KERNEL_HEADERS_PATCH_DIR) \
		\*.patch{,.gz,.bz2}

But in the linux Makefile.in it is:

	toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
		linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}

The regex is much tougher when actually patching the kernel. The problem I have it that my patch files are all in this format:

012-linux-2.6.22.19-some_patch

I need the numbers at the beginning to ensure they get patched in the right order.

How should I fix this? How should my patch files be named? Is this just a bug in the patching of the kernel?

Thanks,

Will.

Signature · 5 lines
------------------------------------------------------------------------
Will Wagner                                     will_wagner at carallon.com
Senior Project Engineer                  Office Tel: +44 (0)20 7371 2032
Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
------------------------------------------------------------------------
#1 lore raw

name it linux-2.6.22.19-012-some_patch

the patch kernel reads the files in the same order as the ls command would print them, so if you have linux-2.6.22.19-012-some_patch and linux-2.6.22.19-013-another_patch it will order them like you want.

John

Quoted 42 lines · Will Wagner

Hi All,

I have a custom board in target/device/my_board. Inside that folder I have a kernel_patches folder and I have changed the config so that it should apply my patches.

It all works when applying the patches for the kernel headers, but it fails to patch the actual kernel. This is because of the different ways the patch-kernel.sh script is called.

In kernel-headers-new.makefile it is:

       toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR)
$(KERNEL_HEADERS_PATCH_DIR) \
               \*.patch{,.gz,.bz2}

But in the linux Makefile.in it is:

       toolchain/patch-kernel.sh $(LINUX26_DIR)
$(KERNEL_HEADERS_PATCH_DIR) \
               linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}

The regex is much tougher when actually patching the kernel. The problem I have it that my patch files are all in this format:

012-linux-2.6.22.19-some_patch

I need the numbers at the beginning to ensure they get patched in the right order.

How should I fix this? How should my patch files be named? Is this just a bug in the patching of the kernel?

Thanks,

Will.
--
------------------------------------------------------------------------
Will Wagner will_wagner at carallon.com
Senior Project Engineer Office Tel: +44 (0)20 7371 2032
Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
------------------------------------------------------------------------

Quoted 5 lines

_______________________________________________
buildroot mailing list
buildroot at uclibc.org
http://busybox.net/mailman/listinfo/buildroot

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080314/bcadefaf/attachment.htm