diff options
-rw-r--r-- | config/kernel/linux.in | 20 | ||||
-rw-r--r-- | config/libc/eglibc.in | 25 | ||||
-rw-r--r-- | config/libc/glibc.in | 23 | ||||
-rw-r--r-- | scripts/build/libc/eglibc.sh | 11 | ||||
-rw-r--r-- | scripts/build/libc/glibc-eglibc.sh-common | 17 | ||||
-rw-r--r-- | scripts/build/libc/glibc.sh | 7 |
6 files changed, 84 insertions, 19 deletions
diff --git a/config/kernel/linux.in b/config/kernel/linux.in index cb3b266..fbce1f8 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -28,7 +28,7 @@ choice config KERNEL_V_3_17 bool - prompt "3.17.4" + prompt "3.17.6" config KERNEL_V_3_16 bool @@ -40,7 +40,7 @@ config KERNEL_V_3_15 config KERNEL_V_3_14 bool - prompt "3.14.25 (longterm)" + prompt "3.14.26 (longterm)" config KERNEL_V_3_13 bool @@ -48,7 +48,7 @@ config KERNEL_V_3_13 config KERNEL_V_3_12 bool - prompt "3.12.33 (longterm)" + prompt "3.12.35 (longterm)" config KERNEL_V_3_11 bool @@ -56,7 +56,7 @@ config KERNEL_V_3_11 config KERNEL_V_3_10 bool - prompt "3.10.61 (longterm)" + prompt "3.10.62 (longterm)" config KERNEL_V_3_9 bool @@ -88,7 +88,7 @@ config KERNEL_V_3_3 config KERNEL_V_3_2 bool - prompt "3.2.60 (longterm)" + prompt "3.2.64 (longterm)" config KERNEL_V_3_1 bool @@ -187,14 +187,14 @@ config KERNEL_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW - default "3.17.4" if KERNEL_V_3_17 + default "3.17.6" if KERNEL_V_3_17 default "3.16.7" if KERNEL_V_3_16 default "3.15.10" if KERNEL_V_3_15 - default "3.14.25" if KERNEL_V_3_14 + default "3.14.26" if KERNEL_V_3_14 default "3.13.11" if KERNEL_V_3_13 - default "3.12.33" if KERNEL_V_3_12 + default "3.12.35" if KERNEL_V_3_12 default "3.11.10" if KERNEL_V_3_11 - default "3.10.61" if KERNEL_V_3_10 + default "3.10.62" if KERNEL_V_3_10 default "3.9.11" if KERNEL_V_3_9 default "3.8.13" if KERNEL_V_3_8 default "3.7.10" if KERNEL_V_3_7 @@ -202,7 +202,7 @@ config KERNEL_VERSION default "3.5.7" if KERNEL_V_3_5 default "3.4.105" if KERNEL_V_3_4 default "3.3.8" if KERNEL_V_3_3 - default "3.2.60" if KERNEL_V_3_2 + default "3.2.64" if KERNEL_V_3_2 default "3.1.10" if KERNEL_V_3_1 default "3.0.101" if KERNEL_V_3_0 default "2.6.39.4" if KERNEL_V_2_6_39 diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in index e939d03..8504cbf 100644 --- a/config/libc/eglibc.in +++ b/config/libc/eglibc.in @@ -79,6 +79,13 @@ config LIBC_EGLIBC_V_TRUNK help Selecting this will export the trunk of the eglibc subversion repository. +config LIBC_EGLIBC_CUSTOM + bool + prompt "Custom eglibc" + depends on EXPERIMENTAL + select LIBC_EGLIBC_2_16_or_later + select LIBC_CUSTOM + endchoice config LIBC_VERSION @@ -96,10 +103,27 @@ config LIBC_VERSION default "2_10" if LIBC_EGLIBC_V_2_10 default "2_9" if LIBC_EGLIBC_V_2_9 default "trunk" if LIBC_EGLIBC_V_TRUNK + default "custom" if LIBC_EGLIBC_CUSTOM config LIBC_EGLIBC_2_16_or_later bool +config LIBC_CUSTOM + bool + +if LIBC_EGLIBC_CUSTOM + +config LIBC_EGLIBC_CUSTOM_LOCATION + string + prompt "Full path to custom eglibc source" + default "" + help + Enter the path to the directory (or tarball) of your source for eglibc, + or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/eglibc + +endif # LIBC_EGLIBC_CUSTOM +if ! LIBC_EGLIBC_CUSTOM + if CONFIGURE_has_svn config EGLIBC_REVISION @@ -149,6 +173,7 @@ comment "| - or have a LAN mirror with a pre-downloaded tarball" comment "otherwise you won't be able to download eglibc" endif # ! CONFIGURE_has_svn +endif # ! LIBC_EGLIBC_CUSTOM config EGLIBC_OPT_SIZE bool diff --git a/config/libc/glibc.in b/config/libc/glibc.in index d349dfb..f107438 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -95,11 +95,33 @@ config LIBC_GLIBC_V_2_8 prompt "2.8" select LIBC_GLIBC_PORTS_EXTERNAL +config LIBC_GLIBC_CUSTOM + bool + prompt "Custom glibc" + depends on EXPERIMENTAL + select LIBC_CUSTOM + select LIBC_GLIBC_2_20_or_later + endchoice config LIBC_GLIBC_2_20_or_later bool +config LIBC_CUSTOM + bool + +if LIBC_GLIBC_CUSTOM + +config LIBC_GLIBC_CUSTOM_LOCATION + string + prompt "Full path to custom glibc source" + default "" + help + Enter the path to the directory (or tarball) of your source for glibc, + or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/glibc + +endif # LIBC_GLIBC_CUSTOM + config LIBC_VERSION string # Don't remove next line @@ -120,3 +142,4 @@ config LIBC_VERSION default "2.10.1" if LIBC_GLIBC_V_2_10_1 default "2.9" if LIBC_GLIBC_V_2_9 default "2.8" if LIBC_GLIBC_V_2_8 + default "custom" if LIBC_GLIBC_CUSTOM diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh index d7960d9..1f1095f 100644 --- a/scripts/build/libc/eglibc.sh +++ b/scripts/build/libc/eglibc.sh @@ -27,9 +27,14 @@ do_libc_get() { *) svn_base+="/branches/eglibc-${CT_LIBC_VERSION}";; esac - CT_GetSVN "eglibc-${CT_LIBC_VERSION}" \ - "${svn_base}/libc" \ - "${CT_EGLIBC_REVISION:-HEAD}" + if [ "${CT_LIBC_CUSTOM}" = "y" ]; then + CT_GetCustom "eglibc" "${CT_LIBC_VERSION}" "${CT_LIBC_EGLIBC_CUSTOM_LOCATION}" + CT_LIBC_CUSTOM_LOCATION="${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}" + else + CT_GetSVN "eglibc-${CT_LIBC_VERSION}" \ + "${svn_base}/libc" \ + "${CT_EGLIBC_REVISION:-HEAD}" + fi if [ "${CT_LIBC_LOCALES}" = "y" ]; then extra_addons+=("localedef") diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common index af3b1f1..28a36bd 100644 --- a/scripts/build/libc/glibc-eglibc.sh-common +++ b/scripts/build/libc/glibc-eglibc.sh-common @@ -4,10 +4,16 @@ do_libc_extract() { local addon - # Extract the main tarball - CT_Extract "${CT_LIBC}-${CT_LIBC_VERSION}" + # Attempt CT_EXTRACT only if NOT custom, or CUSTOM_LOCATION is not a directory + if [ "${CT_LIBC_CUSTOM}" != "y" \ + -o ! -d "${CT_LIBC_CUSTOM_LOCATION}" ]; then + CT_Extract "${CT_LIBC}-${CT_LIBC_VERSION}" + fi CT_Pushd "${CT_SRC_DIR}/${CT_LIBC}-${CT_LIBC_VERSION}" - CT_Patch nochdir "${CT_LIBC}" "${CT_LIBC_VERSION}" + # Attempt CT_PATCH only if NOT custom + if [ "${CT_LIBC_CUSTOM}" != "y" ]; then + CT_Patch nochdir "${CT_LIBC}" "${CT_LIBC_VERSION}" + fi # Extract the add-opns for addon in $(do_libc_add_ons_list " "); do @@ -214,8 +220,6 @@ do_libc_backend_once() { else OPTIMIZE=-O2 fi - # always include rpc, the user can still override it with TI-RPC - extra_config+=( --enable-obsolete-rpc ) ;; glibc) # glibc can't be built without -O2 (reference needed!) @@ -225,6 +229,9 @@ do_libc_backend_once() { ;; esac + # always include rpc, the user can still override it with TI-RPC + extra_config+=( --enable-obsolete-rpc ) + # Add some default glibc config options if not given by user. # We don't need to be conditional on wether the user did set different # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY is passed after diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 7bc47c5..8093d94 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -19,9 +19,14 @@ do_libc_get() { addons_list=($(do_libc_add_ons_list " ")) # Main source - CT_GetFile "glibc-${CT_LIBC_VERSION}" \ + if [ "${CT_LIBC_CUSTOM}" = "y" ]; then + CT_GetCustom "glibc" "${CT_LIBC_VERSION}" "${CT_LIBC_GLIBC_CUSTOM_LOCATION}" + CT_LIBC_CUSTOM_LOCATION="${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}" + else + CT_GetFile "glibc-${CT_LIBC_VERSION}" \ {http,ftp,https}://ftp.gnu.org/gnu/glibc \ ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots} + fi # C library addons for addon in "${addons_list[@]}"; do |