diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/internals.sh | 2 | ||||
| -rw-r--r-- | scripts/build/libc/newlib.sh | 2 | ||||
| -rw-r--r-- | scripts/upgrade.sed | 27 |
3 files changed, 29 insertions, 2 deletions
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index 07029d0..e407de8 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -69,7 +69,7 @@ do_finish() { CT_DoExecLog ALL "${CT_TARGET}-strip" ${strip_args} \ "${CT_TARGET}/debug-root/usr/bin/gdbserver${exe_suffix}" fi - if [ "${CT_CC_gcc}" = "y" ]; then + if [ "${CT_CC_GCC}" = "y" ]; then # TBD GCC 3.x/2.x is no longer supported by ctng # We can not use the version in CT_GCC_VERSION because # of the Linaro stuff. So, harvest the version string diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index ff0f45b..05f9830 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -18,7 +18,7 @@ do_libc_start_files() { CT_DoStep INFO "Installing C library headers & start files" CT_DoExecLog ALL cp -a "${CT_SRC_DIR}/newlib/newlib/libc/include/." \ "${CT_HEADERS_DIR}" - if [ "${CT_ARCH_xtensa}" = "y" ]; then + if [ "${CT_ARCH_XTENSA}" = "y" ]; then CT_DoLog EXTRA "Installing Xtensa headers" CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/newlib/newlib/libc/sys/xtensa/include/." \ "${CT_HEADERS_DIR}" diff --git a/scripts/upgrade.sed b/scripts/upgrade.sed new file mode 100644 index 0000000..2a05192 --- /dev/null +++ b/scripts/upgrade.sed @@ -0,0 +1,27 @@ +# After 1.23.0, generated config options were standardized to upper case +s/\<CT_ARCH_(alpha|arm|avr|m68k|microblaze|mips|msp430|nios2|powerpc|s390|sh|sparc|x86|xtensa)\>/CT_ARCH_\U\1/g +s/\<CT_BINUTILS_binutils\>/CT_BINUTILS_BINUTILS/g +s/\<CT_CC_gcc\>/CT_CC_GCC/g +s/\<CT_COMP_TOOLS_(autoconf|automake|libtool|m4|make)\>/CT_COMP_TOOLS_\U\1/g +s/\<CT_DEBUG_(duma|gdb|ltrace|strace)\>/CT_DEBUG_\U\1/g +s/\<CT_KERNEL_(bare_metal|linux|windows)\>/CT_KERNEL_\U\1/g +s/\<CT_LIBC_(avr_libc|bionic|glibc|mingw|musl|newlib|none|uClibc)\>/CT_LIBC_\U\1/g + +# Also after 1.23.0, package versions were brought to the same format +s/\<CT_LIBC_BIONIC_V_([0-9a-z]+)\>/CT_ANDROID_NDK_V_R\U\1/g +s/\<CT_ANDROID_NDK_V_R15BETA1\>/CT_ANDROID_NDK_V_R15B/g +s/\<CT_LIBC_AVR_LIBC_V_/CT_AVR_LIBC_V_/g +s/\<CT_CC_GCC_V_/CT_GCC_V_/g +s/\<CT_LIBC_GLIBC_V_/CT_GLIBC_V_/g +s/\<CT_KERNEL_V_/CT_LINUX_V_/g +s/\<CT_WINAPI_V_/CT_MINGW_W64_V_V/g +s/\<CT_LIBC_MUSL_V_/CT_MUSL_V_/g +s/\<CT_LIBC_NEWLIB_V_/CT_NEWLIB_V_/g +s/\<CT_LIBC_UCLIBC_NG_V_/CT_UCLIBC_NG_V_/g + +# TBD add some way to ignore fast-changing parts, such as patchlevel in Linux or patchdate in newlib? + +# Special cases that need manual intervention (require setting of supporting options) +s/\<CT_LIBC_UCLIBC_V_.*/# [&] not handled by upgrade script, use menuconfig./w/dev/stderr +s/\<CT_[A-Za-z0-9_]*_SHOW_LINARO.*/# [&] not handled by upgrade script, use menuconfig./w/dev/stderr +s/\<CT_[A-Za-z0-9_]*_CUSTOM_LOCATION.*/# [&] not handled by upgrade script, use menuconfig./w/dev/stderr |