From patchwork Thu Aug 29 12:59:21 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: 270819 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 C11792C00AA for ; Thu, 29 Aug 2013 23:03:44 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BBCED937BA; Thu, 29 Aug 2013 13:04:21 +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 jMeG43-tNBoN; Thu, 29 Aug 2013 13:04:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 16100937BE; Thu, 29 Aug 2013 13:04:18 +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 73C671BF82D for ; Thu, 29 Aug 2013 13:03:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6A3478D0E9 for ; Thu, 29 Aug 2013 13:03:26 +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 sxXFEqiCMje4 for ; Thu, 29 Aug 2013 13:03:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2BF188D0A2 for ; Thu, 29 Aug 2013 13:03:24 +0000 (UTC) Received: by mail-wi0-f176.google.com with SMTP id l12so8037296wiv.3 for ; Thu, 29 Aug 2013 06:03:22 -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 :message-id:in-reply-to:references:user-agent:date:from:to:cc; bh=h5m0djhQ/tUguhtYPCAHUuLVqSf9memKReJ/JvLLyCU=; b=hT058fQhKXNAhlDedinRNjyWKnENWj9XYOLWC0kgU426pmkGaN1spsvvQhBHpFN/q3 guST4RE23ZwNsuntD1K38BpXnd4GyjjL4ogsSlj73Kui882fnTY2EsHUJd0R0DY6tDOF xNikeMIqddhu0HD5uAVI2/TFJiCSlsXTw9Dj8di/bFqxHJvp0ThZHqqvXHnI/cHLO+BT jbwUeyeABM80m/v+0s/LRubxeCA26br4252qqO1CT8xWv3gkuNHfR8l5T7UkfLPJZlx9 SoMAB8U1Q/AIT2yy/AaXRaoOg/wS4sBNNAmQa43xHUbwBh28My/pMn+sGYUEEw+1gnKF Rphw== X-Received: by 10.194.23.73 with SMTP id k9mr6416310wjf.24.1377781402724; Thu, 29 Aug 2013 06:03:22 -0700 (PDT) Received: from [127.0.1.1] (alc112.alcatel.be. [195.207.101.112]) by mx.google.com with ESMTPSA id dr11sm12356309wid.3.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 Aug 2013 06:03:22 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: 823a15cd05bd6126e5a97b4734a133a64da8a268 Message-Id: <823a15cd05bd6126e5a9.1377781161@argentina> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Thu, 29 Aug 2013 14:59:21 +0200 From: Thomas De Schampheleire To: buildroot@busybox.net Cc: thomas.petazzoni@free-electrons.com Subject: [Buildroot] [PATCH 6 of 9 v3] 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 --- v2: add Config.in.legacy entries (comment Peter) Config.in.legacy | 30 ++++++++++++++++++++++++++++++ boot/uboot/Config.in | 23 ++++++++++++++++------- boot/uboot/uboot.mk | 5 ++++- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy --- a/Config.in.legacy +++ b/Config.in.legacy @@ -96,6 +96,36 @@ endif ############################################################################### comment "Legacy options removed in 2013.11" +config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL + string "u-boot: the git repository URL option has been renamed" + help + The option BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL has + been renamed to + BR2_TARGET_UBOOT_CUSTOM_REPO_URL. + +config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL_WRAP + bool + default y if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" + select BR2_LEGACY + +# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL is still referenced from +# boot/uboot/Config.in + +config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION + string "u-boot: the git repository version option has been renamed" + help + The option BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION has + been renamed to + BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION. + +config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION_WRAP + bool + default y if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" + select BR2_LEGACY + +# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION is still referenced from +# boot/uboot/Config.in + config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL string "linux: the git repository URL option has been renamed" help 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 @@ -47,9 +50,11 @@ endif config BR2_TARGET_UBOOT_VERSION string default "2013.07" if BR2_TARGET_UBOOT_LATEST_VERSION - default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_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 +65,17 @@ 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" + default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \ + if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" # legacy -config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION - string "Custom Git version" +config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION + string "Custom repository version" + default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \ + if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy 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