summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2015-07-26 10:46:38 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-07-26 10:48:45 +0200
commit23fc523877c7b987b6f89f78ead3db23d99fd28c (patch)
treeb6bc69cbeb2534120c2ddc3df92ba411f83c92f5 /package
parent19e584c5c6f2a98c172596801ef09f85ed29fe5a (diff)
package/asterisk: fix and improve downgrade to version 1.8
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'package')
-rw-r--r--package/asterisk/Makefile5
-rw-r--r--package/asterisk/files/asterisk.init8
2 files changed, 7 insertions, 6 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index f3998e3f3..f043bdaf3 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= c16f288f97ac39042eb8e9bee6766aff
PKG_DESCR:= open source pbx
PKG_SECTION:= net/voip
PKG_DEPENDS:= libncurses libpthread libopenssl libcurl libstdcxx
-PKG_BUILDDEP:= ncurses openssl zlib curl popt gtk+
+PKG_BUILDDEP:= ncurses openssl zlib curl popt
PKG_URL:= http://www.asterisk.org/
PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_NOPARALLEL:= 1
@@ -175,7 +175,8 @@ do-install:
rm -f gtalk.conf ; \
rm -f skinny.conf ; \
rm -f dundi.conf ; \
- $(SED) '#^astdatadir = /var/#/usr/#' asterisk.conf ; \
+ $(SED) '/^astdatadir /s#/var/#/usr/#' asterisk.conf ; \
+ $(SED) '/^\[directories\]/s/(!)//' asterisk.conf ; \
)
${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \
diff --git a/package/asterisk/files/asterisk.init b/package/asterisk/files/asterisk.init
index d43c5defe..9dfbed4a1 100644
--- a/package/asterisk/files/asterisk.init
+++ b/package/asterisk/files/asterisk.init
@@ -11,10 +11,10 @@ autostart)
exec sh $0 start
;;
start)
- [ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk
- [ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
- [ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
- /usr/sbin/asterisk
+ for dir in run log spool lib; do
+ [ -d /var/$dir/asterisk ] || mkdir -p /var/$dir/asterisk
+ done
+ /usr/sbin/asterisk
;;
stop)
[ -f /var/run/asterisk/asterisk.pid ] && \