Skip to content

Commit e2c3182

Browse files
committed
kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile
Since commit f1d8766 ("kbuild: cross-compile linux-headers package when possible"), 'make bindeb-pkg' may attempt to cross-compile the linux-headers package, but it fails under certain circumstances. For example, when CONFIG_MODULE_SIG_FORMAT is enabled on Debian, the following command fails: $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- bindeb-pkg [ snip ] Rebuilding host programs with aarch64-linux-gnu-gcc... HOSTCC debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/kallsyms HOSTCC debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/sorttable HOSTCC debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/asn1_compiler HOSTCC debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/sign-file In file included from /usr/include/openssl/opensslv.h:109, from debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/sign-file.c:25: /usr/include/openssl/macros.h:14:10: fatal error: openssl/opensslconf.h: No such file or directory 14 | #include <openssl/opensslconf.h> | ^~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. This commit adds a new profile, pkg.linux-upstream.nokernelheaders, to guard the linux-headers package. There are two options to fix the above issue. Option 1: Set the pkg.linux-upstream.nokernelheaders build profile $ DEB_BUILD_PROFILES=pkg.linux-upstream.nokernelheaders \ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- bindeb-pkg This skips the building of the linux-headers package. Option 2: Install the necessary build dependencies If you want to cross-compile the linux-headers package, you need to install additional packages. For example, on Debian, the packages necessary for cross-compiling it to arm64 can be installed with the following commands: # dpkg --add-architecture arm64 # apt update # apt install gcc-aarch64-linux-gnu libssl-dev:arm64 Fixes: f1d8766 ("kbuild: cross-compile linux-headers package when possible") Reported-by: Ron Economos <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Masahiro Yamada <[email protected]> Tested-by: Ron Economos <[email protected]> Reviewed-by: Nicolas Schier <[email protected]>
1 parent cb08a02 commit e2c3182

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

scripts/package/builddeb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ install_kernel_headers () {
123123
pdir=debian/$1
124124
version=${1#linux-headers-}
125125

126-
"${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}"
126+
CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}"
127127

128128
mkdir -p $pdir/lib/modules/$version/
129129
ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/build

scripts/package/install-extmod-build

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ mkdir -p "${destdir}"
4444
fi
4545
} | tar -c -f - -T - | tar -xf - -C "${destdir}"
4646

47-
# When ${CC} and ${HOSTCC} differ, we are likely cross-compiling. Rebuild host
48-
# programs using ${CC}. This assumes CC=${CROSS_COMPILE}gcc, which is usually
49-
# the case for package building. It does not cross-compile when CC=clang.
47+
# When ${CC} and ${HOSTCC} differ, rebuild host programs using ${CC}.
5048
#
5149
# This caters to host programs that participate in Kbuild. objtool and
5250
# resolve_btfids are out of scope.
53-
if [ "${CC}" != "${HOSTCC}" ] && is_enabled CONFIG_CC_CAN_LINK; then
51+
if [ "${CC}" != "${HOSTCC}" ]; then
5452
echo "Rebuilding host programs with ${CC}..."
5553

5654
cat <<-'EOF' > "${destdir}/Kbuild"

scripts/package/mkdebian

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ fi
179179

180180
echo $debarch > debian/arch
181181

182+
host_gnu=$(dpkg-architecture -a "${debarch}" -q DEB_HOST_GNU_TYPE | sed 's/_/-/g')
183+
182184
# Generate a simple changelog template
183185
cat <<EOF > debian/changelog
184186
$sourcename ($packageversion) $distribution; urgency=low
@@ -196,7 +198,11 @@ Priority: optional
196198
Maintainer: $maintainer
197199
Rules-Requires-Root: no
198200
Build-Depends: debhelper-compat (= 12)
199-
Build-Depends-Arch: bc, bison, cpio, flex, kmod, libelf-dev:native, libssl-dev:native, rsync
201+
Build-Depends-Arch: bc, bison, cpio, flex,
202+
gcc-${host_gnu} <!pkg.${sourcename}.nokernelheaders>,
203+
kmod, libelf-dev:native,
204+
libssl-dev:native, libssl-dev <!pkg.${sourcename}.nokernelheaders>,
205+
rsync
200206
Homepage: https://www.kernel.org/
201207
202208
Package: $packagename-$version
@@ -224,6 +230,7 @@ cat <<EOF >> debian/control
224230
225231
Package: linux-headers-$version
226232
Architecture: $debarch
233+
Build-Profiles: <!pkg.${sourcename}.nokernelheaders>
227234
Description: Linux kernel headers for $version on $debarch
228235
This package provides kernel header files for $version on $debarch
229236
.

0 commit comments

Comments
 (0)