From patchwork Wed Jul 24 07:23:01 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: 261299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 90C2F2C0098 for ; Wed, 24 Jul 2013 17:26:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A3A9A328C9; Wed, 24 Jul 2013 07:26:22 +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 R4Gv4cTqdpHB; Wed, 24 Jul 2013 07:26:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 25CC2328DE; Wed, 24 Jul 2013 07:26:12 +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 6AE291C2D98 for ; Wed, 24 Jul 2013 07:26:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 04E618D69A for ; Wed, 24 Jul 2013 07:26:09 +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 pM3EoEfpTyfq for ; Wed, 24 Jul 2013 07:26:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by whitealder.osuosl.org (Postfix) with ESMTPS id 09E9C8D5C4 for ; Wed, 24 Jul 2013 07:26:07 +0000 (UTC) Received: by mail-ea0-f170.google.com with SMTP id h10so37202eaj.15 for ; Wed, 24 Jul 2013 00:26:06 -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=0tGgTrnpiEQFNgojQKykkKAWioOOUTBZWlKUwpCIZe0=; b=CVnQEPvMKSkSFUFET+d1nk4ZG4nu5Y4/HEYycY7bcSBrvSD9lzFt1LNreipkPfQNIf qxAZq30GAr6eYZkmAVTBJoxMj4EdGAJ2OAW7KNpFKcrIYB1D5yWuKPCtiQjgdM6RG4Pq RYOocEh22PJ7qxrFowBRH7KMbZ9sn0tdSSIwmT/lBHfQSkjgT+4JlMAUAr3iX7FBXjuJ nq/A82/bx0HUpcZbLdIISA4NbOgDYc1sl4A+711QtvjTFETHim+sty/Es6+SteW8Trlg uO1/hNxZ3LnLpvXCg54PnrZgGs8yJqdPJPdBuyQlbjTgUdNGXvVpDOysOy9pL78sjL2n bezA== X-Received: by 10.15.26.199 with SMTP id n47mr36492525eeu.88.1374650766398; Wed, 24 Jul 2013 00:26:06 -0700 (PDT) Received: from [127.0.1.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id i2sm63958851eeu.4.2013.07.24.00.26.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Jul 2013 00:26:05 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: 60e8d2891ab47a9372e3859f5b4c72295877a542 Message-Id: <60e8d2891ab47a9372e3.1374650581@BEANTN0L019720> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Wed, 24 Jul 2013 09:23:01 +0200 From: Thomas De Schampheleire To: buildroot@busybox.net Subject: [Buildroot] [PATCH 4 of 6 v2] 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 | 18 ++++++++++++++++++ boot/uboot/Config.in | 15 +++++++++------ boot/uboot/uboot.mk | 5 ++++- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy --- a/Config.in.legacy +++ b/Config.in.legacy @@ -59,6 +59,24 @@ endif ############################################################################### comment "Legacy options removed in 2013.08" +config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL_WRAP + bool "u-boot: the git repository URL option has been renamed" + default y if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" + select BR2_LEGACY + 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_VERSION_WRAP + bool "u-boot: the git repository version option has been renamed" + default y if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" + select BR2_LEGACY + help + The option BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION has + been renamed to + BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION. + config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL_WRAP bool "linux: the git repository URL option has been renamed" default y if BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL != "" 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