diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-08 17:02:44 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-08 17:02:44 (GMT) |
| commit | 53892de14c1a5fb76f0e342428aafa6e6932062a (patch) | |
| tree | a45acd39bfd0143437240827b22e84b9df34f772 /config/config.mk | |
| parent | a43bb564aef99765e323e89d2dd7a564e65fbbe0 (diff) | |
config: fix recursive deps
The latest kconfig stuff is more stringent when it comes to validating
the dependency of the symbols. It is no longer possible to have a symbol
depend on itself (such as our construct for arch/cc/libc/... was doing).
Fix our generated-file infrastructure to avoid these situations when the
new kconfig stuff will be merged (in a following changeset).
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'config/config.mk')
| -rw-r--r-- | config/config.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/config/config.mk b/config/config.mk index 434e463..13b9da3 100644 --- a/config/config.mk +++ b/config/config.mk @@ -80,7 +80,7 @@ define build_gen_choice_in $(SILENT)(echo "# $(2) menu"; \ echo "# Generated file, do not edit!!!"; \ echo ""; \ - echo "choice"; \ + echo "choice GEN_CHOICE_$(3)"; \ echo " bool"; \ echo " prompt \"$(2)\""; \ echo ""; \ @@ -90,13 +90,13 @@ define build_gen_choice_in echo "config $(3)_$${_entry}"; \ echo " bool"; \ echo " prompt \"$${entry}\""; \ - dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null); \ - if [ -n "$${dep_val}" ]; then \ - echo " $${dep_val#\# }"; \ - fi; \ if [ "$(5)" = "Y" ]; then \ echo " depends on $(3)_$${_entry}_AVAILABLE"; \ fi; \ + sed -r -e '/^## depends on /!d; s/^## / /;' $${file} 2>/dev/null;\ + sed -r -e '/^## select /!d; s/^## / /;' $${file} 2>/dev/null; \ + echo " help"; \ + sed -r -e '/^## help ?/!d; s/^## help ?/ /;' $${file} 2>/dev/null; \ echo ""; \ done; \ echo "endchoice"; \ @@ -157,10 +157,11 @@ define build_gen_menu_in echo "menuconfig $(3)_$${_entry}"; \ echo " bool"; \ echo " prompt \"$${entry}\""; \ - dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null); \ - if [ -n "$${dep_val}" ]; then \ - echo " $${dep_val#\# }"; \ - fi; \ + sed -r -e '/^## depends on /!d; s/^## / /;' $${file} 2>/dev/null;\ + sed -r -e '/^## select /!d; s/^## / /;' $${file} 2>/dev/null; \ + echo " help"; \ + sed -r -e '/^## help ?/!d; s/^## help ?/ /;' $${file} 2>/dev/null; \ + echo ""; \ echo "if $(3)_$${_entry}"; \ echo "source \"$${file}\""; \ echo "endif"; \ |