Rebuild using latest kernel versions. Ran into issues with arm64 kernel header builds

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>

Author: ddelnano

tools/docker/Makefile

@@ -72,36 +72,15 @@ SYSROOT_CREATOR_IMAGE_TAG := sysroot-creator-$(SYSROOT_REV)
 ## Linux image parameters
 LINUX_HEADER_BUILD_DIR := $(BUILD_DIR)/linux_headers
 LINUX_HEADER_ASSETS_BUILD_DIR := $(LINUX_HEADER_BUILD_DIR)/assets
-LINUX_KERNEL_VERSIONS := 4.14.309 \
-	4.15.18 \
-	4.16.18 \
-	4.17.19 \
-	4.18.20 \
-	4.19.325 \
-	4.20.17 \
-	5.0.21 \
-	5.1.21 \
-	5.2.21 \
-	5.3.18 \
-	5.4.293 \
-	5.5.19 \
-	5.6.19 \
-	5.7.19 \
-	5.8.18 \
-	5.9.16 \
-	5.10.237 \
-	5.11.22 \
-	5.12.19 \
-	5.13.19 \
+LINUX_KERNEL_VERSIONS := 4.18.20 \
+        5.10.252 \
 	5.14.21 \
-	5.15.181 \
-	5.16.20 \
-	5.17.15 \
-	5.18.19 \
-	5.19.17 \
-	6.0.19 \
-	6.1.137 \
-	6.6.89
+	6.1.167 \
+	6.6.132 \
+	6.12.80 \
+	6.18.21 \
+	6.19.10
+
 
 LINUX_HEADER_TEMPLATE := linux-headers-%.tar.gz
 LINUX_HEADER_X86_64_TARGETS = $(addprefix $(LINUX_HEADER_ASSETS_BUILD_DIR)/, \
@@ -135,14 +114,12 @@ elasticsearch_image_tag := "gcr.io/pixie-oss/pixie-dev-public/elasticsearch:$(EL
 
 ## Linux kernel for qemu/BPF tests.
 KERNEL_BUILD_DIR := $(BUILD_DIR)/kernel_build
-# 4.19.276, 4.14.304 are the correct versions here, but there is a bug with patch > 255.
-KERNEL_BUILD_VERSIONS := 4.14.254 \
-	4.19.254 \
-	5.4.254 \
-	5.10.224 \
-	5.15.165 \
-	6.1.106 \
-	6.8.12
+KERNEL_BUILD_VERSIONS := 5.10.252 \
+	5.14.21 \
+	6.1.167 \
+	6.6.132 \
+	6.12.80 \
+	6.18.21
 
 KERNEL_BUILD_TEMPLATE := linux-build-%.tar.gz
 KERNEL_BUILD_TARGETS = $(addprefix $(KERNEL_BUILD_DIR)/, $(patsubst %,$(KERNEL_BUILD_TEMPLATE), $(KERNEL_BUILD_VERSIONS)))
@@ -251,7 +228,7 @@ $(LINUX_HEADERS_ARM64_MERGED_FILE): $(LINUX_HEADER_ARM64_TARGETS)
 
 .PHONY: upload_linux_headers
 upload_linux_headers:  $(LINUX_HEADERS_X86_64_MERGED_FILE) $(LINUX_HEADERS_ARM64_MERGED_FILE) ## Target to build and upload linux headers image
-	gsutil cp $^ $(LINUX_HEADERS_GS_PATH)
+	# gsutil cp $^ $(LINUX_HEADERS_GS_PATH)
 	$(GH_RELEASE_UPLOAD) linux-headers $(LINUX_HEADERS_REV) $^
 	sha256sum $^
 

tools/docker/linux_headers_image/Dockerfile

@@ -27,6 +27,7 @@ RUN apt-get update
 RUN apt-get upgrade -y -q
 RUN apt-get install -y -q build-essential \
   bc \
+  libdw-dev \
   libelf-dev \
   libssl-dev \
   flex \
@@ -41,6 +42,14 @@ RUN apt-get install -y -q build-essential \
   debhelper \
   python3
 
+# opensslconf.h lives at the multiarch path (e.g. /usr/include/x86_64-linux-gnu/openssl/).
+# During cross-compilation, dpkg-buildpackage alters include paths so host tools
+# (like scripts/sign-file) can no longer find it. Symlink it to the standard path.
+RUN if [ -f /usr/include/x86_64-linux-gnu/openssl/opensslconf.h ] && \
+       [ ! -f /usr/include/openssl/opensslconf.h ]; then \
+      ln -s /usr/include/x86_64-linux-gnu/openssl/opensslconf.h /usr/include/openssl/opensslconf.h; \
+    fi
+
 WORKDIR /configs
 ADD x86_64_config /configs/x86_64
 ADD arm64_config /configs/arm64

tools/docker/linux_headers_image/build_linux_headers.sh

@@ -73,7 +73,13 @@ if [ "${KERN_MAJ}" -lt 6 ] || { [ "${KERN_MAJ}" -le 6 ] && [ "${KERN_MIN}" -lt 3
 fi
 echo "Building ${TARGET} for ${KERN_VERSION}${LOCALVERSION} (${ARCH})"
 
-make ARCH="${ARCH}" -j "$(nproc)" "${TARGET}" LOCALVERSION="${LOCALVERSION}"
+EXTRA_MAKE_ARGS=""
+if [ "${ARCH}" != "$(uname -m)" ]; then
+    # Skip dpkg dependency checks when cross-compiling, since host packages
+    # (e.g. libssl-dev) won't satisfy target arch requirements.
+    EXTRA_MAKE_ARGS="DPKG_FLAGS=-d"
+fi
+make ARCH="${ARCH}" -j "$(nproc)" "${TARGET}" LOCALVERSION="${LOCALVERSION}" ${EXTRA_MAKE_ARGS}
 
 popd || exit
 popd || exit