rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,8 @@
Index: kconfig/gconf.glade
===================================================================
--- kconfig.orig/gconf.glade 2013-12-27 22:14:32.395629843 +0100
+++ kconfig/gconf.glade 2013-12-27 22:14:32.387630158 +0100
--- kconfig.orig/gconf.glade
+++ kconfig/gconf.glade
@@ -4,7 +4,7 @@
<widget class="GtkWindow" id="window1">
@@ -21,9 +21,9 @@ Index: kconfig/gconf.glade
<property name="modal">False</property>
Index: kconfig/mconf.c
===================================================================
--- kconfig.orig/mconf.c 2013-12-27 22:14:32.395629843 +0100
+++ kconfig/mconf.c 2013-12-27 22:14:42.179244153 +0100
@@ -176,9 +176,9 @@
--- kconfig.orig/mconf.c
+++ kconfig/mconf.c
@@ -176,9 +176,9 @@ menu_instructions[] = N_(
"Arrow keys navigate the menu. "
"<Enter> selects submenus ---> (or empty submenus ----). "
"Highlighted letters are hotkeys. "
@@ -35,7 +35,7 @@ Index: kconfig/mconf.c
radiolist_instructions[] = N_(
"Use the arrow keys to navigate this window or "
"press the hotkey of the item you wish to select "
@@ -959,7 +959,7 @@
@@ -962,7 +962,7 @@ static int handle_exit(void)
if (conf_get_changed())
res = dialog_yesno(NULL,
_("Do you wish to save your new configuration?\n"
@@ -46,44 +46,44 @@ Index: kconfig/mconf.c
res = -1;
Index: kconfig/zconf.tab.c_shipped
===================================================================
--- kconfig.orig/zconf.tab.c_shipped 2013-12-27 22:14:32.395629843 +0100
+++ kconfig/zconf.tab.c_shipped 2013-12-27 22:14:32.391630000 +0100
@@ -2297,7 +2297,7 @@
--- kconfig.orig/zconf.tab.c_shipped
+++ kconfig/zconf.tab.c_shipped
@@ -1515,7 +1515,7 @@ yyreduce:
* later regardless of whether it comes from the 'prompt' in
* mainmenu_stmt or here
*/
- menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL);
+ menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL);
}
sym_init();
_menu_init();
- rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
+ rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
if (getenv("ZCONF_DEBUG"))
zconfdebug = 1;
break;
Index: kconfig/zconf.y
===================================================================
--- kconfig.orig/zconf.y 2013-12-27 22:14:32.395629843 +0100
+++ kconfig/zconf.y 2013-12-27 22:14:32.391630000 +0100
@@ -493,7 +493,7 @@
--- kconfig.orig/zconf.y
+++ kconfig/zconf.y
@@ -127,7 +127,7 @@ no_mainmenu_stmt: /* empty */
* later regardless of whether it comes from the 'prompt' in
* mainmenu_stmt or here
*/
- menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL);
+ menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL);
};
sym_init();
_menu_init();
- rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
+ rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
if (getenv("ZCONF_DEBUG"))
zconfdebug = 1;
Index: kconfig/confdata.c
===================================================================
--- kconfig.orig/confdata.c 2013-12-27 22:14:32.395629843 +0100
+++ kconfig/confdata.c 2013-12-27 22:14:32.391630000 +0100
@@ -25,7 +25,7 @@
--- kconfig.orig/confdata.c
+++ kconfig/confdata.c
@@ -30,7 +30,7 @@ static void conf_message(const char *fmt
static const char *conf_filename;
static int conf_lineno, conf_warnings, conf_unsaved;
static int conf_lineno, conf_warnings;
-const char conf_defname[] = "arch/$ARCH/defconfig";
+const char conf_defname[] = ".defconfig";
static void conf_warning(const char *fmt, ...)
{
@@ -63,7 +63,7 @@
@@ -69,7 +69,7 @@ static void conf_message(const char *fmt
const char *conf_get_configname(void)
{
@@ -94,9 +94,9 @@ Index: kconfig/confdata.c
}
Index: kconfig/qconf.cc
===================================================================
--- kconfig.orig/qconf.cc 2013-12-27 22:12:15.825013567 +0100
+++ kconfig/qconf.cc 2013-12-27 22:14:57.826627300 +0100
@@ -70,7 +70,7 @@
--- kconfig.orig/qconf.cc
+++ kconfig/qconf.cc
@@ -55,7 +55,7 @@ static inline QString qgettext(const QSt
}
ConfigSettings::ConfigSettings()

89
bsp/buildroot/support/kconfig/patches/06-br-build-system-integration.patch
View File

@@ -1,35 +1,74 @@
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: b/Makefile
Index: kconfig/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -159,11 +159,11 @@
--- kconfig.orig/Makefile
+++ kconfig/Makefile
@@ -205,7 +205,35 @@ qconf-cxxobjs := qconf.o
qconf-objs := zconf.tab.o
gconf-objs := gconf.o zconf.tab.o
hostprogs-y := conf
-ifeq ($(MAKECMDGOALS),nconfig)
-hostprogs-y := conf nconf mconf kxgettext qconf gconf
+hostprogs-y := conf
+
+ifeq ($(MAKECMDGOALS),nconf)
hostprogs-y += nconf
endif
-ifeq ($(MAKECMDGOALS),menuconfig)
+ hostprogs-y += nconf
+endif
+
+ifeq ($(MAKECMDGOALS),mconf)
hostprogs-y += mconf
endif
+ hostprogs-y += mconf
+endif
+
+ifeq ($(MAKECMDGOALS),update-po-config)
+ hostprogs-y += kxgettext
+endif
+
+ifeq ($(MAKECMDGOALS),qconf)
+ qconf-target := 1
+endif
+
+ifeq ($(MAKECMDGOALS),gconf)
+ gconf-target := 1
+endif
+
+ifeq ($(qconf-target),1)
+ hostprogs-y += qconf
+endif
+
+ifeq ($(gconf-target),1)
+ hostprogs-y += gconf
+endif
@@ -171,10 +171,10 @@
hostprogs-y += kxgettext
endif
targets += zconf.lex.c
clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck
@@ -243,7 +271,7 @@ HOSTLOADLIBES_nconf = $(shell \
|| echo "-lmenu -lpanel -lncurses" )
$(obj)/qconf.o: $(obj)/.tmp_qtcheck
-ifeq ($(MAKECMDGOALS),xconfig)
+ifeq ($(MAKECMDGOALS),qconf)
qconf-target := 1
endif
-ifeq ($(MAKECMDGOALS),gconfig)
+ifeq ($(MAKECMDGOALS),gconf)
gconf-target := 1
$(obj)/.tmp_qtcheck: $(src)/Makefile
-include $(obj)/.tmp_qtcheck
@@ -270,9 +298,8 @@ $(obj)/.tmp_qtcheck:
echo "KC_QT_MOC=$$moc" >> $@
endif
+ifeq ($(MAKECMDGOALS),gconf)
$(obj)/gconf.o: $(obj)/.tmp_gtkcheck
-
-ifeq ($(MAKECMDGOALS),gconfig)
-include $(obj)/.tmp_gtkcheck
# GTK+ needs some extra effort, too...
@@ -300,11 +327,8 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c
$(obj)/qconf.o: $(obj)/qconf.moc
-quiet_cmd_moc = MOC $@
- cmd_moc = $(KC_QT_MOC) -i $< -o $@
-
$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
- $(call cmd,moc)
+ $(KC_QT_MOC) -i $< -o $@
# Extract gconf menu items for i18n support
$(obj)/gconf.glade.h: $(obj)/gconf.glade

8
bsp/buildroot/support/kconfig/patches/10-br-build-system.patch
View File

@@ -3,10 +3,10 @@
foo.h | 12 ++++++++++++
2 files changed, 65 insertions(+)
Index: b/Makefile.br
Index: kconfig/Makefile.br
===================================================================
--- /dev/null
+++ b/Makefile.br
+++ kconfig/Makefile.br
@@ -0,0 +1,53 @@
+src := .
+top_srcdir=../../
@@ -61,10 +61,10 @@ Index: b/Makefile.br
+
+FORCE:
+.PHONY: FORCE clean distclean
Index: b/foo.h
Index: kconfig/foo.h
===================================================================
--- /dev/null
+++ b/foo.h
+++ kconfig/foo.h
@@ -0,0 +1,12 @@
+#ifndef __KCONFIG_FOO_H
+#define __KCONFIG_FOO_H

8
bsp/buildroot/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
View File

@@ -2,11 +2,11 @@
lxdialog/check-lxdialog.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/lxdialog/check-lxdialog.sh
Index: kconfig/lxdialog/check-lxdialog.sh
===================================================================
--- a/lxdialog/check-lxdialog.sh
+++ b/lxdialog/check-lxdialog.sh
@@ -36,7 +36,7 @@
--- kconfig.orig/lxdialog/check-lxdialog.sh
+++ kconfig/lxdialog/check-lxdialog.sh
@@ -41,7 +41,7 @@ ccflags()
}
# Temp file, try to clean up after us

8
bsp/buildroot/support/kconfig/patches/12-fix-glade-file-path.patch
View File

@@ -2,11 +2,11 @@
gconf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/gconf.c
Index: kconfig/gconf.c
===================================================================
--- a/gconf.c
+++ b/gconf.c
@@ -1486,7 +1486,7 @@
--- kconfig.orig/gconf.c
+++ kconfig/gconf.c
@@ -1462,7 +1462,7 @@ int main(int ac, char *av[])
/* Determine GUI path */
env = getenv(SRCTREE);
if (env)

42
bsp/buildroot/support/kconfig/patches/14-support-out-of-tree-config.patch
View File

@@ -4,11 +4,11 @@
util.c | 16 +++++++++++++--
3 files changed, 61 insertions(+), 18 deletions(-)
Index: b/conf.c
Index: kconfig/conf.c
===================================================================
--- a/conf.c
+++ b/conf.c
@@ -558,7 +558,6 @@
--- kconfig.orig/conf.c
+++ kconfig/conf.c
@@ -565,7 +565,6 @@ int main(int ac, char **av)
}
name = av[optind];
conf_parse(name);
@@ -16,10 +16,10 @@ Index: b/conf.c
if (sync_kconfig) {
name = conf_get_configname();
if (stat(name, &tmpstat)) {
Index: b/confdata.c
Index: kconfig/confdata.c
===================================================================
--- a/confdata.c
+++ b/confdata.c
--- kconfig.orig/confdata.c
+++ kconfig/confdata.c
@@ -13,6 +13,7 @@
#include <string.h>
#include <time.h>
@@ -28,7 +28,7 @@ Index: b/confdata.c
#include "lkc.h"
@@ -70,9 +71,7 @@
@@ -76,9 +77,7 @@ const char *conf_get_configname(void)
const char *conf_get_autoconfig_name(void)
{
@@ -39,7 +39,7 @@ Index: b/confdata.c
}
static char *conf_expand_value(const char *in)
@@ -742,6 +741,9 @@
@@ -748,6 +747,9 @@ int conf_write(const char *name)
char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
char *env;
@@ -49,7 +49,7 @@ Index: b/confdata.c
dirname[0] = 0;
if (name && name[0]) {
struct stat st;
@@ -836,6 +838,7 @@
@@ -842,6 +844,7 @@ static int conf_split_config(void)
{
const char *name;
char path[PATH_MAX+1];
@@ -57,9 +57,9 @@ Index: b/confdata.c
char *s, *d, c;
struct symbol *sym;
struct stat sb;
@@ -844,8 +847,20 @@
name = conf_get_autoconfig_name();
@@ -851,8 +854,20 @@ static int conf_split_config(void)
conf_read_simple(name, S_DEF_AUTO);
sym_calc_value(modules_sym);
- if (chdir("include/config"))
- return 1;
@@ -80,7 +80,7 @@ Index: b/confdata.c
res = 0;
for_all_symbols(i, sym) {
@@ -938,9 +953,11 @@
@@ -945,9 +960,11 @@ static int conf_split_config(void)
close(fd);
}
out:
@@ -95,7 +95,7 @@ Index: b/confdata.c
return res;
}
@@ -950,25 +967,38 @@
@@ -957,25 +974,38 @@ int conf_write_autoconf(void)
const char *name;
FILE *out, *tristate, *out_h;
int i;
@@ -138,7 +138,7 @@ Index: b/confdata.c
if (!out_h) {
fclose(out);
fclose(tristate);
@@ -1000,19 +1030,22 @@
@@ -1007,19 +1037,22 @@ int conf_write_autoconf(void)
name = getenv("KCONFIG_AUTOHEADER");
if (!name)
name = "include/generated/autoconf.h";
@@ -164,11 +164,11 @@ Index: b/confdata.c
return 1;
return 0;
Index: b/util.c
Index: kconfig/util.c
===================================================================
--- a/util.c
+++ b/util.c
@@ -34,6 +34,8 @@
--- kconfig.orig/util.c
+++ kconfig/util.c
@@ -34,6 +34,8 @@ struct file *file_lookup(const char *nam
/* write a dependency file as used by kbuild to track dependencies */
int file_write_dep(const char *name)
{
@@ -177,7 +177,7 @@ Index: b/util.c
struct symbol *sym, *env_sym;
struct expr *e;
struct file *file;
@@ -41,7 +43,16 @@
@@ -41,7 +43,16 @@ int file_write_dep(const char *name)
if (!name)
name = ".kconfig.d";
@@ -195,7 +195,7 @@ Index: b/util.c
if (!out)
return 1;
fprintf(out, "deps_config := \\\n");
@@ -72,7 +83,8 @@
@@ -72,7 +83,8 @@ int file_write_dep(const char *name)
fprintf(out, "\n$(deps_config): ;\n");
fclose(out);

24
bsp/buildroot/support/kconfig/patches/15-fix-qconf-moc-rule.patch
View File

@@ -1,24 +0,0 @@
Fix the rule that generates the .moc file
The Linux kernel has a "cmd" make function, but we don't have it in
Buildroot, so we need to adjust this rule.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -309,11 +309,8 @@
$(obj)/qconf.o: $(obj)/qconf.moc
-quiet_cmd_moc = MOC $@
- cmd_moc = $(KC_QT_MOC) -i $< -o $@
-
$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
- $(call cmd,moc)
+ $(KC_QT_MOC) -i $< -o $@
# Extract gconf menu items for I18N support
$(obj)/gconf.glade.h: $(obj)/gconf.glade

8
bsp/buildroot/support/kconfig/patches/16-fix-space-to-de-select-options.patch
View File

@@ -26,10 +26,10 @@ Date: Wed Nov 13 22:45:02 2013 +0100
---
Note: I'll be running this upstream soonish.
diff --git a/support/kconfig/lxdialog/menubox.c b/support/kconfig/lxdialog/menubox.c
index 48d382e..6fc7e78 100644
--- a/lxdialog/menubox.c
+++ b/lxdialog/menubox.c
Index: kconfig/lxdialog/menubox.c
===================================================================
--- kconfig.orig/lxdialog/menubox.c
+++ kconfig/lxdialog/menubox.c
@@ -285,7 +285,7 @@ do_resize:
if (key < 256 && isalpha(key))
key = tolower(key);

26
bsp/buildroot/support/kconfig/patches/17-backport-kecho.patch Normal file
View File

@@ -0,0 +1,26 @@
This commit added kecho to scripts/Kbuild.include (and doc).
Backported just Kbuild.include part to Makefile
commit 5410ecc0def8955ab99810c5626cc7e156991896
Author: Mike Frysinger <vapier@gentoo.org>
Date: Thu Nov 6 03:31:34 2008 -0500
kbuild: introduce $(kecho) convenience echo
Index: kconfig/Makefile
===================================================================
--- kconfig.orig/Makefile
+++ kconfig/Makefile
@@ -6,6 +6,12 @@
PHONY += xconfig gconfig menuconfig config syncconfig update-po-config \
localmodconfig localyesconfig
+# Easy method for doing a status message
+ kecho := :
+ quiet_kecho := echo
+silent_kecho := :
+kecho := $($(quiet)kecho)
+
ifdef KBUILD_KCONFIG
Kconfig := $(KBUILD_KCONFIG)
else

50
bsp/buildroot/support/kconfig/patches/17-kconfig-lxdialog-get-ncurses-CFLAGS-with-pkg-config.patch
View File

@@ -1,50 +0,0 @@
From be8af2d54a66911693eddc556e4f7a866670082b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 14 Sep 2014 12:57:50 +0200
Subject: [PATCH] kconfig/lxdialog: get ncurses CFLAGS with pkg-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This makes "make menuconfig" also work on systems where ncurses is not
installed in a standard location (such as on NixOS).
This patch changes ccflags() so that it tries pkg-config first, and only
if pkg-config fails does it go back to the fallback/manual checks. This
is the same algorithm that ldflags() already uses.
Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
[This patch is already applied upstream (is part of linux v3.18):
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=be8af2d54a66911693eddc556e4f7a866670082b
I'm adding this instead of doing a full upstream kconfig sync because
there was a conflict in one of the Buildroot kconfig patches (against
linux 3.18-rc1), which I was unable to resolve. Just drop this patch next time
Buildroot kconfig is synced against upstream.
]
scripts/kconfig/lxdialog/check-lxdialog.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 9d2a4c5..5075ebf 100755
--- a/lxdialog/check-lxdialog.sh
+++ b/lxdialog/check-lxdialog.sh
@@ -21,7 +21,11 @@ ldflags()
# Where is ncurses.h?
ccflags()
{
- if [ -f /usr/include/ncursesw/curses.h ]; then
+ if pkg-config --cflags ncursesw 2>/dev/null; then
+ echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
+ elif pkg-config --cflags ncurses 2>/dev/null; then
+ echo '-DCURSES_LOC="<ncurses.h>"'
+ elif [ -f /usr/include/ncursesw/curses.h ]; then
echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"'
echo ' -DNCURSES_WIDECHAR=1'
elif [ -f /usr/include/ncurses/ncurses.h ]; then
--
2.1.3

45
bsp/buildroot/support/kconfig/patches/18-kconfig-nconfig-fix-multi-byte-UTF-handling.patch
View File

@@ -1,45 +0,0 @@
From 7285996aa0006d671bb01f0d35991d254b2b2b01 Mon Sep 17 00:00:00 2001
From: Brian Norris <computersforpeace@gmail.com>
Date: Wed, 4 Jun 2014 00:52:31 -0700
Subject: kconfig: nconfig: fix multi-byte UTF handling
Currently, Kconfig descriptions that use multi-byte UTF-8 characters
(such as MTD_NAND_CAFE) will have their menu entries dropped from the
'make nconfig' ncurses menu, and all subsequent entries in the same
window will be omitted. This seems to be due to the ncurses 'menu'
library, which does not traditionally handle UTF-8 >8-bit characters
properly.
The ncursesw library ('w' is for "wide") is written to handle these
UTF-8 characters, and is practically a drop-in replacement at the source
level. Use it by default, if available.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=43067
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Martin Walch <walch.martin@web.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
scripts/kconfig/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'scripts/kconfig/Makefile')
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index e7bf38e..c059385 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -191,7 +191,8 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
HOSTLOADLIBES_nconf = $(shell \
- pkg-config --libs menu panel ncurses 2>/dev/null \
+ pkg-config --libs menuw panelw ncursesw 2>/dev/null \
+ || pkg-config --libs menu panel ncurses 2>/dev/null \
|| echo "-lmenu -lpanel -lncurses" )
$(obj)/qconf.o: $(obj)/.tmp_qtcheck
--
cgit v1.1

27
bsp/buildroot/support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch Normal file
View File

@@ -0,0 +1,27 @@
commit 0f56304521db42bd2c05867fd78a247104a4ad95
Author: Henrique Marks <henrique.marks@datacom.ind.br>
Date: Mon, 7 Dec 2015 12:08:45 -0200
merge_config.sh: create temporary files in /tmp
Creating temporary files in /tmp (or the path pointed by $TMPDIR) allows the
buildroot top directory to be read-only and shareable between multible builds.
This follows what other scripts do, e.g. check-kernel-headers.sh.
Signed-off-by: Henrique Marks <henrique.marks@datacom.ind.br>
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Index: kconfig/merge_config.sh
===================================================================
--- kconfig.orig/merge_config.sh
+++ kconfig/merge_config.sh
@@ -100,7 +100,7 @@ fi
MERGE_LIST=$*
SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
-TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
+TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
echo "Using $INITFILE as base"
cat $INITFILE > $TMP_FILE

47
bsp/buildroot/support/kconfig/patches/19-merge_config.sh-add-br2-external-support.patch Normal file
View File

@@ -0,0 +1,47 @@
commit 28fac3973b3c693c453594b007c08c1e1e5c4af3
Author: Ilya Kuzmich <ilya.kuzmich@gmail.com>
Date: Tue, 9 Jan 2018 14:37:43 +0300
merge_config.sh: add br2-external support
Pass BR2_EXTERNAL value via -e option.
This will prevent merge_config.sh from silently eating any symbols defined in
external trees on a clean buildroot tree invocation.
Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Index: kconfig/merge_config.sh
===================================================================
--- kconfig.orig/merge_config.sh
+++ kconfig/merge_config.sh
@@ -33,6 +33,7 @@ usage() {
echo " -n use allnoconfig instead of alldefconfig"
echo " -r list redundant entries when merging fragments"
echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead."
+ echo " -e colon-separated list of br2-external trees to use (optional)"
}
RUNMAKE=true
@@ -71,6 +72,11 @@ while true; do
shift 2
continue
;;
+ "-e")
+ EXTERNAL_ARG="BR2_EXTERNAL=$2"
+ shift 2
+ continue
+ ;;
*)
break
;;
@@ -151,7 +157,7 @@ fi
# Use the merged file as the starting point for:
# alldefconfig: Fills in any missing symbols with Kconfig default
# allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
+make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET
# Check all specified config values took (might have missed-dependency issues)

31
bsp/buildroot/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch Normal file
View File

@@ -0,0 +1,31 @@
Index: kconfig/merge_config.sh
===================================================================
--- kconfig.orig/merge_config.sh
+++ kconfig/merge_config.sh
@@ -34,12 +34,16 @@ usage() {
echo " -r list redundant entries when merging fragments"
echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead."
echo " -e colon-separated list of br2-external trees to use (optional)"
+ echo
+ echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_
+ environment variable."
}
RUNMAKE=true
ALLTARGET=alldefconfig
WARNREDUN=false
OUTPUT=.
+CONFIG_PREFIX=${CONFIG_-CONFIG_}
while true; do
case $1 in
@@ -105,7 +109,8 @@ if [ ! -r "$INITFILE" ]; then
fi
MERGE_LIST=$*
-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
+SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
+
TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
echo "Using $INITFILE as base"

32
bsp/buildroot/support/kconfig/patches/21-Avoid-false-positive-matches-from-comment-lines.patch Normal file
View File

@@ -0,0 +1,32 @@
Index: kconfig/merge_config.sh
===================================================================
--- kconfig.orig/merge_config.sh
+++ kconfig/merge_config.sh
@@ -109,7 +109,8 @@ if [ ! -r "$INITFILE" ]; then
fi
MERGE_LIST=$*
-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
+SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p"
+SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p"
TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
@@ -123,7 +124,7 @@ for MERGE_FILE in $MERGE_LIST ; do
echo "The merge file '$MERGE_FILE' does not exist. Exit." >&2
exit 1
fi
- CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
+ CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $MERGE_FILE)
for CFG in $CFG_LIST ; do
grep -q -w $CFG $TMP_FILE || continue
@@ -166,7 +167,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERN
# Check all specified config values took (might have missed-dependency issues)
-for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
+for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do
REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG")

8
bsp/buildroot/support/kconfig/patches/series
View File

@@ -4,7 +4,9 @@
11-use-mktemp-for-lxdialog.patch
12-fix-glade-file-path.patch
14-support-out-of-tree-config.patch
15-fix-qconf-moc-rule.patch
16-fix-space-to-de-select-options.patch
17-kconfig-lxdialog-get-ncurses-CFLAGS-with-pkg-config.patch
18-kconfig-nconfig-fix-multi-byte-UTF-handling.patch
17-backport-kecho.patch
18-merge-config.sh-create-temporary-files-in-tmp.patch
19-merge_config.sh-add-br2-external-support.patch
20-merge_config.sh-Allow-to-define-config-prefix.patch
21-Avoid-false-positive-matches-from-comment-lines.patch