From patchwork Fri Jul 19 11:27:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 260245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id BB0452C008A for ; Fri, 19 Jul 2013 21:27:58 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EA2B593615; Fri, 19 Jul 2013 11:28:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Bxzsxbn0-LDN; Fri, 19 Jul 2013 11:27:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E345E93601; Fri, 19 Jul 2013 11:27:57 +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 663B41C4584 for ; Fri, 19 Jul 2013 11:27:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4464B8AD2D for ; Fri, 19 Jul 2013 11:27:50 +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 bDsZETviauGj for ; Fri, 19 Jul 2013 11:27:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ea0-f169.google.com (mail-ea0-f169.google.com [209.85.215.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 213EB8B28E for ; Fri, 19 Jul 2013 11:27:48 +0000 (UTC) Received: by mail-ea0-f169.google.com with SMTP id h15so2338865eak.0 for ; Fri, 19 Jul 2013 04:27:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:content-type:mime-version:content-transfer-encoding:subject :x-mercurial-node:message-id:in-reply-to:references:user-agent:date :from:to; bh=CcXGEvJT9B0TEj13OdXosQtv5oZvGLJsLonlm4DKQyg=; b=hncg2IWBoiS3jVFcfTMjPNmK7X/39L4MfPDAQI/V0lIZ/2GG3RnlMkvRW9EavgShg6 Nk8JcsK3fScP1CXwr/e4Tk6osXk8oak76mNNu/VGxAorKGUdx1vzDAibmvebSGlVqpcq Kg6Die/bh1hVKnFnhPmD1STABzqQ7MZ0lhDuUw4jb/lwNbf1cBeXbHc8oX9h71BV+xJN JoRwYO4VrNjw1aJUmqVQ/k/8knRYcMVZXt0kLi4LZHSSsAqf9a2HgFLZMmGx6IyispTs 5LZZ3KXZVh3A1GoctDpTCt3ttpP905ES2pkmjfsnOQoxTNKEC6jHxw2Nx64fABYA6dI1 pQKg== X-Received: by 10.14.198.73 with SMTP id u49mr15674517een.19.1374233267458; Fri, 19 Jul 2013 04:27:47 -0700 (PDT) Received: from [127.0.1.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id c3sm26722570eev.3.2013.07.19.04.27.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Jul 2013 04:27:46 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: 21dda5e59e1c88ea78ef131b45810d836725939a Message-Id: <21dda5e59e1c88ea78ef.1374233233@BEANTN0L019720> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 19 Jul 2013 13:27:13 +0200 From: Thomas De Schampheleire To: buildroot@busybox.net Subject: [Buildroot] [PATCH 2 of 3] u-boot: add support for custom Mercurial repository 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Thomas De Schampheleire --- boot/uboot/Config.in | 15 +++++++++------ boot/uboot/uboot.mk | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -31,6 +31,9 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL config BR2_TARGET_UBOOT_CUSTOM_GIT bool "Custom Git repository" +config BR2_TARGET_UBOOT_CUSTOM_HG + bool "Custom Mercurial repository" + endchoice config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE @@ -49,7 +52,7 @@ config BR2_TARGET_UBOOT_VERSION default "2013.04" if BR2_TARGET_UBOOT_LATEST_VERSION default $BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL - default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT + default $BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR string "custom patch dir" @@ -60,13 +63,13 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR Most users may leave this empty -if BR2_TARGET_UBOOT_CUSTOM_GIT +if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG -config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL - string "URL of custom Git repository" +config BR2_TARGET_UBOOT_CUSTOM_REPO_URL + string "URL of custom repository" -config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION - string "Custom Git version" +config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION + string "Custom repository version" endif diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -18,8 +18,11 @@ UBOOT_TARBALL = $(call qstrip,$(BR2_TARG UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL))) UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL)) else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y) -UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL)) +UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = git +else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y) +UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) +UBOOT_SITE_METHOD = hg else # Handle stable official U-Boot versions UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot