[PATCH 1/2] eglibc-options.inc: Fix string options

[PATCH 1/2] eglibc-options.inc: Fix string options

[Andrei Gherzan]

Add quotation marks for OPTION_EGLIBC_NSSWITCH_FIXED* options. If not, Kconfig
will ignore the value and will use the default one which is "".

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 meta/recipes-core/eglibc/eglibc-options.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc
index 74412e8..c55d05d 100644
--- a/meta/recipes-core/eglibc/eglibc-options.inc
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -7,8 +7,8 @@ def eglibc_cfg(feature, features, tokens, cnf):
         for token in tokens:
             cnf.extend([token + '=n'])
             if token == 'OPTION_EGLIBC_NSSWITCH':
-                cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"])
-                cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"])
+                cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG=\"${S}/nss/nsswitch.conf\""])
+                cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS=\"${S}/nss/fixed-nsswitch.functions\""])
 
 # arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code
 def distro_features_check_deps(distro_features):
-- 
1.7.9.5

[PATCH 2/2] eglibc.inc: Remove quotation marks from OPTION_EGLIBC_NSSWITCH_FIXED_*

[Andrei Gherzan]

Kconfig outputs strings with quotation marks. When eglibc tries to see if
the paths exists, uses wildcard make function which doesn't strip out the
quotation marks - checking for path fails. So strip out the quotation
marks from OPTION_EGLIBC_NSSWITCH_FIXED_* option-groups.config.
(see nss/Makefile)

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 meta/recipes-core/eglibc/eglibc.inc |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 40dd6b5..375b9bc 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -75,6 +75,10 @@ do_configure_prepend() {
 
 do_configure_append() {
 	oe_runmake config
+
+	# Remove quotation marks from OPTION_EGLIBC_NSSWITCH_FIXED_*. This will
+	# avoid install error.
+	sed -i 's/^OPTION_EGLIBC_NSSWITCH_FIXED_\(.*\)="\(.*\)"$/OPTION_EGLIBC_NSSWITCH_FIXED_\1=\2/' option-groups.config
 }
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
-- 
1.7.9.5