From patchwork Fri Dec 7 09:46:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Braun X-Patchwork-Id: 204439 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id CE5C32C00C2 for ; Fri, 7 Dec 2012 20:46:54 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 62984101C33; Fri, 7 Dec 2012 09:46:45 +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 Qf6QZTj8cBF9; Fri, 7 Dec 2012 09:46:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3020410178E; Fri, 7 Dec 2012 09:46:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0BEC78F753 for ; Fri, 7 Dec 2012 09:46:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 663A58C2A5 for ; Fri, 7 Dec 2012 09:46:49 +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 3RC8FOjAAMjl for ; Fri, 7 Dec 2012 09:46:47 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.sceen.net (shattrath.sceen.net [94.23.252.191]) by whitealder.osuosl.org (Postfix) with ESMTP id A881F8C1EE for ; Fri, 7 Dec 2012 09:46:47 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sceen.net (Postfix) with ESMTP id B08D21408C0 for ; Fri, 7 Dec 2012 10:46:45 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at sceen.net Received: from mail.sceen.net ([127.0.0.1]) by localhost (mail.sceen.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8UO2kYfwo1HO for ; Fri, 7 Dec 2012 10:46:44 +0100 (CET) Received: by mail.sceen.net (Postfix, from userid 1000) id CD6D01408D1; Fri, 7 Dec 2012 10:46:44 +0100 (CET) From: Richard Braun To: buildroot@busybox.net Date: Fri, 7 Dec 2012 10:46:44 +0100 Message-Id: <1354873604-4304-1-git-send-email-rbraun@sceen.net> X-Mailer: git-send-email 1.7.2.5 Subject: [Buildroot] [PATCH] linux: add option to get sources from custom directory X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Signed-off-by: Richard Braun --- linux/Config.in | 15 +++++++++++++-- linux/linux.mk | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index ef3b2a1..cafbe59 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -46,6 +46,12 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL This option allows to specify the http or ftp location of a specific kernel source tarball +config BR2_LINUX_KERNEL_CUSTOM_DIRECTORY + bool "Custom directory" + help + This option allows to specify the path of a specific kernel + source directory. + config BR2_LINUX_KERNEL_CUSTOM_GIT bool "Custom Git tree" help @@ -56,12 +62,16 @@ endchoice config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE string "Kernel version" - depends on BR2_LINUX_KERNEL_CUSTOM_VERSION + depends on BR2_LINUX_KERNEL_CUSTOM_VERSION || BR2_LINUX_KERNEL_CUSTOM_DIRECTORY config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION string "URL of custom kernel tarball" depends on BR2_LINUX_KERNEL_CUSTOM_TARBALL +config BR2_LINUX_KERNEL_CUSTOM_DIRECTORY_PATH + string "Path of custom kernel sources" + depends on BR2_LINUX_KERNEL_CUSTOM_DIRECTORY + config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL string "URL of custom Git repository" depends on BR2_LINUX_KERNEL_CUSTOM_GIT @@ -78,7 +88,8 @@ config BR2_LINUX_KERNEL_VERSION string default "3.6.9" if BR2_LINUX_KERNEL_3_6 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 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION || \ + BR2_LINUX_KERNEL_CUSTOM_DIRECTORY default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL default $BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION if BR2_LINUX_KERNEL_CUSTOM_GIT diff --git a/linux/linux.mk b/linux/linux.mk index c4bdf90..1898408 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -15,6 +15,9 @@ LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL)) LINUX_SITE_METHOD = git +else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_DIRECTORY),y) +LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DIRECTORY_PATH)) +LINUX_SITE_METHOD = local else LINUX_SOURCE = linux-$(LINUX_VERSION).tar.bz2 # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order