Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
"Nothing scary, just some random fixes:
- fix warnings of host programs
- fix "make tags" when COMPILED_SOURCE=1 is specified along with O=
- clarify help message of C=1 option
- fix dependency for ncurses compatibility check
- fix "make headers_install" for fakechroot environment"
* tag 'kbuild-fixes-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kconfig: fix sparse warnings in nconfig
kbuild: fix header installation under fakechroot environment
kconfig: Check for libncurses before menuconfig
Kbuild: tiny correction on `make help`
tags: honor COMPILED_SOURCE with apart output directory
genksyms: add printf format attribute to error_with_pos()
+21
-12
+1
-1
Makefile
+1
-1
Makefile
···
1437
1437
@echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
1438
1438
@echo ' make V=2 [targets] 2 => give reason for rebuild of target'
1439
1439
@echo ' make O=dir [targets] Locate all output files in "dir", including .config'
1440
-
@echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)'
1440
+
@echo ' make C=1 [targets] Check re-compiled c source with $$CHECK (sparse by default)'
1441
1441
@echo ' make C=2 [targets] Force check of all c source with $$CHECK'
1442
1442
@echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
1443
1443
@echo ' make W=n [targets] Enable extra gcc checks, n=1,2,3 where'
+9
-1
scripts/Makefile.headersinst
+9
-1
scripts/Makefile.headersinst
···
14
14
include scripts/Kbuild.include
15
15
16
16
srcdir := $(srctree)/$(obj)
17
-
subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.))
17
+
18
+
# When make is run under a fakechroot environment, the function
19
+
# $(wildcard $(srcdir)/*/.) doesn't only return directories, but also regular
20
+
# files. So, we are using a combination of sort/dir/wildcard which works
21
+
# with fakechroot.
22
+
subdirs := $(patsubst $(srcdir)/%/,%,\
23
+
$(filter-out $(srcdir)/,\
24
+
$(sort $(dir $(wildcard $(srcdir)/*/)))))
25
+
18
26
# caller may set destination dir (when installing to asm/)
19
27
_dst := $(if $(dst),$(dst),$(obj))
20
28
+1
-1
scripts/genksyms/genksyms.h
+1
-1
scripts/genksyms/genksyms.h
···
75
75
int yylex(void);
76
76
int yyparse(void);
77
77
78
-
void error_with_pos(const char *, ...);
78
+
void error_with_pos(const char *, ...) __attribute__ ((format(printf, 1, 2)));
79
79
80
80
/*----------------------------------------------------------------------*/
81
81
#define xmalloc(size) ({ void *__ptr = malloc(size); \
+1
-1
scripts/kconfig/Makefile
+1
-1
scripts/kconfig/Makefile
···
196
196
197
197
# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
198
198
PHONY += $(obj)/dochecklxdialog
199
-
$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
199
+
$(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/dochecklxdialog
200
200
$(obj)/dochecklxdialog:
201
201
$(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf)
202
202
+6
-6
scripts/kconfig/nconf.c
+6
-6
scripts/kconfig/nconf.c
···
271
271
static int items_num;
272
272
static int global_exit;
273
273
/* the currently selected button */
274
-
const char *current_instructions = menu_instructions;
274
+
static const char *current_instructions = menu_instructions;
275
275
276
276
static char *dialog_input_result;
277
277
static int dialog_input_result_len;
···
305
305
};
306
306
307
307
static const int function_keys_num = 9;
308
-
struct function_keys function_keys[] = {
308
+
static struct function_keys function_keys[] = {
309
309
{
310
310
.key_str = "F1",
311
311
.func = "Help",
···
508
508
index = (index + items_num) % items_num;
509
509
while (true) {
510
510
char *str = k_menu_items[index].str;
511
-
if (strcasestr(str, match_str) != 0)
511
+
if (strcasestr(str, match_str) != NULL)
512
512
return index;
513
513
if (flag == FIND_NEXT_MATCH_UP ||
514
514
flag == MATCH_TINKER_PATTERN_UP)
···
1067
1067
1068
1068
static void conf(struct menu *menu)
1069
1069
{
1070
-
struct menu *submenu = 0;
1070
+
struct menu *submenu = NULL;
1071
1071
const char *prompt = menu_get_prompt(menu);
1072
1072
struct symbol *sym;
1073
1073
int res;
···
1234
1234
static void conf_choice(struct menu *menu)
1235
1235
{
1236
1236
const char *prompt = _(menu_get_prompt(menu));
1237
-
struct menu *child = 0;
1237
+
struct menu *child = NULL;
1238
1238
struct symbol *active;
1239
1239
int selected_index = 0;
1240
1240
int last_top_row = 0;
···
1456
1456
}
1457
1457
}
1458
1458
1459
-
void setup_windows(void)
1459
+
static void setup_windows(void)
1460
1460
{
1461
1461
int lines, columns;
1462
1462
+2
-2
scripts/kconfig/nconf.gui.c
+2
-2
scripts/kconfig/nconf.gui.c
···
129
129
mkattrn(FUNCTION_TEXT, A_REVERSE);
130
130
}
131
131
132
-
void set_colors()
132
+
void set_colors(void)
133
133
{
134
134
start_color();
135
135
use_default_colors();
···
192
192
int lines = 0;
193
193
194
194
if (!text)
195
-
return 0;
195
+
return NULL;
196
196
197
197
for (i = 0; text[i] != '\0' && lines < line_no; i++)
198
198
if (text[i] == '\n')