diff options
Diffstat (limited to 'build_tools')
| -rw-r--r-- | build_tools/cflags-devmode.xml | 3 | ||||
| -rwxr-xr-x | build_tools/download_externals | 6 | ||||
| -rwxr-xr-x | build_tools/list_valid_installed_externals | 3 | ||||
| -rwxr-xr-x | build_tools/make_buildopts_h | 19 | ||||
| -rwxr-xr-x | build_tools/make_defaults_h | 2 | ||||
| -rwxr-xr-x | build_tools/make_sample_voicemail | 6 | ||||
| -rwxr-xr-x | build_tools/make_version | 6 | ||||
| -rw-r--r-- | build_tools/menuselect-deps.in | 2 | ||||
| -rwxr-xr-x | build_tools/sha1sum-sh | 1 |
9 files changed, 20 insertions, 28 deletions
diff --git a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml index 0ed9f6780..9943cc798 100644 --- a/build_tools/cflags-devmode.xml +++ b/build_tools/cflags-devmode.xml @@ -15,9 +15,6 @@ <member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging"> <support_level>extended</support_level> </member> - <member name="TRACE_FRAMES" displayname="Trace Frame Allocations"> - <support_level>extended</support_level> - </member> <member name="DO_CRASH" displayname="Crash on fatal errors"> <support_level>extended</support_level> </member> diff --git a/build_tools/download_externals b/build_tools/download_externals index efeb6c53c..f27271fd5 100755 --- a/build_tools/download_externals +++ b/build_tools/download_externals @@ -165,7 +165,7 @@ if [[ -f ${DESTDIR}${ASTMODDIR}/${module_name}.manifest.xml ]] ; then fi fi - cs=$(md5sum ${f} | cut -b1-32) + cs=$(${MD5} ${f} | cut -b1-32) if [[ "${cs}" != "${sum}" ]] ; then echo Checksum mismatch: ${f} need_install=1 @@ -214,7 +214,7 @@ trap "rm -rf ${cache_dir}/${module_dir} ; rm -rf ${tmpdir}" EXIT echo "${full_name}: Installing." if [[ $EUID == 0 ]] ; then - install_params="--group=0 --owner=0" + install_params="-g 0 -o 0" fi names=$(${XMLSTARLET} sel -t -m "//file" -v "@name" -n ${cache_dir}/${module_dir}/manifest.xml) @@ -229,7 +229,7 @@ for name in ${names} ; do mode=0644 fi - ${INSTALL} -Dp ${install_params} --mode=${mode} ${source_path} ${install_path} + ${INSTALL} -Dp ${install_params} -m ${mode} ${source_path} ${install_path} done ${INSTALL} -Dp ${install_params} --mode=0644 ${cache_dir}/${module_dir}/manifest.xml ${DESTDIR}${ASTMODDIR}/${module_name}.manifest.xml diff --git a/build_tools/list_valid_installed_externals b/build_tools/list_valid_installed_externals index c37102208..862447a64 100755 --- a/build_tools/list_valid_installed_externals +++ b/build_tools/list_valid_installed_externals @@ -19,10 +19,7 @@ EOF XMLSTARLET=`getvar XMLSTARLET` ASTMODDIR=`getvar ASTMODDIR` -cache_dir=`getvar EXTERNALS_CACHE_DIR` -DOWNLOAD_TO_STDOUT=`getvar DOWNLOAD_TO_STDOUT` HOST_CPU=`getvar HOST_CPU` -INSTALL=`getvar INSTALL` tmpdir=$(mktemp -d) if [[ -z "${tmpdir}" ]] ; then diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index 900e984e2..c47d5082c 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -5,7 +5,7 @@ MD5=${MD5:-md5sum} cat << END /* - * buildopts.h + * buildopts.h * Automatically generated */ @@ -20,18 +20,19 @@ fi TMP=`${GREP} -e "^MENUSELECT_CFLAGS" menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'` for x in ${TMP}; do echo "#define ${x} 1" - if test "${x}" = "DONT_OPTIMIZE" \ + if test "${x}" = "AO2_DEBUG" \ -o "${x}" = "BETTER_BACKTRACES" \ - -o "${x}" = "LOTS_OF_SPANS" \ -o "${x}" = "BUILD_NATIVE" \ - -o "${x}" = "LOW_MEMORY" \ - -o "${x}" = "REF_DEBUG" \ - -o "${x}" = "AO2_DEBUG" \ - -o "${x}" = "REBUILD_PARSERS" \ - -o "${x}" = "RADIO_RELAX" \ -o "${x}" = "DEBUG_SCHEDULER" \ -o "${x}" = "DETECT_DEADLOCKS" \ - -o "${x}" = "DUMP_SCHEDULER" ; then + -o "${x}" = "DONT_OPTIMIZE" \ + -o "${x}" = "DUMP_SCHEDULER" \ + -o "${x}" = "LOTS_OF_SPANS" \ + -o "${x}" = "LOW_MEMORY" \ + -o "${x}" = "MALLOC_DEBUG" \ + -o "${x}" = "RADIO_RELAX" \ + -o "${x}" = "REBUILD_PARSERS" \ + -o "${x}" = "REF_DEBUG" ; then # These aren't ABI affecting options, keep them out of AST_BUILDOPTS continue fi diff --git a/build_tools/make_defaults_h b/build_tools/make_defaults_h index e6051e5f7..4a9fb5521 100755 --- a/build_tools/make_defaults_h +++ b/build_tools/make_defaults_h @@ -1,7 +1,7 @@ #!/bin/sh cat << END /* - * defaults.h + * defaults.h * Automatically generated from build options, * only used in main/asterisk.c */ diff --git a/build_tools/make_sample_voicemail b/build_tools/make_sample_voicemail index 78062dd70..db0e84774 100755 --- a/build_tools/make_sample_voicemail +++ b/build_tools/make_sample_voicemail @@ -7,16 +7,16 @@ for lang in /en/ /fr/ /es/ [ ! -f "${1}/sounds${lang}vm-isunavail.${format}" ] && continue mkdir -p "${2}/voicemail/default/1234${lang}" - + : > "${2}/voicemail/default/1234${lang}unavail.${format}" - + for file in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail do cat "${1}/sounds${lang}${file}.${format}" >> "${2}/voicemail/default/1234${lang}unavail.${format}" done : > "${2}/voicemail/default/1234${lang}busy.${format}" - + for file in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone do cat "${1}/sounds${lang}${file}.${format}" >> "${2}/voicemail/default/1234${lang}busy.${format}" diff --git a/build_tools/make_version b/build_tools/make_version index 3e0f4a0b0..ce3bf6e13 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -89,13 +89,13 @@ elif [ -d ${1}/.git ]; then if [ -z ${GIT} ]; then GIT="git" fi - + if ! command -v ${GIT} >/dev/null 2>&1; then echo "UNKNOWN__and_probably_unsupported" exit 1 fi - cd ${1} - + cd ${1} + # If the first log commit messages indicates that this is checked into # subversion, we'll just use the SVN- form of the revision. MODIFIED="" diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 259a8358e..e62c183b7 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -34,7 +34,6 @@ LIBEDIT=@PBX_LIBEDIT@ LIBXML2=@PBX_LIBXML2@ XMLSTARLET=@PBX_XMLSTARLET@ BASH=@PBX_BASH@ -LTDL=@PBX_LTDL@ LUA=@PBX_LUA@ MISDN=@PBX_MISDN@ MYSQLCLIENT=@PBX_MYSQLCLIENT@ @@ -44,7 +43,6 @@ NEWT=@PBX_NEWT@ NEON=@PBX_NEON@ NEON29=@PBX_NEON29@ OGG=@PBX_OGG@ -OPENH323=@PBX_OPENH323@ OPUS=@PBX_OPUS@ OPUSFILE=@PBX_OPUSFILE@ OSPTK=@PBX_OSPTK@ diff --git a/build_tools/sha1sum-sh b/build_tools/sha1sum-sh index 33d53f1b5..5fd2a63fb 100755 --- a/build_tools/sha1sum-sh +++ b/build_tools/sha1sum-sh @@ -68,4 +68,3 @@ else exit 1 fi fi - |