Commit e0b668b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.10-3' of... 

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
parents 76932725 a11aaf6d

Documentation/kbuild/modules.rst

+4 −4
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ executed to make module versioning work. 


	modules_install

		Install the external module(s). The default location is

		/lib/modules/<kernel_release>/extra/, but a prefix may

		/lib/modules/<kernel_release>/updates/, but a prefix may

		be added with INSTALL_MOD_PATH (discussed in section 5).



	clean
@@ -417,7 +417,7 @@ directory: 


And external modules are installed in:



	/lib/modules/$(KERNELRELEASE)/extra/

	/lib/modules/$(KERNELRELEASE)/updates/



5.1 INSTALL_MOD_PATH

--------------------
@@ -438,10 +438,10 @@ And external modules are installed in: 
-------------------



	External modules are by default installed to a directory under

	/lib/modules/$(KERNELRELEASE)/extra/, but you may wish to

	/lib/modules/$(KERNELRELEASE)/updates/, but you may wish to

	locate modules for a specific functionality in a separate

	directory. For this purpose, use INSTALL_MOD_DIR to specify an

	alternative name to "extra."::

	alternative name to "updates."::



		$ make INSTALL_MOD_DIR=gandalf -C $KDIR \

		       M=$PWD modules_install

scripts/Makefile.dtbinst

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ include $(srctree)/scripts/Kbuild.include 
dst := $(INSTALL_DTBS_PATH)



quiet_cmd_dtb_install = INSTALL $@

      cmd_dtb_install = install -D $< $@

      cmd_dtb_install = install -D -m 0644 $< $@



$(dst)/%: $(obj)/%

	$(call cmd,dtb_install)

scripts/Makefile.host

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ $(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs) 
# Create .o file from a single .cc (C++) file

quiet_cmd_host-cxxobjs	= HOSTCXX $@

      cmd_host-cxxobjs	= $(HOSTCXX) $(hostcxx_flags) -c -o $@ $<

$(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE

$(host-cxxobjs): $(obj)/%.o: $(obj)/%.cc FORCE

	$(call if_changed_dep,host-cxxobjs)



# Create executable from a single Rust crate (which may consist of

scripts/Makefile.package

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ debian-orig: private version = $(shell dpkg-parsechangelog -S Version | sed 's/- 
debian-orig: private orig-name = $(source)_$(version).orig.tar$(debian-orig-suffix)

debian-orig: mkdebian-opts = --need-source

debian-orig: linux.tar$(debian-orig-suffix) debian

	$(Q)if [ "$(df  --output=target .. 2>/dev/null)" = "$(df --output=target $< 2>/dev/null)" ]; then \

	$(Q)if [ "$$(df  --output=target .. 2>/dev/null)" = "$$(df --output=target $< 2>/dev/null)" ]; then \

		ln -f $< ../$(orig-name); \

	else \

		cp $< ../$(orig-name); \

scripts/gdb/linux/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ ifdef building_out_of_srctree 
symlinks := $(patsubst $(src)/%,%,$(wildcard $(src)/*.py))



quiet_cmd_symlink = SYMLINK $@

      cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(src)/%,$@) $@

      cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(abspath $(src))/%,$@) $@



always-y += $(symlinks)

$(addprefix $(obj)/, $(symlinks)): FORCE