From patchwork Thu Mar 7 17:48:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1909419 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TrGyW1NFxz1yWy for ; Fri, 8 Mar 2024 04:49:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4305D41B70; Thu, 7 Mar 2024 17:49:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IhQX-zug_6tx; Thu, 7 Mar 2024 17:49:20 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D562741B5E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id D562741B5E; Thu, 7 Mar 2024 17:49:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BD0821BF980 for ; Thu, 7 Mar 2024 17:49:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B763E41B5F for ; Thu, 7 Mar 2024 17:49:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Twgc0wngqmbf for ; Thu, 7 Mar 2024 17:49:16 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=85.13.140.57; helo=dd20012.kasserver.com; envelope-from=bernd@kuhls.net; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 72FD24193A DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 72FD24193A Received: from dd20012.kasserver.com (dd20012.kasserver.com [85.13.140.57]) by smtp4.osuosl.org (Postfix) with ESMTPS id 72FD24193A for ; Thu, 7 Mar 2024 17:49:15 +0000 (UTC) Received: from fli4l.lan.fli4l (p54a1bd61.dip0.t-ipconnect.de [84.161.189.97]) by dd20012.kasserver.com (Postfix) with ESMTPSA id 22826A4C2D49; Thu, 7 Mar 2024 18:48:50 +0100 (CET) Received: from bruckner.lan.fli4l ([192.168.1.1]:51086) by fli4l.lan.fli4l with esmtp (Exim 4.97.1) (envelope-from ) id 1riHrN-000000005Mx-3JxW; Thu, 07 Mar 2024 18:48:49 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 7 Mar 2024 18:48:48 +0100 Message-Id: <20240307174849.37394-2-bernd@kuhls.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307174849.37394-1-bernd@kuhls.net> References: <20240307174849.37394-1-bernd@kuhls.net> MIME-Version: 1.0 X-Spamd-Bar: +++ X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kuhls.net; s=kas202312101026; t=1709833730; bh=2nG5yg4E9E+QjSplqWC6yDawXR7NxGSI6cdRQwXVWIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kn9QkST1s7RnNW2YO2oFkzmSO81njD7IUEehwdaSc1lWdTbPWPThTajAzF67D+xmf 55/TD910oXQsOS3e8nNIjf3FoY/CH8ZCpP/eu8LJLR8i3+4TUAg7COlStcBGZtBTp7 B7+/GWmFOry54b6cbe1Wn9CSM7R2yn8q7BVysMIbr8aJA7du7h5xNDxsq9oxvJXQ44 x11pzVBYjpAdt3pvZxWvX2MVRMOjYn8Hmllav5FV32qjYwuy+3m4m7/Nj/etEznHEo DlCSzzLQ6ObEJlaA7AMXnfToc2IQP2vDAV2NXqQQKTf7OTTKJ1OMhDKD19NGqFCdNc utnr8xCQBS9hw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=kuhls.net X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=kuhls.net header.i=@kuhls.net header.a=rsa-sha256 header.s=kas202312101026 header.b=Kn9QkST1 Subject: [Buildroot] [PATCH 2/3] {toolchain, linux-headers}: add support for 6.7 headers X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas De Schampheleire , Giulio Benetti , Romain Naour , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" And add (and default to) 6.7 to linux-headers. Signed-off-by: Bernd Kuhls --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 977ad30f73..3c149a031a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 0fd733fc0778f8da1fdf66df1698d394248807de71eef83a4d1218bcb3dfd346 linux-6.7.9.tar.xz sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fe4fc5011e..274752a412 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_6 + default BR2_KERNEL_HEADERS_6_7 help Select the kernel version to get headers from. @@ -47,6 +47,10 @@ config BR2_KERNEL_HEADERS_6_1 config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 + +config BR2_KERNEL_HEADERS_6_7 + bool "Linux 6.7.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -124,8 +128,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 + bool "6.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 - bool "6.6.x or later" + bool "6.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5 @@ -409,6 +417,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.151" if BR2_KERNEL_HEADERS_5_15 default "6.1.81" if BR2_KERNEL_HEADERS_6_1 default "6.6.21" if BR2_KERNEL_HEADERS_6_6 + default "6.7.9" if BR2_KERNEL_HEADERS_6_7 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 3dd6e83d35..33528ea8fc 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -645,6 +645,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -658,6 +662,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 5554d56719..a7c239dcab 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -162,8 +162,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7 + bool "6.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6 - bool "6.6.x or later" + bool "6.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5