Bump buildroot to 2019.02
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user