[Buildroot] [pull request] Pull request for branch config-choice-fixes

[Buildroot] [pull request] Pull request for branch config-choice-fixes

[Thomas Petazzoni]

The following changes since commit 5b72dda69f72e1953dfc7987dd1b418e1afe79a4:
  Peter Korsgaard (1):
        buildroot: fix fallout after qtopia4 -> qt rename

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot config-choice-fixes

Thomas Petazzoni (2):
      webkit: only show the rendering backend choice when webkit is enabled
      ipsec-tools: only show the security context choice when ipsec enabled

 package/ipsec-tools/Config.in |    4 ++++
 package/webkit/Config.in      |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/2] webkit: only show the rendering backend choice when webkit is enabled

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/webkit/Config.in |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index e436f9a..ecf8694 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -18,6 +18,8 @@ config BR2_PACKAGE_WEBKIT
 comment "webkit requires a toolchain with C++ support and WCHAR enabled"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 
+if BR2_PACKAGE_WEBKIT
+
 choice
 	prompt "Rendering target"
 	default BR2_PACKAGE_WEBKIT_X
@@ -32,3 +34,5 @@ config BR2_PACKAGE_WEBKIT_DIRECTFB
 	select BR2_PACKAGE_DIRECTFB
 
 endchoice
+
+endif
-- 
1.6.0.4

[Buildroot] [PATCH 2/2] ipsec-tools: only show the security context choice when ipsec enabled

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ipsec-tools/Config.in |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index a55ff0c..d29cb86 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -61,6 +61,8 @@ config BR2_PACKAGE_IPSEC_TOOLS_LIBS
 	  Install libipsec.a and libracoon.a under staging_dir/lib for further
 	  development on a host machine.
 
+if BR2_PACKAGE_IPSEC_TOOLS
+
 choice
 	prompt "Security context"
 	default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
@@ -77,3 +79,5 @@ config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
 	bool "Enable kernel security context"
 
 endchoice
+
+endif
-- 
1.6.0.4

[Buildroot] [pull request] Pull request for branch config-choice-fixes

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> The following changes since commit 5b72dda69f72e1953dfc7987dd1b418e1afe79a4:
 Thomas>   Peter Korsgaard (1):
 Thomas>         buildroot: fix fallout after qtopia4 -> qt rename

 Thomas> are available in the git repository at:

 Thomas>   git://git.busybox.net/~tpetazzoni/git/buildroot config-choice-fixes

 Thomas> Thomas Petazzoni (2):
 Thomas>       webkit: only show the rendering backend choice when webkit is enabled
 Thomas>       ipsec-tools: only show the security context choice when ipsec enabled

Pulled and pushed - Thanks!

-- 
Bye, Peter Korsgaard