Commit 32b2ee5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Kconfig updates from Masahiro Yamada:

 - remove '---help---' keyword support

 - fix mouse events for 'menuconfig' symbols in search view of qconf

 - code cleanups of qconf

* tag 'kconfig-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (24 commits)
  kconfig: qconf: move setOptionMode() to ConfigList from ConfigView
  kconfig: qconf: do not limit the pop-up menu to the first row
  kconfig: qconf: refactor icon setups
  kconfig: qconf: remove unused voidPix, menuInvPix
  kconfig: qconf: remove ConfigItem::text/setText
  kconfig: qconf: remove ConfigList::addColumn/removeColumn
  kconfig: qconf: remove ConfigItem::pixmap/setPixmap
  kconfig: qconf: drop more localization code
  kconfig: qconf: remove 'parent' from ConfigList::updateMenuList()
  kconfig: qconf: remove unused argument from ConfigView::updateList()
  kconfig: qconf: remove unused argument from ConfigList::updateList()
  kconfig: qconf: omit parent to QHBoxLayout()
  kconfig: qconf: remove name from ConfigSearchWindow constructor
  kconfig: qconf: remove unused ConfigList::listView()
  kconfig: qconf: overload addToolBar() to create and insert toolbar
  kconfig: qconf: remove toolBar from ConfigMainWindow members
  kconfig: qconf: use 'menu' variable for (QMenu *)
  kconfig: qconf: do not use 'menu' variable for (QMenuBar *)
  kconfig: qconf: remove ->addSeparator() to menuBar
  kconfig: add 'static' to some file-local data
  ...
parents a1d21081 d4bbe8a1

scripts/checkkconfigsymbols.py

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ REGEX_SOURCE_SYMBOL = re.compile(SOURCE_SYMBOL) 
REGEX_KCONFIG_DEF = re.compile(DEF)

REGEX_KCONFIG_EXPR = re.compile(EXPR)

REGEX_KCONFIG_STMT = re.compile(STMT)

REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$")

REGEX_KCONFIG_HELP = re.compile(r"^\s+help\s*$")

REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$")

REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+")

REGEX_QUOTES = re.compile("(\"(.*?)\")")

scripts/checkpatch.pl

+1 −5
Original line number Diff line number Diff line
@@ -3045,11 +3045,7 @@ sub process { 


				if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) {

					$is_start = 1;

				} elsif ($lines[$ln - 1] =~ /^\+\s*(?:help|---help---)\s*$/) {

					if ($lines[$ln - 1] =~ "---help---") {

						WARN("CONFIG_DESCRIPTION",

						     "prefer 'help' over '---help---' for new help texts\n" . $herecurr);

					}

				} elsif ($lines[$ln - 1] =~ /^\+\s*(?:---)?help(?:---)?$/) {

					$length = -1;

				}

scripts/kconfig/images.c

+15 −15
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


#include "images.h"



