Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- make setlocalversion more robust about -dirty check
- loosen the pkg-config requirement for Kconfig
- change missing depmod to a warning from an error
- warn modules_install when System.map is missing
* tag 'kbuild-fixes-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: modules_install: warn when missing System.map file
kbuild: make missing $DEPMOD a Warning instead of an Error
kconfig: do not require pkg-config on make {menu,n}config
kconfig: remove a spurious self-assignment
scripts/setlocalversion: git: Make -dirty check more robust
+49
-38
+1
-1
Documentation/process/changes.rst
+1
-1
Documentation/process/changes.rst
···
86
86
87
87
The build system, as of 4.18, requires pkg-config to check for installed
88
88
kconfig tools and to determine flags settings for use in
89
-
'make {menu,n,g,x}config'. Previously pkg-config was being used but not
89
+
'make {g,x}config'. Previously pkg-config was being used but not
90
90
verified or documented.
91
91
92
92
Flex
+3
-2
scripts/depmod.sh
+3
-2
scripts/depmod.sh
···
11
11
KERNELRELEASE=$2
12
12
13
13
if ! test -r System.map ; then
14
+
echo "Warning: modules_install: missing 'System.map' file. Skipping depmod." >&2
14
15
exit 0
15
16
fi
16
17
17
18
if [ -z $(command -v $DEPMOD) ]; then
18
-
echo "'make modules_install' requires $DEPMOD. Please install it." >&2
19
+
echo "Warning: 'make modules_install' requires $DEPMOD. Please install it." >&2
19
20
echo "This is probably in the kmod package." >&2
20
-
exit 1
21
+
exit 0
21
22
fi
22
23
23
24
# older versions of depmod require the version string to start with three
-1
scripts/kconfig/Makefile
-1
scripts/kconfig/Makefile
-8
scripts/kconfig/check-pkgconfig.sh
-8
scripts/kconfig/check-pkgconfig.sh
+7
scripts/kconfig/gconf-cfg.sh
+7
scripts/kconfig/gconf-cfg.sh
···
3
3
4
4
PKG="gtk+-2.0 gmodule-2.0 libglade-2.0"
5
5
6
+
if [ -z "$(command -v pkg-config)" ]; then
7
+
echo >&2 "*"
8
+
echo >&2 "* 'make gconfig' requires 'pkg-config'. Please install it."
9
+
echo >&2 "*"
10
+
exit 1
11
+
fi
12
+
6
13
if ! pkg-config --exists $PKG; then
7
14
echo >&2 "*"
8
15
echo >&2 "* Unable to find the GTK+ installation. Please make sure that"
+15
-12
scripts/kconfig/mconf-cfg.sh
+15
-12
scripts/kconfig/mconf-cfg.sh
···
4
4
PKG="ncursesw"
5
5
PKG2="ncurses"
6
6
7
-
if pkg-config --exists $PKG; then
8
-
echo cflags=\"$(pkg-config --cflags $PKG)\"
9
-
echo libs=\"$(pkg-config --libs $PKG)\"
10
-
exit 0
7
+
if [ -n "$(command -v pkg-config)" ]; then
8
+
if pkg-config --exists $PKG; then
9
+
echo cflags=\"$(pkg-config --cflags $PKG)\"
10
+
echo libs=\"$(pkg-config --libs $PKG)\"
11
+
exit 0
12
+
fi
13
+
14
+
if pkg-config --exists $PKG2; then
15
+
echo cflags=\"$(pkg-config --cflags $PKG2)\"
16
+
echo libs=\"$(pkg-config --libs $PKG2)\"
17
+
exit 0
18
+
fi
11
19
fi
12
20
13
-
if pkg-config --exists $PKG2; then
14
-
echo cflags=\"$(pkg-config --cflags $PKG2)\"
15
-
echo libs=\"$(pkg-config --libs $PKG2)\"
16
-
exit 0
17
-
fi
18
-
19
-
# Unfortunately, some distributions (e.g. openSUSE) cannot find ncurses
20
-
# by pkg-config.
21
+
# Check the default paths in case pkg-config is not installed.
22
+
# (Even if it is installed, some distributions such as openSUSE cannot
23
+
# find ncurses by pkg-config.)
21
24
if [ -f /usr/include/ncursesw/ncurses.h ]; then
22
25
echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\"
23
26
echo libs=\"-lncursesw\"
-1
scripts/kconfig/mconf.c
-1
scripts/kconfig/mconf.c
+15
-12
scripts/kconfig/nconf-cfg.sh
+15
-12
scripts/kconfig/nconf-cfg.sh
···
4
4
PKG="ncursesw menuw panelw"
5
5
PKG2="ncurses menu panel"
6
6
7
-
if pkg-config --exists $PKG; then
8
-
echo cflags=\"$(pkg-config --cflags $PKG)\"
9
-
echo libs=\"$(pkg-config --libs $PKG)\"
10
-
exit 0
7
+
if [ -n "$(command -v pkg-config)" ]; then
8
+
if pkg-config --exists $PKG; then
9
+
echo cflags=\"$(pkg-config --cflags $PKG)\"
10
+
echo libs=\"$(pkg-config --libs $PKG)\"
11
+
exit 0
12
+
fi
13
+
14
+
if pkg-config --exists $PKG2; then
15
+
echo cflags=\"$(pkg-config --cflags $PKG2)\"
16
+
echo libs=\"$(pkg-config --libs $PKG2)\"
17
+
exit 0
18
+
fi
11
19
fi
12
20
13
-
if pkg-config --exists $PKG2; then
14
-
echo cflags=\"$(pkg-config --cflags $PKG2)\"
15
-
echo libs=\"$(pkg-config --libs $PKG2)\"
16
-
exit 0
17
-
fi
18
-
19
-
# Unfortunately, some distributions (e.g. openSUSE) cannot find ncurses
20
-
# by pkg-config.
21
+
# Check the default paths in case pkg-config is not installed.
22
+
# (Even if it is installed, some distributions such as openSUSE cannot
23
+
# find ncurses by pkg-config.)
21
24
if [ -f /usr/include/ncursesw/ncurses.h ]; then
22
25
echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\"
23
26
echo libs=\"-lncursesw -lmenuw -lpanelw\"
+7
scripts/kconfig/qconf-cfg.sh
+7
scripts/kconfig/qconf-cfg.sh
···
4
4
PKG="Qt5Core Qt5Gui Qt5Widgets"
5
5
PKG2="QtCore QtGui"
6
6
7
+
if [ -z "$(command -v pkg-config)" ]; then
8
+
echo >&2 "*"
9
+
echo >&2 "* 'make xconfig' requires 'pkg-config'. Please install it."
10
+
echo >&2 "*"
11
+
exit 1
12
+
fi
13
+
7
14
if pkg-config --exists $PKG; then
8
15
echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)\"
9
16
echo libs=\"$(pkg-config --libs $PKG)\"