From e78c440585b6cd1c00dad7e5bf3be35b1eb2c7eb Mon Sep 17 00:00:00 2001 From: Stanislav Sinyagin Date: Sat, 22 Aug 2015 20:22:06 -0400 Subject: [PATCH 1/3] FS-8019 debian/util.sh ignored -T option Fixed the handling of -T and -t, and added debian/apt_sources.list that needs to build 1.7 master. The following commands need to be used to build Jessie packages: apt-get update && apt-get install -y git curl mkdir -p /usr/src/freeswitch cd /usr/src/freeswitch/ git clone https://stash.freeswitch.org/scm/fs/freeswitch.git /usr/src/freeswitch/src curl http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - cd /usr/src/freeswitch/src ./debian/util.sh build-all -i -z1 -aamd64 -cjessie -T /usr/src/freeswitch/src/debian/apt_sources.list --- debian/apt_sources.list | 2 ++ debian/util.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 debian/apt_sources.list diff --git a/debian/apt_sources.list b/debian/apt_sources.list new file mode 100644 index 0000000000..857524c9c5 --- /dev/null +++ b/debian/apt_sources.list @@ -0,0 +1,2 @@ +deb http://httpredir.debian.org/debian jessie main +deb http://files.freeswitch.org/repo/deb/debian/ jessie main diff --git a/debian/util.sh b/debian/util.sh index efeb071a3b..0200409300 100755 --- a/debian/util.sh +++ b/debian/util.sh @@ -276,7 +276,7 @@ build_debs () { set -e local OPTIND OPTARG debug_hook=false hookdir="" cow_build_opts="" 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 case "$o" in B) cow_build_opts="--debbuildopts '-B'";; @@ -284,7 +284,7 @@ build_debs () { d) debug_hook=true;; k) keep_pbuilder_config=true;; 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";; esac done @@ -308,7 +308,7 @@ build_debs () { apt-key exportall > "$keyring" fi cow () { - if ! $use_system_sources; then + if ! $use_custom_sources; then cowbuilder "$@" \ --distribution $distro \ --architecture $arch \ From a083b881f304a13b7cd9aa075b96f461abf3735f Mon Sep 17 00:00:00 2001 From: Stanislav Sinyagin Date: Mon, 24 Aug 2015 08:52:44 -0400 Subject: [PATCH 2/3] debian/bootstrap.sh: excluded few modules that fail to compile applications/mod_mp4v2 codecs/mod_openh264 event_handlers/mod_smpp formats/mod_webm --- debian/bootstrap.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 12c8f4b435..df94f3dffa 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -14,6 +14,7 @@ avoid_mods=( applications/mod_limit applications/mod_mongo applications/mod_mp4 + applications/mod_mp4v2 applications/mod_osp applications/mod_rad_auth applications/mod_skel @@ -21,6 +22,7 @@ avoid_mods=( asr_tts/mod_cepstral codecs/mod_com_g729 codecs/mod_ilbc + codecs/mod_openh264 codecs/mod_siren codecs/mod_skel_codec endpoints/mod_gsmopen @@ -29,6 +31,8 @@ avoid_mods=( endpoints/mod_opal endpoints/mod_reference endpoints/mod_unicall + event_handlers/mod_smpp + formats/mod_webm sdk/autotools xml_int/mod_xml_ldap xml_int/mod_xml_radius From e45837198c702f3a78b90493176b94d31d3500d0 Mon Sep 17 00:00:00 2001 From: Stanislav Sinyagin Date: Mon, 24 Aug 2015 10:27:23 -0400 Subject: [PATCH 3/3] debian/README.source updated In Jessie, pbuilder disables the network by default, and we need it to build our packages. Also currently only Jessie debs are built successfully, and building for wheezy fails because of missing video libraries. --- debian/README.source | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/README.source b/debian/README.source index 3031449844..945f15125f 100644 --- a/debian/README.source +++ b/debian/README.source @@ -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 some fancy automatic tools to accomplish this. The tools allow you to start from a very bare Debian image and generate working packages. -Building in this manner is only supported on Debian sid, though it -will generate packages for all supported Debian releases. Simply run: +Building in this manner is only supported on Debian jessie, though it +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 ------------------