Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v6.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Remove the executable bit from installed DTB files
- Escape $ in subshell execution in the debian-orig target
- Fix RPM builds with CONFIG_MODULES=n
- Fix xconfig with the O= option
- Fix scripts_gdb with the O= option
* tag 'kbuild-fixes-v6.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: scripts/gdb: bring the "abspath" back
kbuild: Use $(obj)/%.cc to fix host C++ module builds
kbuild: rpm-pkg: fix build error with CONFIG_MODULES=n
kbuild: Fix build target deb-pkg: ln: failed to create hard link
kbuild: doc: Update default INSTALL_MOD_DIR from extra to updates
kbuild: Install dtb files as 0644 in Makefile.dtbinst
+11
-13
+4
-4
Documentation/kbuild/modules.rst
+4
-4
Documentation/kbuild/modules.rst
···
128
128
129
129
modules_install
130
130
Install the external module(s). The default location is
131
-
/lib/modules/<kernel_release>/extra/, but a prefix may
131
+
/lib/modules/<kernel_release>/updates/, but a prefix may
132
132
be added with INSTALL_MOD_PATH (discussed in section 5).
133
133
134
134
clean
···
417
417
418
418
And external modules are installed in:
419
419
420
-
/lib/modules/$(KERNELRELEASE)/extra/
420
+
/lib/modules/$(KERNELRELEASE)/updates/
421
421
422
422
5.1 INSTALL_MOD_PATH
423
423
--------------------
···
438
438
-------------------
439
439
440
440
External modules are by default installed to a directory under
441
-
/lib/modules/$(KERNELRELEASE)/extra/, but you may wish to
441
+
/lib/modules/$(KERNELRELEASE)/updates/, but you may wish to
442
442
locate modules for a specific functionality in a separate
443
443
directory. For this purpose, use INSTALL_MOD_DIR to specify an
444
-
alternative name to "extra."::
444
+
alternative name to "updates."::
445
445
446
446
$ make INSTALL_MOD_DIR=gandalf -C $KDIR \
447
447
M=$PWD modules_install
+1
-1
scripts/Makefile.dtbinst
+1
-1
scripts/Makefile.dtbinst
+1
-1
scripts/Makefile.host
+1
-1
scripts/Makefile.host
···
146
146
# Create .o file from a single .cc (C++) file
147
147
quiet_cmd_host-cxxobjs = HOSTCXX $@
148
148
cmd_host-cxxobjs = $(HOSTCXX) $(hostcxx_flags) -c -o $@ $<
149
-
$(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE
149
+
$(host-cxxobjs): $(obj)/%.o: $(obj)/%.cc FORCE
150
150
$(call if_changed_dep,host-cxxobjs)
151
151
152
152
# Create executable from a single Rust crate (which may consist of
+1
-1
scripts/Makefile.package
+1
-1
scripts/Makefile.package
···
103
103
debian-orig: private orig-name = $(source)_$(version).orig.tar$(debian-orig-suffix)
104
104
debian-orig: mkdebian-opts = --need-source
105
105
debian-orig: linux.tar$(debian-orig-suffix) debian
106
-
$(Q)if [ "$(df --output=target .. 2>/dev/null)" = "$(df --output=target $< 2>/dev/null)" ]; then \
106
+
$(Q)if [ "$$(df --output=target .. 2>/dev/null)" = "$$(df --output=target $< 2>/dev/null)" ]; then \
107
107
ln -f $< ../$(orig-name); \
108
108
else \
109
109
cp $< ../$(orig-name); \
+1
-1
scripts/gdb/linux/Makefile
+1
-1
scripts/gdb/linux/Makefile
···
5
5
symlinks := $(patsubst $(src)/%,%,$(wildcard $(src)/*.py))
6
6
7
7
quiet_cmd_symlink = SYMLINK $@
8
-
cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(src)/%,$@) $@
8
+
cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(abspath $(src))/%,$@) $@
9
9
10
10
always-y += $(symlinks)
11
11
$(addprefix $(obj)/, $(symlinks)): FORCE
+3
-5
scripts/package/kernel.spec
+3
-5
scripts/package/kernel.spec
···
57
57
%install
58
58
mkdir -p %{buildroot}/lib/modules/%{KERNELRELEASE}
59
59
cp $(%{make} %{makeflags} -s image_name) %{buildroot}/lib/modules/%{KERNELRELEASE}/vmlinuz
60
-
%{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install
60
+
# DEPMOD=true makes depmod no-op. We do not package depmod-generated files.
61
+
%{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} DEPMOD=true modules_install
61
62
%{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
62
63
cp System.map %{buildroot}/lib/modules/%{KERNELRELEASE}
63
64
cp .config %{buildroot}/lib/modules/%{KERNELRELEASE}/config
···
71
70
%endif
72
71
73
72
{
74
-
for x in System.map config kernel modules.builtin \
75
-
modules.builtin.modinfo modules.order vmlinuz; do
76
-
echo "/lib/modules/%{KERNELRELEASE}/${x}"
77
-
done
73
+
echo "/lib/modules/%{KERNELRELEASE}"
78
74
79
75
for x in alias alias.bin builtin.alias.bin builtin.bin dep dep.bin \
80
76
devname softdep symbols symbols.bin; do