Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild fixes from Michal Marek:
 "Here are two fixes I intended to send after v3.6-rc7, but failed to do
  so.  So please pull them for v3.7-rc1 and they will be picked up by
  stable.

  The first one fixes gcc -x <language> syntax in various build-time
  tests, which icecream and possible other gcc wrappers did not
  understand (and yes, icecream is going to be fixed as well).

  The second one fixes make tar-pkg so that unpacking the tarball does
  not replace the /lib -> /usr/lib symlink on recent Fedora releases."

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Fix gcc -x syntax
  kbuild: Do not package /boot and /lib in make tar-pkg
parents 80b810b2 b1e0d8b7

arch/x86/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ KBUILD_CFLAGS += $(call cc-option,-mno-avx,) 
KBUILD_CFLAGS += $(mflags-y)

KBUILD_AFLAGS += $(mflags-y)



archscripts: scripts_basic

archscripts:

	$(Q)$(MAKE) $(build)=arch/x86/tools relocs



###

scripts/Makefile.fwinst

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ endif 
installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))



installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))

installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/./

installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.



# Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.

PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
@@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) 
$(installed-fw-dirs):

	$(call cmd,mkdir)



$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %)

$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $$(dir $(INSTALL_FW_PATH)/%)

	$(call cmd,install)



PHONY +=  __fw_install __fw_modinst FORCE

scripts/package/buildtar

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ esac 
	if tar --owner=root --group=root --help >/dev/null 2>&1; then

		opts="--owner=root --group=root"

	fi

	tar cf - . $opts | ${compress} > "${tarball}${file_ext}"

	tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"

)



echo "Tarball successfully created in ${tarball}${file_ext}"

scripts/gcc-x86_64-has-stack-protector.sh

+1 −1

File changed.

Contains only whitespace changes.

scripts/kconfig/lxdialog/check-lxdialog.sh

+1 −1

File changed.

Contains only whitespace changes.

tools/power/cpupower/Makefile

+1 −1

File changed.

Contains only whitespace changes.

arch/mips/kernel/Makefile

+1 −1

File changed.

Contains only whitespace changes.

scripts/Kbuild.include

+6 −6

File changed.

Contains only whitespace changes.

scripts/gcc-version.sh

+3 −3

File changed.

Contains only whitespace changes.

scripts/kconfig/check.sh

+1 −1

File changed.

Contains only whitespace changes.

tools/perf/Makefile

+1 −1

File changed.

Contains only whitespace changes.

arch/mips/Makefile

+1 −1

File changed.

Contains only whitespace changes.

scripts/gcc-x86_32-has-stack-protector.sh

+1 −1

File changed.

Contains only whitespace changes.