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
Unified · Split
| @@ -57,9 +57,8 @@ to enable them. :: · 56 unmodified lines | ||
| 57 | 57 | They can be enabled individually. The full list of the parameters: :: |
| 58 | 58 | |
| 59 | 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 \ | |
| 61 | − READELF=llvm-readelf HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar \ | |
| 62 | − HOSTLD=ld.lld | |
| 60 | + OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump READELF=llvm-readelf \ | |
| 61 | + HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar HOSTLD=ld.lld | |
| 63 | 62 | |
| 64 | 63 | Currently, the integrated assembler is disabled by default. You can pass |
| 65 | 64 | ``LLVM_IAS=1`` to enable it. |
| @@ -433,7 +433,6 @@ NM = llvm-nm · 432 unmodified lines | ||
| 433 | 433 | OBJCOPY = llvm-objcopy |
| 434 | 434 | OBJDUMP = llvm-objdump |
| 435 | 435 | READELF = llvm-readelf |
| 436 | −OBJSIZE = llvm-size | |
| 437 | 436 | STRIP = llvm-strip |
| 438 | 437 | else |
| 439 | 438 | CC = $(CROSS_COMPILE)gcc |
| @@ -443,7 +442,6 @@ NM = $(CROSS_COMPILE)nm · 3 unmodified lines | ||
| 443 | 442 | OBJCOPY = $(CROSS_COMPILE)objcopy |
| 444 | 443 | OBJDUMP = $(CROSS_COMPILE)objdump |
| 445 | 444 | READELF = $(CROSS_COMPILE)readelf |
| 446 | −OBJSIZE = $(CROSS_COMPILE)size | |
| 447 | 445 | STRIP = $(CROSS_COMPILE)strip |
| 448 | 446 | endif |
| 449 | 447 | PAHOLE = pahole |
| @@ -509,7 +507,7 @@ KBUILD_LDFLAGS := · 59 unmodified lines | ||
| 509 | 507 | CLANG_FLAGS := |
| 510 | 508 | |
| 511 | 509 | export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC |
| 512 | −export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL | |
| 510 | +export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL | |
| 513 | 511 | export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX |
| 514 | 512 | export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD |
| 515 | 513 | export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE |
| @@ -45,6 +45,8 @@ create_package() { · 44 unmodified lines | ||
| 45 | 45 | chmod -R go-w "$pdir" |
| 46 | 46 | # in case we are in a restrictive umask environment like 0077 |
| 47 | 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 | 51 | # Create the package |
| 50 | 52 | dpkg-gencontrol -p$pname -P"$pdir" |