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

Merge tag 'kbuild-fixes-v6.3-2' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - Fix linux-headers debian package

 - Fix a merge_config.sh error due to a misspelled variable

 - Fix modversion for 32-bit build machines

* tag 'kbuild-fixes-v6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  modpost: Fix processing of CRCs on 32-bit build machines
  scripts: merge_config: Fix typo in variable name.
  kbuild: deb-pkg: set version for linux-headers paths
parents 92367fdf fb27e70f

scripts/kconfig/merge_config.sh

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do 
		NEW_VAL=$(grep -w $CFG $MERGE_FILE)

		BUILTIN_FLAG=false

		if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then

			${WARNOVVERIDE} Previous  value: $PREV_VAL

			${WARNOVERRIDE} Previous  value: $PREV_VAL

			${WARNOVERRIDE} New value:       $NEW_VAL

			${WARNOVERRIDE} -y passed, will not demote y to m

			${WARNOVERRIDE}

scripts/mod/modpost.c

+1 −1
Original line number Diff line number Diff line
@@ -1733,7 +1733,7 @@ static void extract_crcs_for_object(const char *object, struct module *mod) 
		if (!isdigit(*p))

			continue;	/* skip this line */



		crc = strtol(p, &p, 0);

		crc = strtoul(p, &p, 0);

		if (*p != '\n')

			continue;	/* skip this line */

scripts/package/builddeb

+2 −1
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ install_linux_image_dbg () { 


install_kernel_headers () {

	pdir=$1

	version=$2



	rm -rf $pdir
@@ -229,7 +230,7 @@ do 
	linux-libc-dev)

		install_libc_headers debian/linux-libc-dev;;

	linux-headers-*)

		install_kernel_headers debian/linux-headers;;

		install_kernel_headers debian/linux-headers ${package#linux-headers-};;

	esac

done