From 1f1103143dc5ebd81040f871f3143b37fad85ba9 Mon Sep 17 00:00:00 2001 From: Steven Ayre Date: Thu, 20 Nov 2014 18:40:01 +0000 Subject: [PATCH 1/6] FS-7019 add support for building on ubuntu trusty and utopic --- debian/bootstrap.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index b179f594c0..33adae6095 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -7,7 +7,9 @@ conf_dir="../conf" lang_dir="../conf/vanilla/lang" fs_description="FreeSWITCH is a scalable open source cross-platform telephony platform designed to route and interconnect popular communication protocols using audio, video, text or any other form of media." mod_build_depends="." mod_depends="." mod_recommends="." mod_suggests="." -supported_distros="squeeze wheezy jessie sid" +supported_debian_distros="squeeze wheezy jessie sid" +supported_ubuntu_distros="trusty utopic" +supported_distros=" $supported_debian_distros $supported_ubuntu_distros " avoid_mods=( applications/mod_limit applications/mod_mongo @@ -50,6 +52,10 @@ avoid_mods_squeeze=( formats/mod_vlc languages/mod_managed ) +avoid_mods_trusty=( +) +avoid_mods_utopic=( +) manual_pkgs=( freeswitch-all freeswitch @@ -277,9 +283,11 @@ list_freeswitch_all_dbg_replaces () { print_source_control () { local libtool_dep="libtool, libtool-bin" - if test "$codename" = wheezy || test "$codename" = squeeze; then - libtool_dep="libtool" - fi + case "$codename" in + squeeze|wheezy|trusty) + libtool_dep="libtool" + ;; + esac cat < Date: Wed, 19 Nov 2014 20:28:23 +0000 Subject: [PATCH 2/6] FS-7019 build error on utopic (lber_types.h: No such file or directory) --- debian/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 33adae6095..1502bc9271 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -55,6 +55,7 @@ avoid_mods_squeeze=( avoid_mods_trusty=( ) avoid_mods_utopic=( + directories/mod_ldap ) manual_pkgs=( freeswitch-all From de902011018b09a9382f595f8ddba76423fdd379 Mon Sep 17 00:00:00 2001 From: Steven Ayre Date: Fri, 21 Nov 2014 01:28:38 +0000 Subject: [PATCH 3/6] FS-7019 full list of distributions to target based on distribution autodetection --- debian/util.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/util.sh b/debian/util.sh index a7cb4dc400..3e42ab90e9 100755 --- a/debian/util.sh +++ b/debian/util.sh @@ -385,7 +385,16 @@ build_all () { done shift $(($OPTIND-1)) [ -n "$archs" ] || archs="amd64 i386" - [ -n "$distros" ] || distros="sid jessie wheezy" + if [ -z "$distros" ]; then + case "$(lsb_release -is)" in + Ubuntu) + distros="utopic trusty" + ;; + *) # default to assuming Debian + distros="sid jessie wheezy" + ;; + esac + fi ! $depinst || aptitude install -y \ rsync git less cowbuilder ccache \ devscripts equivs build-essential From a45dca3e0d460780260db7d9d5e9fd8cd40b92df Mon Sep 17 00:00:00 2001 From: Steven Ayre Date: Fri, 21 Nov 2014 01:32:59 +0000 Subject: [PATCH 4/6] FS-7019 add note on how to build on Ubuntu --- debian/README.source | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/README.source b/debian/README.source index f067c0ebe4..b2cd1bb3a9 100644 --- a/debian/README.source +++ b/debian/README.source @@ -72,6 +72,16 @@ will generate packages for all supported Debian releases. Simply run: ./debian/util.sh build-all -ibn -z9 +Building on Ubuntu +------------------ + +Building on supported Ubuntu releases requires the main and universe +APT components in the pbuilder chroot. You should enable the universe +component in your system's APT sources.list and use the -t option to +use your system sources in the chroot: + + ./debian/util.sh build-all -ibn -z9 -t + Building only some modules -------------------------- From a6401813a133d2f08ff9c465f8ae50b3a1dba8a4 Mon Sep 17 00:00:00 2001 From: Steven Ayre Date: Fri, 21 Nov 2014 17:59:56 +0000 Subject: [PATCH 5/6] FS-7019 detect debian explicitly, error on unknown distribution --- debian/util.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/util.sh b/debian/util.sh index 3e42ab90e9..7452be5591 100755 --- a/debian/util.sh +++ b/debian/util.sh @@ -390,9 +390,13 @@ build_all () { Ubuntu) distros="utopic trusty" ;; - *) # default to assuming Debian + Debian) distros="sid jessie wheezy" ;; + *) + echo "Unknown distribution" + exit -1 + ;; esac fi ! $depinst || aptitude install -y \ From 0822f6a0200662bb01576fb3a0ce923acd9596a6 Mon Sep 17 00:00:00 2001 From: Steven Ayre Date: Fri, 21 Nov 2014 18:44:20 +0000 Subject: [PATCH 6/6] FS-7019 swap debian/ubuntu autodetection order --- debian/util.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/util.sh b/debian/util.sh index 7452be5591..f024a8c9c0 100755 --- a/debian/util.sh +++ b/debian/util.sh @@ -387,12 +387,12 @@ build_all () { [ -n "$archs" ] || archs="amd64 i386" if [ -z "$distros" ]; then case "$(lsb_release -is)" in - Ubuntu) - distros="utopic trusty" - ;; Debian) distros="sid jessie wheezy" ;; + Ubuntu) + distros="utopic trusty" + ;; *) echo "Unknown distribution" exit -1