From patchwork Fri Feb 5 23:06:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 579658 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 624E51402A8 for ; Sat, 6 Feb 2016 10:06:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=AmPTegkS; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A530833790; Fri, 5 Feb 2016 23:06:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m5z4dUzdv+AF; Fri, 5 Feb 2016 23:06:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 043483388E; Fri, 5 Feb 2016 23:06:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E670F1C0FC2 for ; Fri, 5 Feb 2016 23:06:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D8F8A33895 for ; Fri, 5 Feb 2016 23:06:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WFk67Z2c5pTV for ; Fri, 5 Feb 2016 23:06:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by silver.osuosl.org (Postfix) with ESMTPS id 2A669333B1 for ; Fri, 5 Feb 2016 23:06:24 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id r129so5063093wmr.0 for ; Fri, 05 Feb 2016 15:06:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uyrbb4ClDyhOuNJMnaMUbsfMVKdWpQ/yjhWn2jAVXyM=; b=AmPTegkSHZGmdAxooQhqcamIV3y7Ok5+VI8NHAJxFQM9x7wZrUVbUCk7Rff5czZloR mW/7fIWRiwgK4DRzUDfn8yblCGhrF80/TbqvMrFMqgyz8EU/Y9KAUcBysZssR0e0F5Ky yw8+Bi3uQ8fvTXjPAjtEEqyH3f78u1GkJYLWLxO5Y10WRv4VV5gAQfRa/6IVhbXCmYps 03RE0jJdFmsk6VVdDulJ/RtggpkTL+YqAgUyvVJabSSlxrv9QALRL/vBRBh/nm+O45l5 vHVZRc243RHJExXtDKdEeLTXrs+G312YAvtNHUiMk5DZ2mKUpx+zluKmkEJut2wekkCu weEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uyrbb4ClDyhOuNJMnaMUbsfMVKdWpQ/yjhWn2jAVXyM=; b=NcXfrA0wSjswtKbXhWVa+nV3UX9dIQlWzYgEVHjcvewtvwpTvodjaHJK0hMehA5NSU us1+qm19GBJiuK2cvf1BTQEsyZH6May836cUk6pdZdd/wlGX8BiYtCOhX2TJp80S7sUd 9yi3GFiO9oN9KRsuGd2EKPLodkzKZVwF66CNjjapqQSPO25aLde7iT9oUHpr8iWD+6vy RLW+fd00nVeNu91jmVg2PM73oMuctnm3+u2HpDFgz79Y7NG7o5kQ6G4ttLIelJNkIS9l 53yT0jCgUaNQEHYuwZ+A/ErxHoJOE8RouLfDgglh2jdOBvfZgxwj3bzvEydnjjH9Oj6o 3nsQ== X-Gm-Message-State: AG10YORPWwN5bA3RFpsWPiw6ymqKSA20yeU3S+SiG8UcQshEKmxhsO9Jp6nDNHlwnMX8/w== X-Received: by 10.194.94.138 with SMTP id dc10mr19084578wjb.37.1454713582833; Fri, 05 Feb 2016 15:06:22 -0800 (PST) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id az10sm17860343wjc.28.2016.02.05.15.06.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Feb 2016 15:06:21 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 6 Feb 2016 00:06:17 +0100 Message-Id: <1d309dc709b1ebdb55dad9c7ec1b978e8588d0b9.1454713324.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 2/3 v2] linux: drop the option to use the same version as that of the headers X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" It is no longer meaningful, now that we have the option to use the kernel version for the linux headers, as it is more logical and more versatile. Add it to legacy. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Arnout Vandecappelle --- Config.in.legacy | 10 ++++++++++ linux/Config.in | 13 ------------- linux/linux.mk | 3 --- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 793b116..b38cf90 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,16 @@ endif ############################################################################### comment "Legacy options removed in 2016.02" +config BR2_LINUX_KERNEL_SAME_AS_HEADERS + bool "using the linux headers version for the kernel has been removed" + select BR2_LEGACY + help + The option to use the version of the kernel headers for the + kernel to build has been removed. + + There is now the converse, better-suited and more versatile + option to use the kernel version for the linux headers. + config BR2_PACKAGE_CUPS_PDFTOPS bool "Pdftops support has been removed from Cups" select BR2_LEGACY diff --git a/linux/Config.in b/linux/Config.in index 8971192..4d972e1 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -29,18 +29,6 @@ choice config BR2_LINUX_KERNEL_LATEST_VERSION bool "4.4.1" -config BR2_LINUX_KERNEL_SAME_AS_HEADERS - bool "Same as toolchain kernel headers" - depends on !BR2_KERNEL_HEADERS_AS_KERNEL - depends on BR2_TOOLCHAIN_BUILDROOT - help - This option will re-use the same kernel sources as the one - that have been used for the kernel headers of the - cross-compiling toolchain. Having the same version for the - kernel running on the system and for the kernel headers is - not a requirement, but using the same version allows to - download only one tarball of the kernel sources. - config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" help @@ -117,7 +105,6 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH config BR2_LINUX_KERNEL_VERSION string default "4.4.1" if BR2_LINUX_KERNEL_LATEST_VERSION - default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.mk b/linux/linux.mk index c9986cd..578fea1 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -28,9 +28,6 @@ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -ifeq ($(BR2_LINUX_KERNEL_SAME_AS_HEADERS)$(BR2_KERNEL_HEADERS_VERSION),yy) -BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) -endif # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order # to use the $(word) function. We support versions such as 4.0, 3.1, # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.