Commit 2762db75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kconfig-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull Kconfig updates from Masahiro Yamada:

 - Support only Qt5 for qconf

 - Validate signal/slot connection at compile time of qconf

 - Sanitize header includes

* tag 'kconfig-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: doc: fix $(fileno) to $(filename)
  kconfig: fix return value of do_error_if()
  kconfig: clean up header inclusion
  kconfig: qconf: show Qt version in the About dialog
  kconfig: make lkc.h self-sufficient #include-wise
  kconfig: qconf: convert to Qt5 new signal/slot connection syntax
  kconfig: qconf: use a variable to pass packages to pkg-config
  kconfig: qconf: drop Qt4 support
parents 7b95f056 90d39628

Documentation/kbuild/kconfig-macro-language.rst

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ Like Make, Kconfig provides several built-in functions. Every function takes a 
particular number of arguments.



In Make, every built-in function takes at least one argument. Kconfig allows

zero argument for built-in functions, such as $(fileno), $(lineno). You could

zero argument for built-in functions, such as $(filename), $(lineno). You could

consider those as "built-in variable", but it is just a matter of how we call

it after all. Let's say "built-in function" here to refer to natively supported

functionality.

scripts/kconfig/conf.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <time.h>

#include <unistd.h>

#include <getopt.h>

#include <sys/stat.h>

#include <sys/time.h>

#include <errno.h>

scripts/kconfig/confdata.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <sys/mman.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <ctype.h>

#include <errno.h>

#include <fcntl.h>

scripts/kconfig/lexer.l

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>



#include "lkc.h"

#include "parser.tab.h"

scripts/kconfig/lkc.h

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 
#ifndef LKC_H

#define LKC_H



#include <assert.h>

#include <stdio.h>

#include <stdlib.h>



#include "expr.h"



#ifdef __cplusplus

CRA Git | Maintained and supported by SUSTech CRA and CCSE