openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 2762db756f ("Merge tag 'kconfig-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild") into android-mainline 

Steps on the way to 5.11-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib6b618b2d43ccca2bb28b2be74ded0bf3a1e06b1
This commit is contained in:
Greg Kroah-Hartman 2021-01-08 14:52:18 +01:00
parent ab9895b78e 2762db756f
commit 635bc3a9e0
9 changed files with 93 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/kbuild/kconfig-macro-language.rst
View File

@ -97,7 +97,7 @@ Like Make, Kconfig provides several built-in functions. Every function takes a
particular number of arguments. particular number of arguments.
In Make, every built-in function takes at least one argument. Kconfig allows 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 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 it after all. Let's say "built-in function" here to refer to natively supported
functionality. functionality.

1
scripts/kconfig/conf.c
View File

@ -11,7 +11,6 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h>
#include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>

1
scripts/kconfig/confdata.c
View File

@ -5,6 +5,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

1
scripts/kconfig/lexer.l
View File

@ -12,7 +12,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include "lkc.h" #include "lkc.h"
#include "parser.tab.h" #include "parser.tab.h"

4
scripts/kconfig/lkc.h
View File

@ -6,6 +6,10 @@
#ifndef LKC_H #ifndef LKC_H
#define LKC_H #define LKC_H
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include "expr.h" #include "expr.h"
#ifdef __cplusplus #ifdef __cplusplus

2
scripts/kconfig/preprocess.c
View File

@ -114,7 +114,7 @@ static char *do_error_if(int argc, char *argv[])
if (!strcmp(argv[0], "y")) if (!strcmp(argv[0], "y"))
pperror("%s", argv[1]); pperror("%s", argv[1]);
return NULL; return xstrdup("");
} }
static char *do_filename(int argc, char *argv[]) static char *do_filename(int argc, char *argv[])

14
scripts/kconfig/qconf-cfg.sh
View File

@ -2,7 +2,6 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
PKG="Qt5Core Qt5Gui Qt5Widgets" PKG="Qt5Core Qt5Gui Qt5Widgets"
PKG2="QtCore QtGui"
if [ -z "$(command -v pkg-config)" ]; then if [ -z "$(command -v pkg-config)" ]; then
echo >&2 "*" echo >&2 "*"
@ -12,21 +11,14 @@ if [ -z "$(command -v pkg-config)" ]; then
fi fi
if pkg-config --exists $PKG; then if pkg-config --exists $PKG; then
echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)\" echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags $PKG)\"
echo libs=\"$(pkg-config --libs $PKG)\" echo libs=\"$(pkg-config --libs $PKG)\"
echo moc=\"$(pkg-config --variable=host_bins Qt5Core)/moc\" echo moc=\"$(pkg-config --variable=host_bins Qt5Core)/moc\"
exit 0 exit 0
fi fi
if pkg-config --exists $PKG2; then
echo cflags=\"$(pkg-config --cflags $PKG2)\"
echo libs=\"$(pkg-config --libs $PKG2)\"
echo moc=\"$(pkg-config --variable=moc_location QtCore)\"
exit 0
fi
echo >&2 "*" echo >&2 "*"
echo >&2 "* Could not find Qt via pkg-config." echo >&2 "* Could not find Qt5 via pkg-config."
echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH" echo >&2 "* Please install Qt5 and make sure it's in PKG_CONFIG_PATH"
echo >&2 "*" echo >&2 "*"
exit 1 exit 1

141
scripts/kconfig/qconf.cc
View File

