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

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

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

Pull Kbuild fixes from Masahiro Yamada:

 - Fix a Kconfig bug regarding comparisons to 'm' or 'n'

 - Replace missed $(srctree)/$(src)

 - Fix unneeded kallsyms step 3

 - Remove incorrect "compatible" properties from image nodes in
   image.fit

 - Improve gen_kheaders.sh

 - Fix 'make dt_binding_check'

 - Clean up unnecessary code

* tag 'kbuild-fixes-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  dt-bindings: kbuild: Fix dt_binding_check on unconfigured build
  kheaders: use `command -v` to test for existence of `cpio`
  kheaders: explicitly define file modes for archived headers
  scripts/make_fit: Drop fdt image entry compatible string
  kbuild: remove a stale comment about cleaning in link-vmlinux.sh
  kbuild: fix short log for AS in link-vmlinux.sh
  kbuild: change scripts/mksysmap into sed script
  kbuild: avoid unneeded kallsyms step 3
  kbuild: scripts/gdb: Replace missed $(srctree)/$(src) w/ $(src)
  kconfig: remove redundant check in expr_join_or()
  kconfig: fix comparison to constant symbols, 'm', 'n'
  kconfig: remove unused expr_is_no()
parents bbeb1219 1b1c9f0f

kernel/gen_kheaders.sh

+7 −2
Original line number Diff line number Diff line
@@ -14,7 +14,12 @@ include/ 
arch/$SRCARCH/include/

"



type cpio > /dev/null

if ! command -v cpio >/dev/null; then

	echo >&2 "***"

	echo >&2 "*** 'cpio' could not be found."

	echo >&2 "***"

	exit 1

fi



# Support incremental builds by skipping archive generation

# if timestamps of files being archived are not changed.
@@ -84,7 +89,7 @@ find $cpio_dir -type f -print0 | 


# Create archive and try to normalize metadata for reproducibility.

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

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

    --owner=0 --group=0 --sort=name --numeric-owner --mode=u=rw,go=r,a+X \

    -I $XZ -cf $tarfile -C $cpio_dir/ . > /dev/null



echo $headers_md5 > kernel/kheaders.md5

scripts/dtc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


# *** Also keep .gitignore in sync when changing ***

hostprogs-always-$(CONFIG_DTC)		+= dtc fdtoverlay

hostprogs-always-$(CHECK_DT_BINDING)	+= dtc

hostprogs-always-$(CHECK_DTBS)		+= dtc



dtc-objs	:= dtc.o flattree.o fstree.o data.o livetree.o treesource.o \

		   srcpos.o checks.o util.o

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)/%,$(abspath $(srctree))/$(src)/%,$@) $@

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



always-y += $(symlinks)

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

scripts/kconfig/expr.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static struct expr *expr_join_or(struct expr *e1, struct expr *e2) 
			return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);

		}

	}

	if (sym1->type == S_BOOLEAN && sym1 == sym2) {

	if (sym1->type == S_BOOLEAN) {

		if ((e1->type == E_NOT && e1->left.expr->type == E_SYMBOL && e2->type == E_SYMBOL) ||

		    (e2->type == E_NOT && e2->left.expr->type == E_SYMBOL && e1->type == E_SYMBOL))

			return expr_alloc_symbol(&symbol_yes);

scripts/kconfig/expr.h

+0 −5
Original line number Diff line number Diff line
@@ -302,11 +302,6 @@ static inline int expr_is_yes(struct expr *e) 
	return !e || (e->type == E_SYMBOL && e->left.sym == &symbol_yes);

}



static inline int expr_is_no(struct expr *e)

{

	return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no);

}



#ifdef __cplusplus

}

#endif