From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Korsgaard Date: Mon, 22 Jul 2013 00:11:36 +0200 Subject: [Buildroot] [PATCH 3 of 3] linux/uboot: line-up repository-related configuration options In-Reply-To: <3c808c389a7d8a39cfaf.1374233234@BEANTN0L019720> (Thomas De Schampheleire's message of "Fri, 19 Jul 2013 13:27:14 +0200") References: <3c808c389a7d8a39cfaf.1374233234@BEANTN0L019720> Message-ID: <87ppubr2av.fsf@dell.be.48ers.dk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net >>>>> "Thomas" == Thomas De Schampheleire writes: Thomas> Although the configuration options for custom repository locations and Thomas> versions are very similar between the linux and uboot packages, there are Thomas> some minor differences. This patch lines up both packages. Thomas> Signed-off-by: Thomas De Schampheleire Thomas> --- Thomas> Note: one remaining difference is that there are help texts in linux for Thomas> options BR2_LINUX_KERNEL_CUSTOM_GIT and BR2_LINUX_KERNEL_CUSTOM_HG. I Thomas> didn't add them to uboot because it seems a bit redundant, but if you Thomas> prefer we can line this up as well (either add help texts to uboot or Thomas> remove them from linux). Thomas> boot/uboot/Config.in | 5 +++++ Thomas> linux/Config.in | 2 +- Thomas> 2 files changed, 6 insertions(+), 1 deletions(-) Thomas> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in Thomas> --- a/boot/uboot/Config.in Thomas> +++ b/boot/uboot/Config.in Thomas> @@ -70,6 +70,11 @@ config BR2_TARGET_UBOOT_CUSTOM_REPO_URL Thomas> config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION Thomas> string "Custom repository version" Thomas> + default "HEAD" if BR2_TARGET_UBOOT_CUSTOM_GIT Thomas> + default "tip" if BR2_TARGET_UBOOT_CUSTOM_HG Thomas> + help Thomas> + Revision to use in the typical format used by Git/Mercurial Thomas> + E.G. a sha id, a tag, branch, .. As mentioned for the linux change, I prefer to drop the defaults, otherwise it looks good. -- Bye, Peter Korsgaard