hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "build: config: allow bool to select a module pkg" 

This reverts commit 8514b6b42c.

Reverting this commit in preparation for reverting
dcf3e63a35 ("build: scripts/config - update to kconfig-v5.6") which
introduces various unaddressed build breakages.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
master
Jo-Philipp Wich 2020-04-12 00:09:41 +02:00
parent 93294b516e
commit fbc01f2a4c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/config/README
View File

@ -22,9 +22,7 @@ OpenWrt Buildroot:
that may cause one. that may cause one.
- use pre-built *.lex.c *.tab.[ch] files by default, to avoid depending on - use pre-built *.lex.c *.tab.[ch] files by default, to avoid depending on
flex & bison. Rebuild/remove these files only if running make with flex & bison. Rebuild/remove these files only if running make with
BUILD_SHIPPED_FILES defined. BUILD_SHIPPED_FILES defined
- allow a bool symbol to select a tristate symbol that depends on m (i.e.
a package that should only be built as a module).
For a full list of changes, see the repository at: For a full list of changes, see the repository at:
https://github.com/cotequeiroz/linux/commits/openwrt/scripts/kconfig https://github.com/cotequeiroz/linux/commits/openwrt/scripts/kconfig

2
scripts/config/symbol.c
View File

@ -205,7 +205,7 @@ static void sym_calc_visibility(struct symbol *sym)
tri = yes; tri = yes;
if (sym->dir_dep.expr) if (sym->dir_dep.expr)
tri = expr_calc_value(sym->dir_dep.expr); tri = expr_calc_value(sym->dir_dep.expr);
if (tri == mod) if (tri == mod && sym_get_type(sym) == S_BOOLEAN)
tri = yes; tri = yes;
if (sym->dir_dep.tri != tri) { if (sym->dir_dep.tri != tri) {
sym->dir_dep.tri = tri; sym->dir_dep.tri = tri;