Skip to content

Commit ce0c237

Browse files
committed
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
2 parents 92367fd + fb27e70 commit ce0c237

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

scripts/kconfig/merge_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
145145
NEW_VAL=$(grep -w $CFG $MERGE_FILE)
146146
BUILTIN_FLAG=false
147147
if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
148-
${WARNOVVERIDE} Previous value: $PREV_VAL
148+
${WARNOVERRIDE} Previous value: $PREV_VAL
149149
${WARNOVERRIDE} New value: $NEW_VAL
150150
${WARNOVERRIDE} -y passed, will not demote y to m
151151
${WARNOVERRIDE}

scripts/mod/modpost.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1733,7 +1733,7 @@ static void extract_crcs_for_object(const char *object, struct module *mod)
17331733
if (!isdigit(*p))
17341734
continue; /* skip this line */
17351735

1736-
crc = strtol(p, &p, 0);
1736+
crc = strtoul(p, &p, 0);
17371737
if (*p != '\n')
17381738
continue; /* skip this line */
17391739

scripts/package/builddeb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ install_linux_image_dbg () {
162162

163163
install_kernel_headers () {
164164
pdir=$1
165+
version=$2
165166

166167
rm -rf $pdir
167168

@@ -229,7 +230,7 @@ do
229230
linux-libc-dev)
230231
install_libc_headers debian/linux-libc-dev;;
231232
linux-headers-*)
232-
install_kernel_headers debian/linux-headers;;
233+
install_kernel_headers debian/linux-headers ${package#linux-headers-};;
233234
esac
234235
done
235236

0 commit comments

Comments
 (0)