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

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

Merge tag 'kbuild-fixes-v5.4-2' of... 

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

Pull more Kbuild fixes from Masahiro Yamada:

 - fix a bashism of setlocalversion

 - do not use the too new --sort option of tar

* tag 'kbuild-fixes-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kheaders: substituting --sort in archive creation
  scripts: setlocalversion: fix a bashism
  kbuild: update comment about KBUILD_ALLDIRS
parents 4fe34d61 700dea5a

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ export KBUILD_VMLINUX_OBJS := $(head-y) $(init-y) $(core-y) $(libs-y2) \ 
export KBUILD_VMLINUX_LIBS := $(libs-y1)

export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds

export LDFLAGS_vmlinux

# used by scripts/package/Makefile

# used by scripts/Makefile.package

export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) LICENSES arch include scripts tools)



vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)

kernel/gen_kheaders.sh

+7 −4
Original line number Diff line number Diff line
@@ -71,10 +71,13 @@ done | cpio --quiet -pd $cpio_dir >/dev/null 2>&1 
find $cpio_dir -type f -print0 |

	xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;'



# Create archive and try to normalize metadata for reproducibility

# Create archive and try to normalize metadata for reproducibility.

# For compatibility with older versions of tar, files are fed to tar

# pre-sorted, as --sort=name might not be available.

find $cpio_dir -printf "./%P\n" | LC_ALL=C sort | \

    tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \

    --owner=0 --group=0 --sort=name --numeric-owner \

    -Jcf $tarfile -C $cpio_dir/ . > /dev/null

    --owner=0 --group=0 --numeric-owner --no-recursion \

    -Jcf $tarfile -C $cpio_dir/ -T - > /dev/null



echo "$src_files_md5" >  kernel/kheaders.md5

echo "$obj_files_md5" >> kernel/kheaders.md5

scripts/setlocalversion

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ scm_version() 
	# Check for mercurial and a mercurial repo.

	if test -d .hg && hgid=`hg id 2>/dev/null`; then

		# Do we have an tagged version?  If so, latesttagdistance == 1

		if [ "`hg log -r . --template '{latesttagdistance}'`" == "1" ]; then

		if [ "`hg log -r . --template '{latesttagdistance}'`" = "1" ]; then

			id=`hg log -r . --template '{latesttag}'`

			printf '%s%s' -hg "$id"

		else