Skip to contentSkip to conversation

linux: hide custom patches when using a local tree

PATCH New Vivien Didelot 3 participants 3 messages Jan 7, 2015

lore
Share & tools
lore

Vivien Didelot

author
#0 lore raw

PATCH v3 1/1 linux: hide custom patches when using a local tree

When using a custom local tree, we're using the OVERRIDE_SRCDIR internally, which means we do not apply patches. Since this is the expected behavior, make BR2_LINUX_KERNEL_PATCH and BR2_LINUX_KERNEL_CUSTOM_LOCAL options exclusive.

Signed-off-by Vivien Didelot <[email protected]>
---
 linux/Config.in | 1 +
 1 file changed, 1 insertion(+)
linux/Config.in +1 -0
index bf30426..13ae1ac 100644
@@ -119,6 +119,7 @@ config BR2_LINUX_KERNEL_VERSION
 
 config BR2_LINUX_KERNEL_PATCH
 	string "Custom kernel patches"
+	depends on !BR2_LINUX_KERNEL_CUSTOM_LOCAL
 	help
 	  A space-separated list of patches to apply to the
 	  kernel. Each patch can be described as an URL, a local file
Signature · 1 line
2.2.1
#1 lore raw

PATCH v3 1/1 linux: hide custom patches when using a local tree

Vivien, All,

On 2015-01-07 16:15 -0500, Vivien Didelot spake thusly:

Quoted 6 lines

When using a custom local tree, we're using the OVERRIDE_SRCDIR internally, which means we do not apply patches. Since this is the expected behavior, make BR2_LINUX_KERNEL_PATCH and BR2_LINUX_KERNEL_CUSTOM_LOCAL options exclusive.

Signed-off-by Vivien Didelot <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 19 lines
---
 linux/Config.in | 1 +
 1 file changed, 1 insertion(+)
linux/Config.in +1 -0
index bf30426..13ae1ac 100644
@@ -119,6 +119,7 @@ config BR2_LINUX_KERNEL_VERSION
 
 config BR2_LINUX_KERNEL_PATCH
 	string "Custom kernel patches"
+	depends on !BR2_LINUX_KERNEL_CUSTOM_LOCAL
 	help
 	  A space-separated list of patches to apply to the
 	  kernel. Each patch can be described as an URL, a local file
Signature · 1 line
2.2.1
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#2 lore raw

PATCH v3 1/1 linux: hide custom patches when using a local tree

In reply to Vivien Didelot

Dear Vivien Didelot,

Quoted 9 lines · Vivien Didelot

When using a custom local tree, we're using the OVERRIDE_SRCDIR internally, which means we do not apply patches. Since this is the expected behavior, make BR2_LINUX_KERNEL_PATCH and BR2_LINUX_KERNEL_CUSTOM_LOCAL options exclusive.

Signed-off-by Vivien Didelot <[email protected]>
---
 linux/Config.in | 1 +
 1 file changed, 1 insertion(+)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com