leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kbuild: deb-pkg: do not build linux-headers package if CONFIG_MODULES=n

Browse Source 
Since commit 269a535ca9 ("modpost: generate vmlinux.symvers and
reuse it for the second modpost"), with CONFIG_MODULES disabled,
"make deb-pkg" (or "make bindeb-pkg") fails with:

  find: ‘Module.symvers’: No such file or directory

If CONFIG_MODULES is disabled, it doesn't really make sense to build
the linux-headers package.

Fixes: 269a535ca9 ("modpost: generate vmlinux.symvers and reuse it for the second modpost")
Reported-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2020-10-14 03:38:19 +09:00
parent 172aad81a8
commit bac977cbc0
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/package/builddeb
View File

@ -207,8 +207,10 @@ EOF
done done
if [ "$ARCH" != "um" ]; then if [ "$ARCH" != "um" ]; then
deploy_kernel_headers debian/linux-headers if is_enabled CONFIG_MODULES; then
create_package linux-headers-$version debian/linux-headers deploy_kernel_headers debian/linux-headers
create_package linux-headers-$version debian/linux-headers
fi
deploy_libc_headers debian/linux-libc-dev deploy_libc_headers debian/linux-libc-dev
create_package linux-libc-dev debian/linux-libc-dev create_package linux-libc-dev debian/linux-libc-dev

19
scripts/package/mkdebian
View File

@ -184,13 +184,6 @@ Description: Linux kernel, version $version
This package contains the Linux kernel, modules and corresponding other This package contains the Linux kernel, modules and corresponding other
files, version: $version. files, version: $version.
Package: $kernel_headers_packagename
Architecture: $debarch
Description: Linux kernel headers for $version on $debarch
This package provides kernel header files for $version on $debarch
.
This is useful for people who need to build external modules
Package: linux-libc-dev Package: linux-libc-dev
Section: devel Section: devel
Provides: linux-kernel-headers Provides: linux-kernel-headers
@ -201,6 +194,18 @@ Description: Linux support headers for userspace development
Multi-Arch: same Multi-Arch: same
EOF EOF
if is_enabled CONFIG_MODULES; then
cat <<EOF >> debian/control
Package: $kernel_headers_packagename
Architecture: $debarch
Description: Linux kernel headers for $version on $debarch
This package provides kernel header files for $version on $debarch
.
This is useful for people who need to build external modules
EOF
fi
if is_enabled CONFIG_DEBUG_INFO; then if is_enabled CONFIG_DEBUG_INFO; then
cat <<EOF >> debian/control cat <<EOF >> debian/control