From 5ed8715c9d5b24d1bc2545255f7a5743a629bb75 Mon Sep 17 00:00:00 2001 From: David Holsgrove Date: Thu, 11 Oct 2012 14:39:44 +1000 Subject: libc/uClibc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom CUSTOM_LOCATION config options only presented in menuconfig if component CUSTOM version selected. Signed-off-by: "David Holsgrove" [yann.morin.1998@free.fr: fix indentation, don't patch custom dir location] Signed-off-by: "Yann E. MORIN" Message-Id: <712995e3e719fbbe24af.1349931201@localhost.localdomain> PatchWork-Id: 190794 --- scripts/build/libc/uClibc.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'scripts/build') diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index b93f21dd..affdb974 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -15,7 +15,12 @@ do_libc_get() { # For uClibc, we have almost every thing: releases, and snapshots # for the last month or so. We'll have to deal with svn revisions # later... - CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src} + if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" ]; then + CT_GetCustom "uClibc" "${CT_LIBC_VERSION}" \ + "${CT_LIBC_UCLIBC_CUSTOM_LOCATION}" + else + CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src} + fi # uClibc locales if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" ]; then CT_GetFile "${uclibc_local_tarball}" ${libc_src} @@ -26,6 +31,11 @@ do_libc_get() { # Extract uClibc do_libc_extract() { + # If using custom directory location, nothing to do + if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \ + -a -d "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" ]; then + return 0 + fi CT_Extract "uClibc-${CT_LIBC_VERSION}" # Don't patch snapshots if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \ -- cgit v1.2.3