summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2015-11-13 05:46:34 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2015-11-13 05:46:34 (GMT)
commit377493fc5dfaa483452497bb00988bf7bf258960 (patch)
treeecd7d897850dca8fdcf4691e7602899cd67eccc7 /scripts
parent265503461b24eba2c946d6e70c760e530eaba170 (diff)
parentadcf4ec7e606ee4c2269edb47b0409896a017075 (diff)
Merge pull request #221 from bhundven/uclibc-ng
Add support for uClibc-ng
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/addToolVersion.sh9
-rw-r--r--scripts/build/libc/uClibc.sh437
-rw-r--r--scripts/functions50
3 files changed, 251 insertions, 245 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index 37c3ae1..9c6c4c6 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -133,15 +133,12 @@ addToolVersion() {
fi
;;
uClibc)
- # uClibc-0.9.30 and above need some love
+ # uClibc-0.9.33.2 needs some love
ver_M=$(getVersionField "${version}" . 1)
ver_m=$(getVersionField "${version}" . 2)
ver_p=$(getVersionField "${version}" . 3)
- if [ ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 30 \
- -o ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 31 ]; then
- SedExpr1="${SedExpr1}\n select LIBC_UCLIBC_0_9_30_or_later"
- elif [ ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 32 ]; then
- SedExpr1="${SedExpr1}\n select LIBC_UCLIBC_0_9_32_or_later"
+ elif [ ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 33 ]; then
+ SedExpr1="${SedExpr1}\n select LIBC_UCLIBC_0_9_33_2_or_later"
fi
;;
gdb)
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index eac32da..f49fd08 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -7,15 +7,22 @@
uclibc_locales_version=030818
uclibc_local_tarball="uClibc-locale-${uclibc_locales_version}"
-# Download uClibc
-do_libc_get() {
+if [ "${CT_LIBC_UCLIBC_NG}" = "y" ]; then
+ uclibc_name="uClibc-ng"
+ libc_src="http://downloads.uclibc-ng.org/releases/${CT_LIBC_VERSION}"
+else
+ uclibc_name="uClibc"
libc_src="http://www.uclibc.org/downloads
http://www.uclibc.org/downloads/old-releases"
+fi
+
+# Download uClibc
+do_libc_get() {
if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" ]; then
- CT_GetCustom "uClibc" "${CT_LIBC_VERSION}" \
+ CT_GetCustom "${uclibc_name}" "${CT_LIBC_VERSION}" \
"${CT_LIBC_UCLIBC_CUSTOM_LOCATION}"
else
- CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src}
+ CT_GetFile "${uclibc_name}-${CT_LIBC_VERSION}" ${libc_src}
fi
# uClibc locales
if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" ]; then
@@ -33,9 +40,9 @@ do_libc_extract() {
# custom location directory. Just use negate the whole test,
# to keep it the same as for other components.
if ! [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \
- -a -d "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" ]; then
- CT_Extract "uClibc-${CT_LIBC_VERSION}"
- CT_Patch "uClibc" "${CT_LIBC_VERSION}"
+ -a -d "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}" ]; then
+ CT_Extract "${uclibc_name}-${CT_LIBC_VERSION}"
+ CT_Patch "${uclibc_name}" "${CT_LIBC_VERSION}"
fi
# uClibc locales
@@ -43,7 +50,7 @@ do_libc_extract() {
# broken, so just link it in place...
if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" \
-a ! -f "${CT_SRC_DIR}/.${uclibc_local_tarball}.extracted" ]; then
- CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale"
+ CT_Pushd "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}/extra/locale"
CT_DoExecLog ALL ln -s "${CT_TARBALLS_DIR}/${uclibc_local_tarball}.tgz" .
CT_Popd
touch "${CT_SRC_DIR}/.${uclibc_local_tarball}.extracted"
@@ -56,29 +63,31 @@ do_libc_extract() {
do_libc_check_config() {
CT_DoStep INFO "Checking C library configuration"
- CT_TestOrAbort "You did not provide a uClibc config file!" -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" -a -f "${CT_LIBC_UCLIBC_CONFIG_FILE}"
+ # Use the default config if the user did not provide one.
+ if [ -z "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
+ CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/contrib/uClibc-defconfigs/${uclibc_name}.config"
+ fi
- if grep -E '^KERNEL_SOURCE=' "${CT_LIBC_UCLIBC_CONFIG_FILE}" >/dev/null 2>&1; then
+ if ${grep} -E '^KERNEL_SOURCE=' "${CT_LIBC_UCLIBC_CONFIG_FILE}" >/dev/null 2>&1; then
CT_DoLog WARN "Your uClibc version refers to the kernel _sources_, which is bad."
CT_DoLog WARN "I can't guarantee that our little hack will work. Please try to upgrade."
fi
- CT_DoLog EXTRA "Munging uClibc configuration"
- mungeuClibcConfig "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${CT_CONFIG_DIR}/uClibc.config"
+ CT_DoLog EXTRA "Manage uClibc configuration"
+ manage_uClibc_config "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${CT_CONFIG_DIR}/uClibc.config"
CT_EndStep
}
# Build and install headers and start files
do_libc_start_files() {
- local install_rule
local cross
CT_DoStep INFO "Installing C library headers"
# Simply copy files until uClibc has the ability to build out-of-tree
CT_DoLog EXTRA "Copying sources to build dir"
- CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" \
+ CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}" \
"${CT_BUILD_DIR}/build-libc-headers"
cd "${CT_BUILD_DIR}/build-libc-headers"
@@ -99,6 +108,7 @@ do_libc_start_files() {
CT_DoLog EXTRA "Applying configuration"
CT_DoYes "" |CT_DoExecLog ALL \
make CROSS_COMPILE="${cross}" \
+ UCLIBC_EXTRA_CFLAGS="-pipe" \
PREFIX="${CT_SYSROOT_DIR}/" \
LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
oldconfig
@@ -107,29 +117,26 @@ do_libc_start_files() {
CT_DoExecLog ALL \
make ${CT_LIBC_UCLIBC_VERBOSITY} \
CROSS_COMPILE="${cross}" \
+ UCLIBC_EXTRA_CFLAGS="-pipe" \
PREFIX="${CT_SYSROOT_DIR}/" \
LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
headers
- if [ "${CT_LIBC_UCLIBC_0_9_30_or_later}" = "y" ]; then
- install_rule=install_headers
- else
- install_rule=install_dev
- fi
-
CT_DoLog EXTRA "Installing headers"
CT_DoExecLog ALL \
make ${CT_LIBC_UCLIBC_VERBOSITY} \
CROSS_COMPILE="${cross}" \
+ UCLIBC_EXTRA_CFLAGS="-pipe" \
PREFIX="${CT_SYSROOT_DIR}/" \
LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
- ${install_rule}
+ install_headers
if [ "${CT_THREADS}" = "nptl" ]; then
CT_DoLog EXTRA "Building start files"
CT_DoExecLog ALL \
make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \
CROSS_COMPILE="${cross}" \
+ UCLIBC_EXTRA_CFLAGS="-pipe" \
PREFIX="${CT_SYSROOT_DIR}/" \
STRIPTOOL=true \
${CT_LIBC_UCLIBC_VERBOSITY} \
@@ -164,7 +171,7 @@ do_libc() {
# Simply copy files until uClibc has the ability to build out-of-tree
CT_DoLog EXTRA "Copying sources to build dir"
- CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" \
+ CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}" \
"${CT_BUILD_DIR}/build-libc"
cd "${CT_BUILD_DIR}/build-libc"
@@ -181,6 +188,7 @@ do_libc() {
CT_DoLog EXTRA "Applying configuration"
CT_DoYes "" |CT_DoExecLog CFG \
make CROSS_COMPILE=${CT_TARGET}- \
+ UCLIBC_EXTRA_CFLAGS="-pipe" \
PREFIX="${CT_SYSROOT_DIR}/" \
LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
oldconfig
@@ -192,6 +200,7 @@ do_libc() {
CT_DoExecLog ALL \
make -j1 \
CROSS_COMPILE=${CT_TARGET}- \
+ UCLIBC_EXTRA_CFLAGS="-pipe" \
PREFIX="${CT_SYSROOT_DIR}/" \
STRIPTOOL=true \
${CT_LIBC_UCLIBC_VERBOSITY} \
@@ -200,6 +209,7 @@ do_libc() {
CT_DoExecLog ALL \
make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \
CROSS_COMPILE=${CT_TARGET}- \
+ UCLIBC_EXTRA_CFLAGS="-pipe" \
PREFIX="${CT_SYSROOT_DIR}/" \
STRIPTOOL=true \
${CT_LIBC_UCLIBC_VERBOSITY} \
@@ -223,6 +233,7 @@ do_libc() {
CT_DoLog EXTRA "Installing C library"
CT_DoExecLog ALL \
make CROSS_COMPILE=${CT_TARGET}- \
+ UCLIBC_EXTRA_CFLAGS="-pipe" \
PREFIX="${CT_SYSROOT_DIR}/" \
STRIPTOOL=true \
${CT_LIBC_UCLIBC_VERBOSITY} \
@@ -234,18 +245,15 @@ do_libc() {
# Initialises the .config file to sensible values
# $1: original file
-# $2: munged file
-mungeuClibcConfig() {
- src_config_file="$1"
- dst_config_file="$2"
- munge_file="${CT_BUILD_DIR}/munge-uClibc-config.sed"
+# $2: modified file
+manage_uClibc_config() {
+ src="$1"
+ dst="$2"
- # Start with a fresh file
- rm -f "${munge_file}"
- touch "${munge_file}"
-
- # Do it all in a sub-shell, it's easier to redirect output
- (
+ # Start with fresh files
+ CT_DoExecLog ALL rm -f "${dst}"
+ CT_DoExecLog ALL mkdir -p "$(dirname ${dst})"
+ CT_DoExecLog ALL cp "${src}" "${dst}"
# Hack our target in the config file.
case "${CT_ARCH}:${CT_ARCH_BITNESS}" in
@@ -257,159 +265,134 @@ mungeuClibcConfig() {
esac
# Also remove stripping: its the responsibility of the
# firmware builder to strip or not.
- cat <<-ENDSED
- s/^(TARGET_.*)=y$/# \\1 is not set/
- s/^# TARGET_${arch} is not set/TARGET_${arch}=y/
- s/^TARGET_ARCH=".*"/TARGET_ARCH="${arch}"/
- s/.*(DOSTRIP).*/# \\1 is not set/
- ENDSED
+ ${sed} -i -r -e '/^TARGET_.*/d' "${dst}"
+ CT_KconfigEnableOption "TARGET_${arch}" "${dst}"
+ CT_KconfigSetOption "TARGET_ARCH" "${arch}" "${dst}"
+ CT_KconfigDisableOption "DOSTRIP" "${dst}"
# Ah. We may one day need architecture-specific handler here...
- case "${CT_ARCH}" in
- arm)
- # Hack the ARM {E,O}ABI into the config file
+ case "${arch}" in
+ arm*)
if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
- cat <<-ENDSED
- s/.*(CONFIG_ARM_OABI).*/# \\1 is not set/
- s/.*(CONFIG_ARM_EABI).*/\\1=y/
- ENDSED
+ CT_KconfigDisableOption "CONFIG_ARM_OABI" "${dst}"
+ CT_KconfigEnableOption "CONFIG_ARM_EABI" "${dst}"
else
- cat <<-ENDSED
- s/.*(CONFIG_ARM_OABI).*/\\1=y/
- s/.*(CONFIG_ARM_EABI).*/# \\1 is not set/
- ENDSED
+ CT_KconfigDisableOption "CONFIG_ARM_EABI" "${dst}"
+ CT_KconfigEnableOption "CONFIG_ARM_OABI" "${dst}"
fi
;;
- mips)
+ i386)
+ # FIXME This doesn't cover all cases of x86_32...
+ case ${CT_TARGET_ARCH} in
+ i386)
+ CT_KconfigEnableOption "CONFIG_386" "${dst}"
+ ;;
+ i486)
+ CT_KconfigEnableOption "CONFIG_486" "${dst}"
+ ;;
+ i586)
+ CT_KconfigEnableOption "CONFIG_586" "${dst}"
+ ;;
+ i686)
+ CT_KconfigEnableOption "CONFIG_686" "${dst}"
+ ;;
+ esac
+ ;;
+ mips*)
+ CT_KconfigDisableOption "CONFIG_MIPS_O32_ABI" "${dst}"
+ CT_KconfigDisableOption "CONFIG_MIPS_N32_ABI" "${dst}"
+ CT_KconfigDisableOption "CONFIG_MIPS_N64_ABI" "${dst}"
+ CT_KconfigDeleteOption "CONFIG_MIPS_ISA_1" "${dst}"
+ CT_KconfigDeleteOption "CONFIG_MIPS_ISA_2" "${dst}"
+ CT_KconfigDeleteOption "CONFIG_MIPS_ISA_3" "${dst}"
+ CT_KconfigDeleteOption "CONFIG_MIPS_ISA_4" "${dst}"
+ CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS32" "${dst}"
+ CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS32R2" "${dst}"
+ CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS64" "${dst}"
+ CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS64R2" "${dst}"
case "${CT_ARCH_mips_ABI}" in
32)
- cat <<-ENDSED
- s/.*(CONFIG_MIPS_O32_ABI).*/\\1=y/
- s/.*(CONFIG_MIPS_N32_ABI).*/# \\1 is not set/
- s/.*(CONFIG_MIPS_N64_ABI).*/# \\1 is not set/
- ENDSED
+ CT_KconfigEnableOption "CONFIG_MIPS_O32_ABI" "${dst}"
;;
- # For n32 and n64, also force the ISA
- # Not so sure this is pertinent, so it's
- # commented out for now. It would take a
- # (MIPS+uClibc) expert to either remove
- # or re-enable the overrides.
n32)
- cat <<-ENDSED
- s/.*(CONFIG_MIPS_O32_ABI).*/# \\1 is not set/
- s/.*(CONFIG_MIPS_N32_ABI).*/\\1=y/
- s/.*(CONFIG_MIPS_N64_ABI).*/# \\1 is not set/
- s/.*(CONFIG_MIPS_ISA_.*).*/# \\1 is not set/
- s/.*(CONFIG_MIPS_ISA_3).*/\\1=y/
- ENDSED
+ CT_KconfigEnableOption "CONFIG_MIPS_N32_ABI" "${dst}"
;;
64)
- cat <<-ENDSED
- s/.*(CONFIG_MIPS_O32_ABI).*/# \\1 is not set/
- s/.*(CONFIG_MIPS_N32_ABI).*/# \\1 is not set/
- s/.*(CONFIG_MIPS_N64_ABI).*/\\1=y/
- s/.*(CONFIG_MIPS_ISA_.*).*/# \\1 is not set/
- s/.*(CONFIG_MIPS_ISA_MIPS64).*/\\1=y/
- ENDSED
+ CT_KconfigEnableOption "CONFIG_MIPS_N64_ABI" "${dst}"
;;
esac
;;
+ powerpc*)
+ CT_KconfigDisableOption "CONFIG_E500" "${dst}"
+ CT_KconfigDisableOption "CONFIG_CLASSIC" "${dst}"
+ CT_KconfigDeleteOption "TARGET_SUBARCH" "${dst}"
+ if [ "${CT_ARCH_powerpc_ABI}" = "spe" ]; then
+ CT_KconfigEnableOption "CONFIG_E500" "${dst}"
+ CT_KconfigSetOption "TARGET_SUBARCH" "e500" "${dst}"
+ else
+ CT_KconfigEnableOption "CONFIG_CLASSIC" "${dst}"
+ CT_KconfigSetOption "TARGET_SUBARCH" "classic" "${dst}"
+ fi
+ ;;
+ sh)
+ # all we really support right now is sh4:32
+ CT_KconfigEnableOption "CONFIG_SH4" "${dst}"
+ ;;
esac
# Accomodate for old and new uClibc versions, where the
# way to select between big/little endian has changed
case "${CT_ARCH_ENDIAN}" in
big)
- cat <<-ENDSED
- s/.*(ARCH_LITTLE_ENDIAN).*/# \\1 is not set/
- s/.*(ARCH_BIG_ENDIAN).*/\\1=y/
- s/.*(ARCH_WANTS_LITTLE_ENDIAN).*/# \\1 is not set/
- s/.*(ARCH_WANTS_BIG_ENDIAN).*/\\1=y/
- ENDSED
- ;;
+ CT_KconfigDisableOption "ARCH_LITTLE_ENDIAN" "${dst}"
+ CT_KconfigDisableOption "ARCH_WANTS_LITTLE_ENDIAN" "${dst}"
+ CT_KconfigEnableOption "ARCH_BIG_ENDIAN" "${dst}"
+ CT_KconfigEnableOption "ARCH_WANTS_BIG_ENDIAN" "${dst}"
+ ;;
little)
- cat <<-ENDSED
- s/.*(ARCH_LITTLE_ENDIAN).*/\\1=y/
- s/.*(ARCH_BIG_ENDIAN).*/# \\1 is not set/
- s/.*(ARCH_WANTS_LITTLE_ENDIAN).*/\\1=y/
- s/.*(ARCH_WANTS_BIG_ENDIAN).*/# \\1 is not set/
- ENDSED
- ;;
+ CT_KconfigDisableOption "ARCH_BIG_ENDIAN" "${dst}"
+ CT_KconfigDisableOption "ARCH_WANTS_BIG_ENDIAN" "${dst}"
+ CT_KconfigEnableOption "ARCH_LITTLE_ENDIAN" "${dst}"
+ CT_KconfigEnableOption "ARCH_WANTS_LITTLE_ENDIAN" "${dst}"
+ ;;
esac
# Accomodate for old and new uClibc versions, where the
# MMU settings has different config knobs
if [ "${CT_ARCH_USE_MMU}" = "y" ]; then
- cat <<-ENDSED
- s/.*(ARCH_HAS_MMU).*/\\1=y\nARCH_USE_MMU=y/
- ENDSED
+ CT_KconfigEnableOption "ARCH_USE_MMU" "${dst}"
else
- cat <<-ENDSED
- s/.*(ARCH_HAS_MMU).*/# \\1 is not set/
- /.*(ARCH_USE_MMU).*/d
- ENDSED
+ CT_KconfigDisableOption "ARCH_USE_MMU" "${dst}"
fi
# Accomodate for old and new uClibc version, where the
# way to select between hard/soft float has changed
case "${CT_ARCH_FLOAT}" in
hard|softfp)
- cat <<-ENDSED
- s/^[^_]*(HAS_FPU).*/\\1=y/
- s/.*(UCLIBC_HAS_FPU).*/\\1=y/
- ENDSED
+ CT_KconfigEnableOption "UCLIBC_HAS_FPU" "${dst}"
+ CT_KconfigEnableOption "UCLIBC_HAS_FLOATS" "${dst}"
;;
soft)
- cat <<-ENDSED
- s/^[^_]*(HAS_FPU).*/\\# \\1 is not set/
- s/.*(UCLIBC_HAS_FPU).*/# \\1 is not set/
- ENDSED
+ CT_KconfigDisableOption "UCLIBC_HAS_FPU" "${dst}"
+ CT_KconfigEnableOption "UCLIBC_HAS_FLOATS" "${dst}"
+ CT_KconfigEnableOption "DO_C99_MATH" "${dst}"
;;
esac
if [ "${CT_LIBC_UCLIBC_FENV}" = "y" ]; then
- cat <<-ENDSED
- s/.*(UCLIBC_HAS_FENV).*/\\1=y/
- ENDSED
+ CT_KconfigEnableOption "UCLIBC_HAS_FENV" "${dst}"
fi
# We always want ctor/dtor
- cat <<-ENDSED
- s/^# (UCLIBC_CTOR_DTOR) is not set/\\1=y/
- ENDSED
+ CT_KconfigEnableOption "UCLIBC_CTOR_DTOR" "${dst}"
# Change paths to work with crosstool-NG
- # From http://www.uclibc.org/cgi-bin/viewcvs.cgi?rev=16846&view=rev
- # " we just want the kernel headers, not the whole kernel source ...
- # " so people may need to update their paths slightly
- quoted_kernel_source=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/include/?$,,; s,/,\\/,g;')
- quoted_headers_dir=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/,\\/,g;')
- # CROSS_COMPILER_PREFIX is left as is, as the CROSS_COMPILE parameter is forced on the command line
- # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX, wich is the correct value of ${PREFIX}/${TARGET}
- # Some (old) versions of uClibc use KERNEL_SOURCE (which is _wrong_), and
- # newer versions use KERNEL_HEADERS (which is right).
- cat <<-ENDSED
- s/^DEVEL_PREFIX=".*"/DEVEL_PREFIX="\\/usr\\/"/
- s/^RUNTIME_PREFIX=".*"/RUNTIME_PREFIX="\\/"/
- s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="\\/lib\\/"/
- s/^KERNEL_SOURCE=".*"/KERNEL_SOURCE="${quoted_kernel_source}"/
- s/^KERNEL_HEADERS=".*"/KERNEL_HEADERS="${quoted_headers_dir}"/
- s/^UCLIBC_DOWNLOAD_PREGENERATED_LOCALE=y/\\# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE is not set/
- ENDSED
-
- if [ "${CT_USE_PIPES}" = "y" ]; then
- if grep UCLIBC_EXTRA_CFLAGS extra/Configs/Config.in >/dev/null 2>&1; then
- # Good, there is special provision for such things as -pipe!
- cat <<-ENDSED
- s/^(UCLIBC_EXTRA_CFLAGS=".*)"$/\\1 -pipe"/
- ENDSED
- else
- # Hack our -pipe into WARNINGS, which will be internally incorporated to
- # CFLAGS. This a dirty hack, but yet needed
- cat <<-ENDSED
- s/^(WARNINGS=".*)"$/\\1 -pipe"/
- ENDSED
- fi
- fi
+ #
+ # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX,
+ # which is the correct value of ${PREFIX}/${TARGET}.
+ CT_KconfigSetOption "DEVEL_PREFIX" "\"/usr/\"" "${dst}"
+ CT_KconfigSetOption "RUNTIME_PREFIX" "\"/\"" "${dst}"
+ CT_KconfigSetOption "SHARED_LIB_LOADER_PREFIX" "\"/lib/\"" "${dst}"
+ CT_KconfigSetOption "KERNEL_HEADERS" "\"${CT_HEADERS_DIR}\"" "${dst}"
# Locales support
# Note that the two PREGEN_LOCALE and the XLOCALE lines may be missing
@@ -418,81 +401,74 @@ mungeuClibcConfig() {
# arrangements. Note that having the uClibc Makefile download the
# pregenerated locales is not compatible with crosstool; besides,
# crosstool downloads them as part of getandpatch.sh.
+ CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE" "${dst}"
case "${CT_LIBC_UCLIBC_LOCALES}:${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" in
:*)
;;
y:)
- cat <<-ENDSED
- s/^# UCLIBC_HAS_LOCALE is not set/UCLIBC_HAS_LOCALE=y\\
- # UCLIBC_PREGENERATED_LOCALE_DATA is not set\\
- # UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set\\
- # UCLIBC_HAS_XLOCALE is not set/
- ENDSED
+ CT_KconfigEnableOption "UCLIBC_HAS_LOCALE" "${dst}"
+ CT_KconfigDeleteOption "UCLIBC_PREGENERATED_LOCALE_DATA" "${dst}"
+ CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" \
+ "${dst}"
+ CT_KconfigDeleteOption "UCLIBC_HAS_XLOCALE" "${dst}"
;;
y:y)
- cat <<-ENDSED
- s/^# UCLIBC_HAS_LOCALE is not set/UCLIBC_HAS_LOCALE=y\\
- UCLIBC_PREGENERATED_LOCALE_DATA=y\\
- # UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set\\
- # UCLIBC_HAS_XLOCALE is not set/
- ENDSED
+ CT_KconfigEnableOption "UCLIBC_HAS_LOCALE" "${dst}"
+ CT_KconfigEnableOption "UCLIBC_PREGENERATED_LOCALE_DATA" "${dst}"
+ CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" \
+ "${dst}"
+ CT_KconfigDeleteOption "UCLIBC_HAS_XLOCALE" "${dst}"
;;
esac
# WCHAR support
- if [ "${CT_LIBC_UCLIBC_WCHAR}" = "y" ] ; then
- cat <<-ENDSED
- s/^.*UCLIBC_HAS_WCHAR.*/UCLIBC_HAS_WCHAR=y/
- ENDSED
+ if [ "${CT_LIBC_UCLIBC_WCHAR}" = "y" ]; then
+ CT_KconfigEnableOption "UCLIBC_HAS_WCHAR" "${dst}"
else
- cat <<-ENDSED
- s/^.*UCLIBC_HAS_WCHAR.*/UCLIBC_HAS_WCHAR=n/
- ENDSED
+ CT_KconfigDisableOption "UCLIBC_HAS_WCHAR" "${dst}"
fi
# Force on options needed for C++ if we'll be making a C++ compiler.
# I'm not sure locales are a requirement for doing C++... Are they?
if [ "${CT_CC_LANG_CXX}" = "y" ]; then
- cat <<-ENDSED
- s/^# DO_C99_MATH is not set/DO_C99_MATH=y/
- s/^# UCLIBC_HAS_GNU_GETOPT is not set/UCLIBC_HAS_GNU_GETOPT=y/
- ENDSED
+ CT_KconfigEnableOption "DO_C99_MATH" "${dst}"
+ CT_KconfigEnableOption "UCLIBC_HAS_GNU_GETOPT" "${dst}"
+ fi
+
+ # Stack Smash Protection (SSP)
+ if [ "${CT_CC_GCC_LIBSSP}" = "y" ]; then
+ CT_KconfigEnableOption "UCLIBC_HAS_SSP" "${dst}"
+ CT_KconfigEnableOption "UCLIBC_BUILD_SSP" "${dst}"
+ else
+ CT_KconfigDisableOption "UCLIBC_HAS_SSP" "${dst}"
+ CT_KconfigDisableOption "UCLIBC_BUILD_SSP" "${dst}"
fi
# Push the threading model
case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in
none:)
- cat <<-ENDSED
- s/^UCLIBC_HAS_THREADS=y/# UCLIBC_HAS_THREADS is not set/
- s/^LINUXTHREADS_OLD=y/# LINUXTHREADS_OLD is not set/
- s/^LINUXTHREADS_NEW=y/# LINUXTHREADS_NEW is not set/
- s/^UCLIBC_HAS_THREADS_NATIVE=y/# UCLIBC_HAS_THREADS_NATIVE is not set/
- ENDSED
+ CT_KconfigDisableOption "UCLIBC_HAS_THREADS" "${dst}"
+ CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
+ CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
+ CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
;;
linuxthreads:old)
- cat <<-ENDSED
- s/^# UCLIBC_HAS_THREADS is not set/UCLIBC_HAS_THREADS=y/
- s/^# LINUXTHREADS_OLD is not set/LINUXTHREADS_OLD=y/
- s/^LINUXTHREADS_NEW=y/# LINUXTHREADS_NEW is not set/
- s/^UCLIBC_HAS_THREADS_NATIVE=y/# UCLIBC_HAS_THREADS_NATIVE is not set/
- ENDSED
+ CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
+ CT_KconfigEnableOption "LINUXTHREADS_OLD" "${dst}"
+ CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
+ CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
;;
linuxthreads:new)
- cat <<-ENDSED
- s/^# UCLIBC_HAS_THREADS is not set/UCLIBC_HAS_THREADS=y/
- s/^LINUXTHREADS_OLD=y/# LINUXTHREADS_OLD is not set/
- s/^# LINUXTHREADS_NEW is not set/LINUXTHREADS_NEW=y/
- s/^UCLIBC_HAS_THREADS_NATIVE=y/# UCLIBC_HAS_THREADS_NATIVE is not set/
- ENDSED
+ CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
+ CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
+ CT_KconfigEnableOption "LINUXTHREADS_NEW" "${dst}"
+ CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
;;
nptl:)
- cat <<-ENDSED
- s/^HAS_NO_THREADS=y/# HAS_NO_THREADS is not set/
- s/^UCLIBC_HAS_THREADS=y/# UCLIBC_HAS_THREADS is not set/
- s/^LINUXTHREADS_OLD=y/# LINUXTHREADS_OLD is not set/
- s/^LINUXTHREADS_NEW=y/# LINUXTHREADS_NEW is not set/
- s/^# UCLIBC_HAS_THREADS_NATIVE is not set/UCLIBC_HAS_THREADS_NATIVE=y/
- ENDSED
+ CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
+ CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
+ CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
+ CT_KconfigEnableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
;;
*)
CT_Abort "Incorrect thread settings: CT_THREADS='${CT_THREAD}' CT_LIBC_UCLIBC_LNXTHRD='${CT_LIBC_UCLIBC_LNXTHRD}'"
@@ -500,58 +476,43 @@ mungeuClibcConfig() {
esac
# Always build the libpthread_db
- cat <<-ENDSED
- s/^# PTHREADS_DEBUG_SUPPORT is not set.*/PTHREADS_DEBUG_SUPPORT=y/
- ENDSED
+ CT_KconfigEnableOption "PTHREADS_DEBUG_SUPPORT" "${dst}"
# Force on debug options if asked for
case "${CT_LIBC_UCLIBC_DEBUG_LEVEL}" in
- 0)
- cat <<-ENDSED
- s/^DODEBUG=y/# DODEBUG is not set/
- s/^DODEBUG_PT=y/# DODEBUG_PT is not set/
- s/^DOASSERTS=y/# DOASSERTS is not set/
- s/^SUPPORT_LD_DEBUG=y/# SUPPORT_LD_DEBUG is not set/
- s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/
- s/^UCLIBC_MALLOC_DEBUGGING=y/# UCLIBC_MALLOC_DEBUGGING is not set/
- ENDSED
- ;;
- 1)
- cat <<-ENDSED
- s/^# DODEBUG is not set.*/DODEBUG=y/
- s/^DODEBUG_PT=y/# DODEBUG_PT is not set/
- s/^DOASSERTS=y/# DOASSERTS is not set/
- s/^SUPPORT_LD_DEBUG=y/# SUPPORT_LD_DEBUG is not set/
- s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/
- s/^UCLIBC_MALLOC_DEBUGGING=y/# UCLIBC_MALLOC_DEBUGGING is not set/
- ENDSED
- ;;
- 2)
- cat <<-ENDSED
- s/^# DODEBUG is not set.*/DODEBUG=y/
- s/^DODEBUG_PT=y/# DODEBUG_PT is not set/
- s/^# DOASSERTS is not set.*/DOASSERTS=y/
- s/^# SUPPORT_LD_DEBUG is not set.*/SUPPORT_LD_DEBUG=y/
- s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/
- s/^# UCLIBC_MALLOC_DEBUGGING is not set/UCLIBC_MALLOC_DEBUGGING=y/
- ENDSED
- ;;
- 3)
- cat <<-ENDSED
- s/^# DODEBUG is not set.*/DODEBUG=y/
- s/^# DODEBUG_PT is not set.*/DODEBUG_PT=y/
- s/^# DOASSERTS is not set.*/DOASSERTS=y/
- s/^# SUPPORT_LD_DEBUG is not set.*/SUPPORT_LD_DEBUG=y/
- s/^# SUPPORT_LD_DEBUG_EARLY is not set.*/SUPPORT_LD_DEBUG_EARLY=y/
- s/^# UCLIBC_MALLOC_DEBUGGING is not set/UCLIBC_MALLOC_DEBUGGING=y/
- ENDSED
- ;;
+ 0)
+ CT_KconfigDisableOption "DODEBUG" "${dst}"
+ CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
+ CT_KconfigDisableOption "DOASSERTS" "${dst}"
+ CT_KconfigDisableOption "SUPPORT_LD_DEBUG" "${dst}"
+ CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
+ CT_KconfigDisableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
+ ;;
+ 1)
+ CT_KconfigEnableOption "DODEBUG" "${dst}"
+ CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
+ CT_KconfigDisableOption "DOASSERTS" "${dst}"
+ CT_KconfigDisableOption "SUPPORT_LD_DEBUG" "${dst}"
+ CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
+ CT_KconfigDisableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
+ ;;
+ 2)
+ CT_KconfigEnableOption "DODEBUG" "${dst}"
+ CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
+ CT_KconfigEnableOption "DOASSERTS" "${dst}"
+ CT_KconfigEnableOption "SUPPORT_LD_DEBUG" "${dst}"
+ CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
+ CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
+ ;;
+ 3)
+ CT_KconfigEnableOption "DODEBUG" "${dst}"
+ CT_KconfigEnableOption "DODEBUG_PT" "${dst}"
+ CT_KconfigEnableOption "DOASSERTS" "${dst}"
+ CT_KconfigEnableOption "SUPPORT_LD_DEBUG" "${dst}"
+ CT_KconfigEnableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
+ CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
+ ;;
esac
-
- # And now, this is the end
- ) >>"${munge_file}"
-
- sed -r -f "${munge_file}" "${src_config_file}" >"${dst_config_file}"
}
do_libc_post_cc() {
diff --git a/scripts/functions b/scripts/functions
index 2261b8d..f09df54 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -842,7 +842,7 @@ CT_GetGit() {
local url="${3}"
local _out_cset="${4}"
- local ref=$(echo "${cset_or_ref}" | sed -n 's/^ref=\(.*\)/\1/p')
+ local ref=$(echo "${cset_or_ref}" | ${sed} -n 's/^ref=\(.*\)/\1/p')
if [ -n "$ref" ]; then
local matches=$(git ls-remote --exit-code "$url" --refs "${ref}")
local result=$?
@@ -1428,3 +1428,51 @@ CT_DoLoadState(){
exec >>"${tmp_log_file}"
rm -f "${state_dir}/tail.log"
}
+
+# This function sets a kconfig option to a specific value in a .config file
+# Usage: CT_KconfigSetOption <option> <value> <file>
+CT_KconfigSetOption() {
+ option="$1"
+ value="$2"
+ file="$3"
+
+ ${grep} -E -q "^${option}=.*" "${file}" && \
+ ${sed} -i -r -e "s;^${option}=.*$;${option}=${value};" "${file}" || \
+ ${grep} -E -q "^# ${option} is not set$" "${file}" && \
+ ${sed} -i -r -e "s;^# ${option} is not set$;${option}=${value};" "${file}" || \
+ echo "${option}=${value}" >> "${file}"
+}
+
+# This function enables a kconfig option to '=y' in a .config file
+# Usage: CT_KconfigEnableOption <option> <file>
+CT_KconfigEnableOption() {
+ option="$1"
+ file="$2"
+
+ CT_KconfigSetOption "${option}" "y" "${file}"
+}
+
+# This function disables a kconfig option in a .config file
+# Usage: CT_KconfigDisableOption <option> <file>
+CT_KconfigDisableOption() {
+ option="${1}"
+ file="${2}"
+
+ ${grep} -E -q "^# ${option} is not set$" "${file}" || \
+ ${grep} -E -q "^${option}=.*$" "${file}" && \
+ ${sed} -i -r -e "s;^${option}=.*$;# ${option} is not set;" "${file}" || \
+ echo "# ${option} is not set" >> "${file}"
+}
+
+# This function deletes a kconfig option in a .config file, no matter if it
+# is set or commented out.
+# Usage: CT_KconfigDeleteOption <option> <file>
+CT_KconfigDeleteOption() {
+ option="${1}"
+ file="${2}"
+
+ ${grep} -E -q "^# ${option} is not set$" "${file}" && \
+ ${sed} -i -r -e "/^# ${option} is not set$/d" "${file}" || \
+ ${grep} -E -q "^${option}=.*$" "${file}" && \
+ ${sed} -i -r -e "/^${option}=.*$/d" "${file}" || true
+}