[oe-commits] org.oe.dev asterisk 1.4.7: try to make conform a bit more to the styleguide

[koen commit]

asterisk 1.4.7: try to make conform a bit more to the styleguide

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 7b2cd7562deac3470e8eb8f7adddf936e30d719a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7b2cd7562deac3470e8eb8f7adddf936e30d719a
Files:
1
packages/asterisk/asterisk_1.4.7.bb
Diffs:

#
# mt diff -r19c86f8f5cc6ac94cad2c014f627991d26d7427a -r7b2cd7562deac3470e8eb8f7adddf936e30d719a
#
# 
# 
# patch "packages/asterisk/asterisk_1.4.7.bb"
#  from [f20473b5ad218d937c839ecb75001b612644f4d8]
#    to [36d84a0fd7f485ff0d23cfde00b1419c931a5d1a]
# 
============================================================
--- packages/asterisk/asterisk_1.4.7.bb	f20473b5ad218d937c839ecb75001b612644f4d8
+++ packages/asterisk/asterisk_1.4.7.bb	36d84a0fd7f485ff0d23cfde00b1419c931a5d1a
@@ -1,12 +1,11 @@ DEPENDS = "ncurses readline zlib openssl
 DESCRIPTION = "The Asterisk open source software PBX"
 HOMEPAGE = "http://www.asterisk.org"
 SECTION = "voip"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
 DEPENDS = "ncurses readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
-CONFLICTS = "asterisk"
-RRECOMMENDS = "logrotate"
-PR = "r0"
+RRECOMMENDS_${PN} = "logrotate"
+
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
@@ -16,14 +15,13 @@ SRC_URI="http://ftp.digium.com/pub/aster
 	file://volatiles \
 	file://init"
 
-S = "${WORKDIR}/asterisk-${PV}"
 
 INITSCRIPT_NAME = "asterisk"
 INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-export EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${HOST_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${HOST_SYS}\
 			--with-z=${STAGING_DIR}/${HOST_SYS}\
 			--with-curl=${STAGING_DIR}/${HOST_SYS}\
 			--with-termcap=${STAGING_DIR}/${HOST_SYS}\
@@ -65,8 +63,6 @@ do_configure () {
 	oe_runconf
 }
 
-FILES_${PN} += "${libdir}/asterisk/modules/*"
-
 do_install_append() {
 	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk
 	install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk
@@ -79,6 +75,7 @@ pkg_postinst_prepend() {
 	chown -R asterisk:asterisk ${libdir}/asterisk ${localstatedir}/lib/asterisk ${localstatedir}/spool/asterisk ${localstatedir}/log/asterisk ${localstatedir}/run/asterisk ${sysconfdir}/asterisk
 }
 
+FILES_${PN} += "${libdir}/asterisk/modules/*"
 
 CONFFILES_${PN} += "${sysconfdir}/asterisk/adsi.conf"
 CONFFILES_${PN} += "${sysconfdir}/asterisk/adtranvofr.conf"