From patchwork Mon Oct 12 07:44:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tian Yuanhao X-Patchwork-Id: 1380680 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=busybox.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=aliyun.com header.i=@aliyun.com header.a=rsa-sha256 header.s=s1024 header.b=IUvZe6OB; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C8rKv6wHZz9sS8 for ; Mon, 12 Oct 2020 18:44:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4806885F2D; Mon, 12 Oct 2020 07:44:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WzwwqPe087Wn; Mon, 12 Oct 2020 07:44:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CCCEC85E7C; Mon, 12 Oct 2020 07:44:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A874F1BF361 for ; Mon, 12 Oct 2020 07:44:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A4F988674F for ; Mon, 12 Oct 2020 07:44:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E7yo3EieSZYK for ; Mon, 12 Oct 2020 07:44:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from out30-26.freemail.mail.aliyun.com (out30-26.freemail.mail.aliyun.com [115.124.30.26]) by whitealder.osuosl.org (Postfix) with ESMTPS id 769D886744 for ; Mon, 12 Oct 2020 07:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aliyun.com; s=s1024; t=1602488668; h=Message-ID:Subject:From:To:Date:Content-Type:Mime-Version; bh=e4Zwbqq0mmexE7DBB8tqUDCwpmLyWCa6JcgDiinpIPw=; b=IUvZe6OB/ZZ3tDBa3q9kIdC6j4JhnZwCwHj8d68BMG0oOYBb4Ze5n5UmN8s0Y3Rszuz0xXiY0DAp9NwAoMvdl0y3lNTw40i9uk8spM/iwOlAyPO/24pe2EeE19IQ6PUwMYel673HDtGlJ8w/U7aUm9QSrGnYFnDifZHSNqU4sZ8= X-Alimail-AntiSpam: AC=CONTINUE; BC=0.07357798|-1; CH=green; DM=|CONTINUE|false|; DS=CONTINUE|ham_regular_dialog|0.00402457-0.000699848-0.995276; FP=0|0|0|0|0|-1|-1|-1; HT=e01e04357; MF=tianyuanhao@aliyun.com; NM=1; PH=DS; RN=1; RT=1; SR=0; TI=SMTPD_---0UBl9zEd_1602488666; Received: from 10.20.4.124(mailfrom:tianyuanhao@aliyun.com fp:SMTPD_---0UBl9zEd_1602488666) by smtp.aliyun-inc.com(127.0.0.1); Mon, 12 Oct 2020 15:44:26 +0800 Message-ID: <1602488666.22960.2.camel@aliyun.com> To: Buildroot Date: Mon, 12 Oct 2020 15:44:26 +0800 X-Mailer: Evolution 3.18.5.2-0ubuntu3.2 Mime-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: add version 5.9 X-BeenThere: buildroot@busybox.net 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: , From: Tian Yuanhao via buildroot Reply-To: Tian Yuanhao Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Tian Yuanhao ---  linux/Config.in                                             |  4 ++--  linux/linux.hash                                            |  1 +  package/linux-headers/Config.in.host                        | 13 +++++++++++--  toolchain/Config.in                                         |  5 +++++  .../toolchain-external-custom/Config.in.options             |  6 +++++-  5 files changed, 24 insertions(+), 5 deletions(-) --  2.7.4 diff --git a/linux/Config.in b/linux/Config.in index 309abb9..6d9d0af 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,7 +28,7 @@ choice   prompt "Kernel version"    config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.8)" + bool "Latest version (5.9)"    config BR2_LINUX_KERNEL_LATEST_CIP_VERSION   bool "Latest CIP SLTS version (4.19.132-cip30)" @@ -125,7 +125,7 @@ endif    config BR2_LINUX_KERNEL_VERSION   string - default "5.8.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.9" if BR2_LINUX_KERNEL_LATEST_VERSION   default "4.19.132-cip30" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION   default "4.19.132-cip30-rt12" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION   default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index ccb8d7f..4b76398 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@  # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256  3239a4ee1250bf2048be988cc8cb46c487b2c8a0de5b1b032d38394d5c6b1a06  linux-5.9.tar.xz  sha256  ee767991808d234ad9acd17f0ba94ba7979d30c528876bee6fba337ea540f0af  linux-5.8.14.tar.xz  sha256  c0b3d8085c5ba235df38b00b740e053659709e8a5ca21957a239f6bc22c45007  linux-5.4.70.tar.xz  # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index dacd3f8..16af044 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS  choice   prompt "Kernel Headers"   default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_5_8 + default BR2_KERNEL_HEADERS_5_9   help     Select the kernel version to get headers from.   @@ -57,6 +57,10 @@ config BR2_KERNEL_HEADERS_5_4  config BR2_KERNEL_HEADERS_5_8   bool "Linux 5.8.x kernel headers"   select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + +config BR2_KERNEL_HEADERS_5_9 + bool "Linux 5.9.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9   select BR2_KERNEL_HEADERS_LATEST    config BR2_KERNEL_HEADERS_VERSION @@ -131,8 +135,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_5_9 + bool "5.9.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 +  config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8 - bool "5.8.x or later" + bool "5.8.x"   select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8    config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7 @@ -344,6 +352,7 @@ config BR2_DEFAULT_KERNEL_HEADERS   default "4.19.150" if BR2_KERNEL_HEADERS_4_19   default "5.4.70" if BR2_KERNEL_HEADERS_5_4   default "5.8.14" if BR2_KERNEL_HEADERS_5_8 + default "5.9" if BR2_KERNEL_HEADERS_5_9   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 6e2befe..db2ab0f 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -484,6 +484,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7  config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8   bool   select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8   select BR2_TOOLCHAIN_HEADERS_LATEST    # This should be selected by the latest version, above, to indicate that @@ -497,6 +501,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST  # stops affecting a value on the first matching default.  config BR2_TOOLCHAIN_HEADERS_AT_LEAST   string + default "5.9"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9   default "5.8"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8   default "5.7"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7   default "5.6"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index d69db68..f7aa545 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -119,8 +119,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_5_9 + bool "5.9.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 +  config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_8 - bool "5.8.x or later" + bool "5.8.x"   select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8    config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7