@ -310,15 +310,16 @@ ConfigList::ConfigList(QWidget *parent, const char *name)
setHeaderLabels(QStringList() << "Option" << "Name" << "Value"); setHeaderLabels(QStringList() << "Option" << "Name" << "Value");
connect(this, SIGNAL(itemSelectionChanged(void)), connect(this, &ConfigList::itemSelectionChanged,
SLOT(updateSelection(void))); this, &ConfigList::updateSelection);
if (name) { if (name) {
configSettings->beginGroup(name); configSettings->beginGroup(name);
showName = configSettings->value("/showName", false).toBool(); showName = configSettings->value("/showName", false).toBool();
optMode = (enum optionMode)configSettings->value("/optionMode", 0).toInt(); optMode = (enum optionMode)configSettings->value("/optionMode", 0).toInt();
configSettings->endGroup(); configSettings->endGroup();
connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings())); connect(configApp, &QApplication::aboutToQuit,
this, &ConfigList::saveSettings);
} }
showColumn(promptColIdx); showColumn(promptColIdx);
@ -888,10 +889,10 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
headerPopup = new QMenu(this); headerPopup = new QMenu(this);
action = new QAction("Show Name", this); action = new QAction("Show Name", this);
action->setCheckable(true); action->setCheckable(true);
connect(action, SIGNAL(toggled(bool)), connect(action, &QAction::toggled,
SLOT(setShowName(bool))); this, &ConfigList::setShowName);
connect(this, SIGNAL(showNameChanged(bool)), connect(this, &ConfigList::showNameChanged,
action, SLOT(setChecked(bool))); action, &QAction::setChecked);
action->setChecked(showName); action->setChecked(showName);
headerPopup->addAction(action); headerPopup->addAction(action);
} }
@ -936,15 +937,18 @@ ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
configSettings->beginGroup(objectName()); configSettings->beginGroup(objectName());
setShowDebug(configSettings->value("/showDebug", false).toBool()); setShowDebug(configSettings->value("/showDebug", false).toBool());
configSettings->endGroup(); configSettings->endGroup();
connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings())); connect(configApp, &QApplication::aboutToQuit,
this, &ConfigInfoView::saveSettings);
} }
contextMenu = createStandardContextMenu(); contextMenu = createStandardContextMenu();
QAction *action = new QAction("Show Debug Info", contextMenu); QAction *action = new QAction("Show Debug Info", contextMenu);
action->setCheckable(true); action->setCheckable(true);
connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); connect(action, &QAction::toggled,
connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setChecked(bool))); this, &ConfigInfoView::setShowDebug);
connect(this, &ConfigInfoView::showDebugChanged,
action, &QAction::setChecked);
action->setChecked(showDebug()); action->setChecked(showDebug());
contextMenu->addSeparator(); contextMenu->addSeparator();
contextMenu->addAction(action); contextMenu->addAction(action);
@ -1231,11 +1235,13 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow *parent)
layout2->setSpacing(6); layout2->setSpacing(6);
layout2->addWidget(new QLabel("Find:", this)); layout2->addWidget(new QLabel("Find:", this));
editField = new QLineEdit(this); editField = new QLineEdit(this);
connect(editField, SIGNAL(returnPressed()), SLOT(search())); connect(editField, &QLineEdit::returnPressed,
this, &ConfigSearchWindow::search);
layout2->addWidget(editField); layout2->addWidget(editField);
searchButton = new QPushButton("Search", this); searchButton = new QPushButton("Search", this);
searchButton->setAutoDefault(false); searchButton->setAutoDefault(false);
connect(searchButton, SIGNAL(clicked()), SLOT(search())); connect(searchButton, &QPushButton::clicked,
this, &ConfigSearchWindow::search);
layout2->addWidget(searchButton); layout2->addWidget(searchButton);
layout1->addLayout(layout2); layout1->addLayout(layout2);
@ -1244,10 +1250,10 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow *parent)
list = new ConfigList(split, "search"); list = new ConfigList(split, "search");
list->mode = listMode; list->mode = listMode;
info = new ConfigInfoView(split, "search"); info = new ConfigInfoView(split, "search");
connect(list, SIGNAL(menuChanged(struct menu *)), connect(list, &ConfigList::menuChanged,
info, SLOT(setInfo(struct menu *))); info, &ConfigInfoView::setInfo);
connect(list, SIGNAL(menuChanged(struct menu *)), connect(list, &ConfigList::menuChanged,
parent, SLOT(setMenuLink(struct menu *))); parent, &ConfigMainWindow::setMenuLink);
layout1->addWidget(split); layout1->addWidget(split);
@ -1267,7 +1273,8 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow *parent)
if (ok) if (ok)
split->setSizes(sizes); split->setSizes(sizes);
configSettings->endGroup(); configSettings->endGroup();
connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings())); connect(configApp, &QApplication::aboutToQuit,
this, &ConfigSearchWindow::saveSettings);
} }
void ConfigSearchWindow::saveSettings(void) void ConfigSearchWindow::saveSettings(void)
@ -1367,19 +1374,23 @@ ConfigMainWindow::ConfigMainWindow(void)
configList->setFocus(); configList->setFocus();
backAction = new QAction(QPixmap(xpm_back), "Back", this); backAction = new QAction(QPixmap(xpm_back), "Back", this);
connect(backAction, SIGNAL(triggered(bool)), SLOT(goBack())); connect(backAction, &QAction::triggered,
this, &ConfigMainWindow::goBack);
QAction *quitAction = new QAction("&Quit", this); QAction *quitAction = new QAction("&Quit", this);
quitAction->setShortcut(Qt::CTRL + Qt::Key_Q); quitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
connect(quitAction, SIGNAL(triggered(bool)), SLOT(close())); connect(quitAction, &QAction::triggered,
this, &ConfigMainWindow::close);
QAction *loadAction = new QAction(QPixmap(xpm_load), "&Load", this); QAction *loadAction = new QAction(QPixmap(xpm_load), "&Load", this);
loadAction->setShortcut(Qt::CTRL + Qt::Key_L); loadAction->setShortcut(Qt::CTRL + Qt::Key_L);
connect(loadAction, SIGNAL(triggered(bool)), SLOT(loadConfig())); connect(loadAction, &QAction::triggered,
this, &ConfigMainWindow::loadConfig);
saveAction = new QAction(QPixmap(xpm_save), "&Save", this); saveAction = new QAction(QPixmap(xpm_save), "&Save", this);
saveAction->setShortcut(Qt::CTRL + Qt::Key_S); saveAction->setShortcut(Qt::CTRL + Qt::Key_S);
connect(saveAction, SIGNAL(triggered(bool)), SLOT(saveConfig())); connect(saveAction, &QAction::triggered,
this, &ConfigMainWindow::saveConfig);
conf_set_changed_callback(conf_changed); conf_set_changed_callback(conf_changed);
@ -1388,31 +1399,37 @@ ConfigMainWindow::ConfigMainWindow(void)
configname = xstrdup(conf_get_configname()); configname = xstrdup(conf_get_configname());
QAction *saveAsAction = new QAction("Save &As...", this); QAction *saveAsAction = new QAction("Save &As...", this);
connect(saveAsAction, SIGNAL(triggered(bool)), SLOT(saveConfigAs())); connect(saveAsAction, &QAction::triggered,
this, &ConfigMainWindow::saveConfigAs);
QAction *searchAction = new QAction("&Find", this); QAction *searchAction = new QAction("&Find", this);
searchAction->setShortcut(Qt::CTRL + Qt::Key_F); searchAction->setShortcut(Qt::CTRL + Qt::Key_F);
connect(searchAction, SIGNAL(triggered(bool)), SLOT(searchConfig())); connect(searchAction, &QAction::triggered,
this, &ConfigMainWindow::searchConfig);
singleViewAction = new QAction(QPixmap(xpm_single_view), "Single View", this); singleViewAction = new QAction(QPixmap(xpm_single_view), "Single View", this);
singleViewAction->setCheckable(true); singleViewAction->setCheckable(true);
connect(singleViewAction, SIGNAL(triggered(bool)), SLOT(showSingleView())); connect(singleViewAction, &QAction::triggered,
this, &ConfigMainWindow::showSingleView);
splitViewAction = new QAction(QPixmap(xpm_split_view), "Split View", this); splitViewAction = new QAction(QPixmap(xpm_split_view), "Split View", this);
splitViewAction->setCheckable(true); splitViewAction->setCheckable(true);
connect(splitViewAction, SIGNAL(triggered(bool)), SLOT(showSplitView())); connect(splitViewAction, &QAction::triggered,
this, &ConfigMainWindow::showSplitView);
fullViewAction = new QAction(QPixmap(xpm_tree_view), "Full View", this); fullViewAction = new QAction(QPixmap(xpm_tree_view), "Full View", this);
fullViewAction->setCheckable(true); fullViewAction->setCheckable(true);
connect(fullViewAction, SIGNAL(triggered(bool)), SLOT(showFullView())); connect(fullViewAction, &QAction::triggered,
this, &ConfigMainWindow::showFullView);
QAction *showNameAction = new QAction("Show Name", this); QAction *showNameAction = new QAction("Show Name", this);
showNameAction->setCheckable(true); showNameAction->setCheckable(true);
connect(showNameAction, SIGNAL(toggled(bool)), configList, SLOT(setShowName(bool))); connect(showNameAction, &QAction::toggled,
configList, &ConfigList::setShowName);
showNameAction->setChecked(configList->showName); showNameAction->setChecked(configList->showName);
QActionGroup *optGroup = new QActionGroup(this); QActionGroup *optGroup = new QActionGroup(this);
optGroup->setExclusive(true); optGroup->setExclusive(true);
connect(optGroup, SIGNAL(triggered(QAction*)), configList, connect(optGroup, &QActionGroup::triggered,
SLOT(setOptionMode(QAction *))); configList, &ConfigList::setOptionMode);
connect(optGroup, SIGNAL(triggered(QAction *)), menuList, connect(optGroup, &QActionGroup::triggered,
SLOT(setOptionMode(QAction *))); menuList, &ConfigList::setOptionMode);
ConfigList::showNormalAction = new QAction("Show Normal Options", optGroup); ConfigList::showNormalAction = new QAction("Show Normal Options", optGroup);
ConfigList::showNormalAction->setCheckable(true); ConfigList::showNormalAction->setCheckable(true);
@ -1423,13 +1440,16 @@ ConfigMainWindow::ConfigMainWindow(void)
QAction *showDebugAction = new QAction("Show Debug Info", this); QAction *showDebugAction = new QAction("Show Debug Info", this);
showDebugAction->setCheckable(true); showDebugAction->setCheckable(true);
connect(showDebugAction, SIGNAL(toggled(bool)), helpText, SLOT(setShowDebug(bool))); connect(showDebugAction, &QAction::toggled,
helpText, &ConfigInfoView::setShowDebug);
showDebugAction->setChecked(helpText->showDebug()); showDebugAction->setChecked(helpText->showDebug());
QAction *showIntroAction = new QAction("Introduction", this); QAction *showIntroAction = new QAction("Introduction", this);
connect(showIntroAction, SIGNAL(triggered(bool)), SLOT(showIntro())); connect(showIntroAction, &QAction::triggered,
this, &ConfigMainWindow::showIntro);
QAction *showAboutAction = new QAction("About", this); QAction *showAboutAction = new QAction("About", this);
connect(showAboutAction, SIGNAL(triggered(bool)), SLOT(showAbout())); connect(showAboutAction, &QAction::triggered,
this, &ConfigMainWindow::showAbout);
// init tool bar // init tool bar
QToolBar *toolBar = addToolBar("Tools"); QToolBar *toolBar = addToolBar("Tools");
@ -1467,30 +1487,30 @@ ConfigMainWindow::ConfigMainWindow(void)
menu->addAction(showIntroAction); menu->addAction(showIntroAction);
menu->addAction(showAboutAction); menu->addAction(showAboutAction);
connect (helpText, SIGNAL (anchorClicked (const QUrl &)), connect(helpText, &ConfigInfoView::anchorClicked,
helpText, SLOT (clicked (const QUrl &)) ); helpText, &ConfigInfoView::clicked);
connect(configList, SIGNAL(menuChanged(struct menu *)), connect(configList, &ConfigList::menuChanged,
helpText, SLOT(setInfo(struct menu *))); helpText, &ConfigInfoView::setInfo);
connect(configList, SIGNAL(menuSelected(struct menu *)), connect(configList, &ConfigList::menuSelected,
SLOT(changeMenu(struct menu *))); this, &ConfigMainWindow::changeMenu);
connect(configList, SIGNAL(itemSelected(struct menu *)), connect(configList, &ConfigList::itemSelected,
SLOT(changeItens(struct menu *))); this, &ConfigMainWindow::changeItens);
connect(configList, SIGNAL(parentSelected()), connect(configList, &ConfigList::parentSelected,
SLOT(goBack())); this, &ConfigMainWindow::goBack);
connect(menuList, SIGNAL(menuChanged(struct menu *)), connect(menuList, &ConfigList::menuChanged,
helpText, SLOT(setInfo(struct menu *))); helpText, &ConfigInfoView::setInfo);
connect(menuList, SIGNAL(menuSelected(struct menu *)), connect(menuList, &ConfigList::menuSelected,
SLOT(changeMenu(struct menu *))); this, &ConfigMainWindow::changeMenu);
connect(configList, SIGNAL(gotFocus(struct menu *)), connect(configList, &ConfigList::gotFocus,
helpText, SLOT(setInfo(struct menu *))); helpText, &ConfigInfoView::setInfo);
connect(menuList, SIGNAL(gotFocus(struct menu *)), connect(menuList, &ConfigList::gotFocus,
helpText, SLOT(setInfo(struct menu *))); helpText, &ConfigInfoView::setInfo);
connect(menuList, SIGNAL(gotFocus(struct menu *)), connect(menuList, &ConfigList::gotFocus,
SLOT(listFocusChanged(void))); this, &ConfigMainWindow::listFocusChanged);
connect(helpText, SIGNAL(menuSelected(struct menu *)), connect(helpText, &ConfigInfoView::menuSelected,
SLOT(setMenuLink(struct menu *))); this, &ConfigMainWindow::setMenuLink);
QString listMode = configSettings->value("/listMode", "symbol").toString(); QString listMode = configSettings->value("/listMode", "symbol").toString();
if (listMode == "single") if (listMode == "single")
@ -1779,10 +1799,13 @@ void ConfigMainWindow::showIntro(void)
void ConfigMainWindow::showAbout(void) void ConfigMainWindow::showAbout(void)
{ {
static const QString str = "qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n" static const QString str = "qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n"
"Copyright (C) 2015 Boris Barbulovski <bbarbulovski@gmail.com>.\n\n" "Copyright (C) 2015 Boris Barbulovski <bbarbulovski@gmail.com>.\n"
"Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n"; "\n"
"Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n"
"\n"
"Qt Version: ";
QMessageBox::information(this, "qconf", str); QMessageBox::information(this, "qconf", str + qVersion());
} }
void ConfigMainWindow::saveSettings(void) void ConfigMainWindow::saveSettings(void)

2
scripts/kconfig/symbol.c
View File

@ -3,11 +3,11 @@
* Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
*/ */
#include <sys/types.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <regex.h> #include <regex.h>
#include <sys/utsname.h>
#include "lkc.h" #include "lkc.h"