From patchwork Tue Feb 28 18:06:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 733739 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vXmlC3Pxwz9s8K for ; Wed, 1 Mar 2017 05:07:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GUZ471pr"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=HelLdX6MhcMnelWiPxKLJutcSdC4Plwhk4WtfQTInpQ=; b=GUZ471prMj7Uzk bV4fAWjNzpktg5l4+uMc1yacdP30zwXSBFLl4q7uMlevZ/q+6vvxZL6zP3ugLkubvOW3M66ruz0ml hTR1W8KQgtUoze7e5t8F68023erJmi84w5ORlJhn/TANOZN0aqOuAtzgMZd+1h7TmFeoSUVeqMyHg 5RcKYQxK99lu5kQ9Ry53wGZHs6PkZB4zGtSRvxvS0PQ8+IQX3KxxOQ8C9Wk7bsMPmK7hTe3nN5uV5 pj+DjfTrkqTnij2f2tqGMu0SZCjOxzACfGDLxoNeLWzrRalKL/gQt3E8yEBAdAfN86bP0V6JpBQaE ttfWb/6rc0HitG7DBvXQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cimBP-0001qL-Qj; Tue, 28 Feb 2017 18:07:31 +0000 Received: from mga03.intel.com ([134.134.136.65]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cimB1-0001pN-2k for lede-dev@lists.infradead.org; Tue, 28 Feb 2017 18:07:08 +0000 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Feb 2017 10:06:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,220,1484035200"; d="scan'208";a="70600574" Received: from unknown (HELO mucrsb0001.muc.lantiq.com) ([10.62.163.96]) by fmsmga005.fm.intel.com with ESMTP; 28 Feb 2017 10:06:45 -0800 From: hauke.mehrtens@intel.com To: lede-dev@lists.infradead.org Date: Tue, 28 Feb 2017 19:06:40 +0100 Message-Id: <20170228180640.2129-1-hauke.mehrtens@intel.com> X-Mailer: git-send-email 2.10.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170228_100707_176833_2E79BBBF X-CRM114-Status: UNSURE ( 7.10 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [134.134.136.65 listed in list.dnswl.org] -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [134.134.136.65 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH] include/kernel: Allow to use git clone kernel into external tree X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Hauke Mehrtens This combines the usage of external kernel tree with the cloning of the kernel tree form git. The new kernel will be cloned into an external directory and then used from there. Signed-off-by: Hauke Mehrtens --- include/kernel-defaults.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 10bd67a..6969c9f 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -62,13 +62,26 @@ ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") endef endif else - define Kernel/Prepare/Default + ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"") + define Kernel/Prepare/Default mkdir -p $(KERNEL_BUILD_DIR) if [ -d $(LINUX_DIR) ]; then \ rmdir $(LINUX_DIR); \ fi ln -s $(CONFIG_EXTERNAL_KERNEL_TREE) $(LINUX_DIR) - endef + endef + else + define Kernel/Prepare/Default + mkdir -p $(KERNEL_BUILD_DIR) + if [ -d $(LINUX_DIR) ]; then \ + rmdir $(LINUX_DIR); \ + fi + ln -s $(CONFIG_EXTERNAL_KERNEL_TREE) $(LINUX_DIR) + if [ ! -d $(CONFIG_EXTERNAL_KERNEL_TREE) ]; then \ + git clone $(KERNEL_GIT_OPTS) $(CONFIG_KERNEL_GIT_CLONE_URI) $(CONFIG_EXTERNAL_KERNEL_TREE); \ + fi + endef + endif endif ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)