From 5d89209d5bba689a9b739b3e5c34b432092fa1ea Mon Sep 17 00:00:00 2001 From: Sertonix Date: Wed, 3 Jul 2024 21:17:30 +0200 Subject: [PATCH] main/linux-lts: fix KBUILD_BUILD_TIMESTAMP not parsable by busybox date Ref https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=a8b8017c34fefcb763d8b06c294b58d1c480b2e4 --- main/linux-lts/APKBUILD | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD index 8f5c110c9b6..abbaef8e08a 100644 --- a/main/linux-lts/APKBUILD +++ b/main/linux-lts/APKBUILD @@ -4,7 +4,7 @@ _flavor=lts pkgname=linux-$_flavor pkgver=6.6.36 _kernver=${pkgver%.*} -pkgrel=0 +pkgrel=1 pkgdesc="Linux lts kernel" url="https://www.kernel.org" depends="initramfs-generator" @@ -170,12 +170,17 @@ updateconfigs() { done } +set_kbuild_timestamp() { + # KBUILD_BUILD_TIMESTAMP needs to be parsable by busybox date + export KBUILD_BUILD_TIMESTAMP="$(date '+%Y-%m-%d %H:%M:%S' -u${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" +} + build() { unset LDFLAGS # for some reason these sometimes leak into the kernel build, # -Werror=format-security breaks some stuff unset CFLAGS CPPFLAGS CXXFLAGS - export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" + set_kbuild_timestamp for i in $_flavors; do _prepareconfig "$i" "$CARCH" done @@ -199,7 +204,7 @@ build() { _package() { local _buildflavor="$1" _outdir="$2" - export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" + set_kbuild_timestamp cd "$srcdir"/build-$_buildflavor.$CARCH local _abi_release="$(make -s kernelrelease)" @@ -285,7 +290,7 @@ _dev() { pkgdesc="Headers and script for third party modules for $_flavor kernel" depends="$_depends_dev" local dir="$subpkgdir"/usr/src/linux-headers-"$_abi_release" - export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" + set_kbuild_timestamp # first we import config, run prepare to set up for building # external modules, and create the scripts