Patchwork [12,of,13] libc/uClibc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom

login
register
mail settings
Submitter David Holsgrove
Date Oct. 11, 2012, 4:53 a.m.
Message ID <712995e3e719fbbe24af.1349931201@localhost.localdomain>
Download mbox | patch
Permalink /patch/190794/
State Accepted
Commit 79169596cfc9
Headers show

Comments

David Holsgrove - Oct. 11, 2012, 4:53 a.m.
# HG changeset patch
# User David Holsgrove <david.holsgrove@xilinx.com>
# Date 1349930384 -36000
# Node ID 712995e3e719fbbe24afba8efd370e4213372405
# Parent  ad791eab5e898b88dac15629f7b1db9915b3385a
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" <david.holsgrove@xilinx.com>


--
For unsubscribe information see http://sourceware.org/lists.html#faq
Yann E. MORIN - Oct. 31, 2012, 10:54 p.m.
David, All,

Your patch:
    libc/uClibc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom

has been applied as: #79169596cfc9
    http://crosstool-ng.org/hg/crosstool-ng/rev/79169596cfc9

Thank you!

Regards,
Yann E. MORIN.



--
For unsubscribe information see http://sourceware.org/lists.html#faq

Patch

diff -r ad791eab5e89 -r 712995e3e719 config/libc/uClibc.in
--- a/config/libc/uClibc.in	Thu Oct 11 14:39:43 2012 +1000
+++ b/config/libc/uClibc.in	Thu Oct 11 14:39:44 2012 +1000
@@ -99,8 +99,27 @@ 
     select LIBC_SUPPORT_NPTL
     select LIBC_UCLIBC_0_9_30_or_later
 
+config LIBC_UCLIBC_CUSTOM
+    bool
+    prompt "Custom uClibc"
+    depends on EXPERIMENTAL
+    select LIBC_SUPPORT_NPTL
+    select LIBC_UCLIBC_0_9_30_or_later
+
 endchoice
 
+if LIBC_UCLIBC_CUSTOM
+
+config LIBC_UCLIBC_CUSTOM_LOCATION
+    string
+    prompt "Full path to custom uClibc source"
+    default ""
+    help
+      Enter the path to the directory (or tarball) of your source for uClibc,
+      or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/uClibc
+
+endif # LIBC_UCLIBC_CUSTOM
+
 config LIBC_VERSION
     string
     prompt "Enter date (YYYYMMDD)" if LIBC_UCLIBC_V_specific_date
@@ -119,6 +138,7 @@ 
     default "0.9.29" if LIBC_UCLIBC_V_0_9_29
     default "0.9.28.3" if LIBC_UCLIBC_V_0_9_28_3
     default "snapshot" if LIBC_UCLIBC_V_snapshot
+    default "custom" if LIBC_UCLIBC_CUSTOM
 
 config LIBC_UCLIBC_0_9_32_or_later
     bool
diff -r ad791eab5e89 -r 712995e3e719 scripts/build/libc/uClibc.sh
--- a/scripts/build/libc/uClibc.sh	Thu Oct 11 14:39:43 2012 +1000
+++ b/scripts/build/libc/uClibc.sh	Thu Oct 11 14:39:44 2012 +1000
@@ -15,7 +15,12 @@ 
     # 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,7 +31,10 @@ 
 
 # Extract uClibc
 do_libc_extract() {
-    CT_Extract "uClibc-${CT_LIBC_VERSION}"
+    if [ "${CT_LIBC_UCLIBC_CUSTOM}" != "y" \
+         -o ! -d "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" ]; then
+	CT_Extract "uClibc-${CT_LIBC_VERSION}"
+    fi
     # Don't patch snapshots
     if [    -z "${CT_LIBC_UCLIBC_V_snapshot}"      \
          -a -z "${CT_LIBC_UCLIBC_V_specific_date}" \