Merge pull request #422 in FS/freeswitch from ~SSINYAGIN/freeswitch:bugfix/FS-8019-debian-util.sh-ignores-t-option to master

* commit 'e45837198c702f3a78b90493176b94d31d3500d0':
  debian/README.source updated
  debian/bootstrap.sh: excluded few modules that fail to compile
  FS-8019 debian/util.sh ignored -T option
This commit is contained in:
William King 2015-08-24 11:19:39 -05:00
commit 51a3ec7cbc
4 changed files with 14 additions and 6 deletions

View File

@ -67,10 +67,12 @@ If you want actualy Debian binary or source packages to upload to your
own repository, you'll need to build them as described here. We have own repository, you'll need to build them as described here. We have
some fancy automatic tools to accomplish this. The tools allow you to some fancy automatic tools to accomplish this. The tools allow you to
start from a very bare Debian image and generate working packages. start from a very bare Debian image and generate working packages.
Building in this manner is only supported on Debian sid, though it Building in this manner is only supported on Debian jessie, though it
will generate packages for all supported Debian releases. Simply run: will generate packages for all supported Debian releases. Simply run as root:
./debian/util.sh build-all -ibn -z9 echo "USENETWORK=yes" >$HOME/.pbuilderrc
./debian/util.sh build-all -ibn -z9 -aamd64 -cjessie
Building on Ubuntu Building on Ubuntu
------------------ ------------------

2
debian/apt_sources.list vendored Normal file
View File

@ -0,0 +1,2 @@
deb http://httpredir.debian.org/debian jessie main
deb http://files.freeswitch.org/repo/deb/debian/ jessie main

4
debian/bootstrap.sh vendored
View File

@ -14,6 +14,7 @@ avoid_mods=(
applications/mod_limit applications/mod_limit
applications/mod_mongo applications/mod_mongo
applications/mod_mp4 applications/mod_mp4
applications/mod_mp4v2
applications/mod_osp applications/mod_osp
applications/mod_rad_auth applications/mod_rad_auth
applications/mod_skel applications/mod_skel
@ -21,6 +22,7 @@ avoid_mods=(
asr_tts/mod_cepstral asr_tts/mod_cepstral
codecs/mod_com_g729 codecs/mod_com_g729
codecs/mod_ilbc codecs/mod_ilbc
codecs/mod_openh264
codecs/mod_siren codecs/mod_siren
codecs/mod_skel_codec codecs/mod_skel_codec
endpoints/mod_gsmopen endpoints/mod_gsmopen
@ -29,6 +31,8 @@ avoid_mods=(
endpoints/mod_opal endpoints/mod_opal
endpoints/mod_reference endpoints/mod_reference
endpoints/mod_unicall endpoints/mod_unicall
event_handlers/mod_smpp
formats/mod_webm
sdk/autotools sdk/autotools
xml_int/mod_xml_ldap xml_int/mod_xml_ldap
xml_int/mod_xml_radius xml_int/mod_xml_radius

6
debian/util.sh vendored
View File

@ -276,7 +276,7 @@ build_debs () {
set -e set -e
local OPTIND OPTARG debug_hook=false hookdir="" cow_build_opts="" local OPTIND OPTARG debug_hook=false hookdir="" cow_build_opts=""
local keep_pbuilder_config=false keyring="" custom_keyring="" local keep_pbuilder_config=false keyring="" custom_keyring=""
local use_system_sources=false local use_custom_sources=false
while getopts 'BbdK:kT:t' o "$@"; do while getopts 'BbdK:kT:t' o "$@"; do
case "$o" in case "$o" in
B) cow_build_opts="--debbuildopts '-B'";; B) cow_build_opts="--debbuildopts '-B'";;
@ -284,7 +284,7 @@ build_debs () {
d) debug_hook=true;; d) debug_hook=true;;
k) keep_pbuilder_config=true;; k) keep_pbuilder_config=true;;
K) custom_keyring="$OPTARG";; K) custom_keyring="$OPTARG";;
t) use_system_sources=true; custom_sources_file="/etc/apt/sources.list";; t) use_custom_sources=true; custom_sources_file="/etc/apt/sources.list";;
T) use_custom_sources=true; custom_sources_file="$OPTARG";; T) use_custom_sources=true; custom_sources_file="$OPTARG";;
esac esac
done done
@ -308,7 +308,7 @@ build_debs () {
apt-key exportall > "$keyring" apt-key exportall > "$keyring"
fi fi
cow () { cow () {
if ! $use_system_sources; then if ! $use_custom_sources; then
cowbuilder "$@" \ cowbuilder "$@" \
--distribution $distro \ --distribution $distro \
--architecture $arch \ --architecture $arch \