History

Merge tag 'kbuild-fixes-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada: - Remove unused OBJSIZE variable. - Fix rootless deb-pkg build in a setgid directory. * tag 'kbuild-fixes-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: builddeb: Fix rootless build in setuid/setgid directory kbuild: remove unused OBJSIZE

Linus Torvalds committed 5 years ago

Commit 45e885c2 parents ca57982 d1889583 files · +5 −6Browse files

Unified · Split

3 files
  1. Documentation/kbuild/llvm.rst +2 −3
  2. Makefile +1 −3
  3. scripts/package/builddeb +2 −0
Documentation/kbuild/llvm.rst+2−3
@@ -57,9 +57,8 @@ to enable them. :: · 56 unmodified lines
57They can be enabled individually. The full list of the parameters: ::57They can be enabled individually. The full list of the parameters: ::
58 58
59 make CC=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \59 make CC=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \
60 OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump OBJSIZE=llvm-size \60 OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump READELF=llvm-readelf \
61 READELF=llvm-readelf HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar \61 HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar HOSTLD=ld.lld
62 HOSTLD=ld.lld
63 62
64Currently, the integrated assembler is disabled by default. You can pass63Currently, the integrated assembler is disabled by default. You can pass
65``LLVM_IAS=1`` to enable it.64``LLVM_IAS=1`` to enable it.
Makefile+1−3
@@ -433,7 +433,6 @@ NM = llvm-nm · 432 unmodified lines
433OBJCOPY = llvm-objcopy433OBJCOPY = llvm-objcopy
434OBJDUMP = llvm-objdump434OBJDUMP = llvm-objdump
435READELF = llvm-readelf435READELF = llvm-readelf
436OBJSIZE = llvm-size
437STRIP = llvm-strip436STRIP = llvm-strip
438else437else
439CC = $(CROSS_COMPILE)gcc438CC = $(CROSS_COMPILE)gcc
@@ -443,7 +442,6 @@ NM = $(CROSS_COMPILE)nm · 3 unmodified lines
443OBJCOPY = $(CROSS_COMPILE)objcopy442OBJCOPY = $(CROSS_COMPILE)objcopy
444OBJDUMP = $(CROSS_COMPILE)objdump443OBJDUMP = $(CROSS_COMPILE)objdump
445READELF = $(CROSS_COMPILE)readelf444READELF = $(CROSS_COMPILE)readelf
446OBJSIZE = $(CROSS_COMPILE)size
447STRIP = $(CROSS_COMPILE)strip445STRIP = $(CROSS_COMPILE)strip
448endif446endif
449PAHOLE = pahole447PAHOLE = pahole
@@ -509,7 +507,7 @@ KBUILD_LDFLAGS := · 59 unmodified lines
509CLANG_FLAGS :=507CLANG_FLAGS :=
510 508
511export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC509export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
512export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL510export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL
513export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX511export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
514export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD512export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD
515export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE513export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE
scripts/package/builddeb+2−0
@@ -45,6 +45,8 @@ create_package() { · 44 unmodified lines
45 chmod -R go-w "$pdir"45 chmod -R go-w "$pdir"
46 # in case we are in a restrictive umask environment like 007746 # in case we are in a restrictive umask environment like 0077
47 chmod -R a+rX "$pdir"47 chmod -R a+rX "$pdir"
48 # in case we build in a setuid/setgid directory
49 chmod -R ug-s "$pdir"
48 50
49 # Create the package51 # Create the package
50 dpkg-gencontrol -p$pname -P"$pdir"52 dpkg-gencontrol -p$pname -P"$pdir"