diff --git a/Dockerfile b/Dockerfile index 0c89718..4d3a981 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,14 +48,15 @@ COPY --from=ccachebuild addons.squashfs /kernel/addons.squashfs COPY --from=ccachebuild metadata /kernel/metadata FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 AS sdkbuild-ccachebuild -ARG KERNEL_VERSION= ARG KERNEL_FLAVOR=zone COPY --from=ccachebuild sdk.tar.gz /sdk.tar.gz -RUN mkdir -p /usr/src/kernel-sdk-${KERNEL_VERSION}-${KERNEL_FLAVOR} && \ - tar -zx -C /usr/src/kernel-sdk-${KERNEL_VERSION}-${KERNEL_FLAVOR} -f /sdk.tar.gz && \ - mkdir -p /lib/modules/${KERNEL_VERSION} && \ - ln -sf /usr/src/kernel-sdk-${KERNEL_VERSION}-${KERNEL_FLAVOR} /lib/modules/${KERNEL_VERSION}/build && \ - rm -rf /sdk.tar.gz +COPY --from=ccachebuild metadata /metadata +RUN KERNEL_UNAME_R=$(grep '^KERNEL_UNAME_R=' /metadata | cut -d= -f2) && \ + mkdir -p /usr/src/kernel-sdk-${KERNEL_UNAME_R}-${KERNEL_FLAVOR} && \ + tar -zx -C /usr/src/kernel-sdk-${KERNEL_UNAME_R}-${KERNEL_FLAVOR} -f /sdk.tar.gz && \ + mkdir -p /lib/modules/${KERNEL_UNAME_R} && \ + ln -sf /usr/src/kernel-sdk-${KERNEL_UNAME_R}-${KERNEL_FLAVOR} /lib/modules/${KERNEL_UNAME_R}/build && \ + rm -rf /sdk.tar.gz /metadata FROM scratch AS sdk-ccachebuild COPY --from=sdkbuild-ccachebuild /usr/src /usr/src diff --git a/configs/aarch64/host.config b/configs/aarch64/host.config index 476a7e3..e395f82 100644 --- a/configs/aarch64/host.config +++ b/configs/aarch64/host.config @@ -26,7 +26,7 @@ CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="-edera" CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y diff --git a/configs/x86_64/host.config b/configs/x86_64/host.config index 7ca07d3..f026c2b 100644 --- a/configs/x86_64/host.config +++ b/configs/x86_64/host.config @@ -26,7 +26,7 @@ CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="-edera" CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y diff --git a/hack/build/build.sh b/hack/build/build.sh index a5317e0..7b30d30 100755 --- a/hack/build/build.sh +++ b/hack/build/build.sh @@ -115,6 +115,7 @@ rm -rf "${SDK_OUTPUT_PATH}" { echo "KERNEL_ARCH=${TARGET_ARCH_STANDARD}" echo "KERNEL_VERSION=${KERNEL_VERSION}" + echo "KERNEL_UNAME_R=${KERNEL_MODULES_VER}" echo "KERNEL_FLAVOR=${KERNEL_FLAVOR}" sha256sum "${KERNEL_OBJ}/.config" | awk '{print "KERNEL_CONFIG=sha256:"$1}' } >"${METADATA_PATH}"