diff mbox

[v3] linux: hide custom patches when using a local tree

Message ID 1420665328-2704-1-git-send-email-vivien.didelot@savoirfairelinux.com
State Accepted
Headers show

Commit Message

Vivien Didelot Jan. 7, 2015, 9:15 p.m. UTC 
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 <vivien.didelot@savoirfairelinux.com>
---
 linux/Config.in | 1 +
 1 file changed, 1 insertion(+)

Comments

Yann E. MORIN Jan. 7, 2015, 9:30 p.m. UTC | #1 
Vivien, All,

On 2015-01-07 16:15 -0500, Vivien Didelot spake thusly:
> 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 <vivien.didelot@savoirfairelinux.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  linux/Config.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/linux/Config.in b/linux/Config.in
> index bf30426..13ae1ac 100644
> --- a/linux/Config.in
> +++ b/linux/Config.in
> @@ -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
> -- 
> 2.2.1
>
Thomas Petazzoni Jan. 7, 2015, 9:37 p.m. UTC | #2 
Dear Vivien Didelot,

On Wed,  7 Jan 2015 16:15:28 -0500, Vivien Didelot wrote:
> 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 <vivien.didelot@savoirfairelinux.com>
> ---
>  linux/Config.in | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks.

Thomas
diff mbox

Patch

diff --git a/linux/Config.in b/linux/Config.in
index bf30426..13ae1ac 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -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