From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EB6CDC636CC for ; Mon, 13 Feb 2023 11:58:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8B89280F4E; Mon, 13 Feb 2023 11:58:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8B89280F4E X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id diGTny1jGB3z; Mon, 13 Feb 2023 11:58:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id C472480E46; Mon, 13 Feb 2023 11:58:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C472480E46 Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id D92B71BF39E for ; Mon, 13 Feb 2023 11:58:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B3CB1401FA for ; Mon, 13 Feb 2023 11:58:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B3CB1401FA 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 khE42OO7Novz for ; Mon, 13 Feb 2023 11:58:21 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 65D82401EB Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by smtp4.osuosl.org (Postfix) with ESMTPS id 65D82401EB for ; Mon, 13 Feb 2023 11:58:20 +0000 (UTC) Received: (Authenticated sender: peter@korsgaard.com) by mail.gandi.net (Postfix) with ESMTPSA id 2B2DA240005; Mon, 13 Feb 2023 11:58:14 +0000 (UTC) Received: from peko by dell.be.48ers.dk with local (Exim 4.94.2) (envelope-from ) id 1pRXTJ-002RcX-TH; Mon, 13 Feb 2023 12:58:13 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Mon, 13 Feb 2023 12:58:11 +0100 Message-Id: <20230213115812.582772-3-peter@korsgaard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230213115812.582772-1-peter@korsgaard.com> References: <20230213115812.582772-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/3] package/linux-headers: drop 6.0.x option 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The 6.0.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e2dc854c78..7f69462f2e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_KERNEL_HEADERS_4_9 bool "kernel headers version 4.9.x are no longer supported" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ae8b5e5f62..52eb534b40 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz -sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6970090855..18c179ec8d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -45,10 +45,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_6_0 - bool "Linux 6.0.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 - config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 @@ -393,7 +389,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.231" if BR2_KERNEL_HEADERS_5_4 default "5.10.167" if BR2_KERNEL_HEADERS_5_10 default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default "6.1.11" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot