NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kconfig: Refresh patches

Browse Source 
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Petr Vorel 2018-10-29 00:09:52 +01:00 committed by Peter Korsgaard
parent a3366b2705
commit 0d61e067eb
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
View File

@ -48,10 +48,10 @@ Index: kconfig/zconf.tab.c_shipped
=================================================================== ===================================================================
--- kconfig.orig/zconf.tab.c_shipped --- kconfig.orig/zconf.tab.c_shipped
+++ kconfig/zconf.tab.c_shipped +++ kconfig/zconf.tab.c_shipped
@@ -1515,7 +1515,7 @@ @@ -1515,7 +1515,7 @@ yyreduce:
* later regardless of whether it comes from the 'prompt' in * later regardless of whether it comes from the 'prompt' in
* mainmenu_stmt or here * mainmenu_stmt or here
*/ */
- menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL); - menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL);
+ menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL); + menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL);
} }
@ -62,9 +62,9 @@ Index: kconfig/zconf.y
--- kconfig.orig/zconf.y --- kconfig.orig/zconf.y
+++ kconfig/zconf.y +++ kconfig/zconf.y
@@ -127,7 +127,7 @@ no_mainmenu_stmt: /* empty */ @@ -127,7 +127,7 @@ no_mainmenu_stmt: /* empty */
* later regardless of whether it comes from the 'prompt' in * later regardless of whether it comes from the 'prompt' in
* mainmenu_stmt or here * mainmenu_stmt or here
*/ */
- menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL); - menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL);
+ menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL); + menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL);
}; };

14
support/kconfig/patches/06-br-build-system-integration.patch
View File

@ -2,7 +2,7 @@ Index: kconfig/Makefile
=================================================================== ===================================================================
--- kconfig.orig/Makefile --- kconfig.orig/Makefile
+++ kconfig/Makefile +++ kconfig/Makefile
@@ -211,7 +211,35 @@ qconf-cxxobjs := qconf.o @@ -205,7 +205,35 @@ qconf-cxxobjs := qconf.o
qconf-objs := zconf.tab.o qconf-objs := zconf.tab.o
gconf-objs := gconf.o zconf.tab.o gconf-objs := gconf.o zconf.tab.o
@ -39,8 +39,8 @@ Index: kconfig/Makefile
targets += zconf.lex.c targets += zconf.lex.c
clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck
@@ -243,7 +243,7 @@ HOSTLOADLIBES_nconf = $(shell \ @@ -243,7 +271,7 @@ HOSTLOADLIBES_nconf = $(shell \
|| echo "-lmenu -lpanel -lncurses" ) || echo "-lmenu -lpanel -lncurses" )
$(obj)/qconf.o: $(obj)/.tmp_qtcheck $(obj)/qconf.o: $(obj)/.tmp_qtcheck
-ifeq ($(MAKECMDGOALS),xconfig) -ifeq ($(MAKECMDGOALS),xconfig)
@ -48,8 +48,8 @@ Index: kconfig/Makefile
$(obj)/.tmp_qtcheck: $(src)/Makefile $(obj)/.tmp_qtcheck: $(src)/Makefile
-include $(obj)/.tmp_qtcheck -include $(obj)/.tmp_qtcheck
@@ -270,9 +276,8 @@ @@ -270,9 +298,8 @@ $(obj)/.tmp_qtcheck:
echo "KC_QT_MOC=$$moc" >> $@ echo "KC_QT_MOC=$$moc" >> $@
endif endif
+ifeq ($(MAKECMDGOALS),gconf) +ifeq ($(MAKECMDGOALS),gconf)
@ -59,10 +59,10 @@ Index: kconfig/Makefile
-include $(obj)/.tmp_gtkcheck -include $(obj)/.tmp_gtkcheck
# GTK+ needs some extra effort, too... # GTK+ needs some extra effort, too...
@@ -300,11 +305,8 @@ @@ -300,11 +327,8 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c
$(obj)/qconf.o: $(obj)/qconf.moc $(obj)/qconf.o: $(obj)/qconf.moc
-quiet_cmd_moc = MOC $@ -quiet_cmd_moc = MOC $@
- cmd_moc = $(KC_QT_MOC) -i $< -o $@ - cmd_moc = $(KC_QT_MOC) -i $< -o $@
- -

2
support/kconfig/patches/14-support-out-of-tree-config.patch
View File

@ -59,7 +59,7 @@ Index: kconfig/confdata.c
struct stat sb; struct stat sb;
@@ -851,8 +854,20 @@ static int conf_split_config(void) @@ -851,8 +854,20 @@ static int conf_split_config(void)
conf_read_simple(name, S_DEF_AUTO); conf_read_simple(name, S_DEF_AUTO);
sym_calc_value(modules_sym); sym_calc_value(modules_sym);
- if (chdir("include/config")) - if (chdir("include/config"))
- return 1; - return 1;