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
This commit is contained in:
Stanislav Sinyagin 2015-08-22 20:22:06 -04:00
parent 8dae8e9c21
commit e78c440585
2 changed files with 5 additions and 3 deletions

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

6
debian/util.sh vendored
View File

@ -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 \