const char *xpm_load[] = {

const char * const xpm_load[] = {

"22 22 5 1",

". c None",

"# c #000000",
@@ -35,7 +35,7 @@ const char *xpm_load[] = { 
"###############.......",

"......................"};



const char *xpm_save[] = {

const char * const xpm_save[] = {

"22 22 5 1",

". c None",

"# c #000000",
@@ -65,7 +65,7 @@ const char *xpm_save[] = { 
"..##################..",

"......................"};



const char *xpm_back[] = {

const char * const xpm_back[] = {

"22 22 3 1",

". c None",

"# c #000083",
@@ -93,7 +93,7 @@ const char *xpm_back[] = { 
"......................",

"......................"};



const char *xpm_tree_view[] = {

const char * const xpm_tree_view[] = {

"22 22 2 1",

". c None",

"# c #000000",
@@ -120,7 +120,7 @@ const char *xpm_tree_view[] = { 
"......................",

"......................"};



const char *xpm_single_view[] = {

const char * const xpm_single_view[] = {

"22 22 2 1",

". c None",

"# c #000000",
@@ -147,7 +147,7 @@ const char *xpm_single_view[] = { 
"......................",

"......................"};



const char *xpm_split_view[] = {

const char * const xpm_split_view[] = {

"22 22 2 1",

". c None",

"# c #000000",
@@ -174,7 +174,7 @@ const char *xpm_split_view[] = { 
"......................",

"......................"};



const char *xpm_symbol_no[] = {

const char * const xpm_symbol_no[] = {

"12 12 2 1",

"  c white",

". c black",
@@ -191,7 +191,7 @@ const char *xpm_symbol_no[] = { 
" .......... ",

"            "};



const char *xpm_symbol_mod[] = {

const char * const xpm_symbol_mod[] = {

"12 12 2 1",

"  c white",

". c black",
@@ -208,7 +208,7 @@ const char *xpm_symbol_mod[] = { 
" .......... ",

"            "};



const char *xpm_symbol_yes[] = {

const char * const xpm_symbol_yes[] = {

"12 12 2 1",

"  c white",

". c black",
@@ -225,7 +225,7 @@ const char *xpm_symbol_yes[] = { 
" .......... ",

"            "};



const char *xpm_choice_no[] = {

const char * const xpm_choice_no[] = {

"12 12 2 1",

"  c white",

". c black",
@@ -242,7 +242,7 @@ const char *xpm_choice_no[] = { 
"    ....    ",

"            "};



const char *xpm_choice_yes[] = {

const char * const xpm_choice_yes[] = {

"12 12 2 1",

"  c white",

". c black",
@@ -259,7 +259,7 @@ const char *xpm_choice_yes[] = { 
"    ....    ",

"            "};



const char *xpm_menu[] = {

const char * const xpm_menu[] = {

"12 12 2 1",

"  c white",

". c black",
@@ -276,7 +276,7 @@ const char *xpm_menu[] = { 
" .......... ",

"            "};



const char *xpm_menu_inv[] = {

const char * const xpm_menu_inv[] = {

"12 12 2 1",

"  c white",

". c black",
@@ -293,7 +293,7 @@ const char *xpm_menu_inv[] = { 
" .......... ",

"            "};



const char *xpm_menuback[] = {

const char * const xpm_menuback[] = {

"12 12 2 1",

"  c white",

". c black",
@@ -310,7 +310,7 @@ const char *xpm_menuback[] = { 
" .......... ",

"            "};



const char *xpm_void[] = {

const char * const xpm_void[] = {

"12 12 2 1",

"  c white",

". c black",

scripts/kconfig/images.h

+15 −15
Original line number Diff line number Diff line
@@ -10,21 +10,21 @@ 
extern "C" {

#endif



extern const char *xpm_load[];

extern const char *xpm_save[];

extern const char *xpm_back[];

extern const char *xpm_tree_view[];

extern const char *xpm_single_view[];

extern const char *xpm_split_view[];

extern const char *xpm_symbol_no[];

extern const char *xpm_symbol_mod[];

extern const char *xpm_symbol_yes[];

extern const char *xpm_choice_no[];

extern const char *xpm_choice_yes[];

extern const char *xpm_menu[];

extern const char *xpm_menu_inv[];

extern const char *xpm_menuback[];

extern const char *xpm_void[];

extern const char * const xpm_load[];

extern const char * const xpm_save[];

extern const char * const xpm_back[];

extern const char * const xpm_tree_view[];

extern const char * const xpm_single_view[];

extern const char * const xpm_split_view[];

extern const char * const xpm_symbol_no[];

extern const char * const xpm_symbol_mod[];

extern const char * const xpm_symbol_yes[];

extern const char * const xpm_choice_no[];

extern const char * const xpm_choice_yes[];

extern const char * const xpm_menu[];

extern const char * const xpm_menu_inv[];

extern const char * const xpm_menuback[];

extern const char * const xpm_void[];



#ifdef __cplusplus

}

scripts/kconfig/lexer.l

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct buffer { 
	YY_BUFFER_STATE state;

};



struct buffer *current_buf;

static struct buffer *current_buf;



static int last_ts, first_ts;
@@ -105,7 +105,7 @@ n [A-Za-z0-9_-] 
"endchoice"		return T_ENDCHOICE;

"endif"			return T_ENDIF;

"endmenu"		return T_ENDMENU;

"help"|"---help---"	return T_HELP;

"help"			return T_HELP;

"hex"			return T_HEX;

"if"			return T_IF;

"imply"			return T_IMPLY;

CRA Git | Maintained and supported by SUSTech CRA and CCSE