[oe-commits] org.oe.dreambox enigma-modem, ppp: use our pap-secrets, options on dm600pvr, dm7020

[tmbinc commit]

enigma-modem,ppp: use our pap-secrets, options on dm600pvr,dm7020

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: c14ef12cacf330115952b2e1f5e1201ce81725e3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c14ef12cacf330115952b2e1f5e1201ce81725e3
Files:
1
packages/enigma/enigma-modem.bb
packages/ppp/ppp_2.4.3.bb
Diffs:

#
# mt diff -r2f127456f669ffd0a44ba2e1a9927a87387b217c -rc14ef12cacf330115952b2e1f5e1201ce81725e3
#
# 
# 
# patch "packages/enigma/enigma-modem.bb"
#  from [9528ac430200bb276f0a932544f0d525e3dcfe4b]
#    to [3cc767cda8127b4ecee425040fa406776dfa5584]
# 
# patch "packages/ppp/ppp_2.4.3.bb"
#  from [7f84ccdc3eeb261cbc1edd5d9133517b69804a5f]
#    to [9551730e528355435229dd391aa3f37d270344c9]
# 
============================================================
--- packages/enigma/enigma-modem.bb	9528ac430200bb276f0a932544f0d525e3dcfe4b
+++ packages/enigma/enigma-modem.bb	3cc767cda8127b4ecee425040fa406776dfa5584
@@ -7,7 +7,7 @@ PN = "enigma-modem"
 
 PV = "0.1"
 PN = "enigma-modem"
-PR = "r1"
+PR = "r2"
 
 PACKAGES = "enigma-modem"
 
@@ -17,6 +17,8 @@ FILES_${PN} = "/usr/lib/tuxbox/plugins/e
 
 FILES_${PN} = "/usr/lib/tuxbox/plugins/enigma_modem.so \
 		/usr/lib/tuxbox/plugins/enigma_modem.cfg \
+		/etc/ppp/options \
+		/etc/ppp/pap-secrets \
 		/etc/ppp/dial.modem \
 		/etc/ppp/disconnect.modem \
 		/etc/ppp/ip-up.d/01peerdns /etc/ppp/ip-down.d/01peerdns-remove"
============================================================
--- packages/ppp/ppp_2.4.3.bb	7f84ccdc3eeb261cbc1edd5d9133517b69804a5f
+++ packages/ppp/ppp_2.4.3.bb	9551730e528355435229dd391aa3f37d270344c9
@@ -1,9 +1,9 @@ LICENSE = "BSD GPLv2"
 SECTION = "console/network"
 DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
 HOMEPAGE = "http://samba.org/ppp/"
 DEPENDS = "libpcap"
 LICENSE = "BSD GPLv2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
 	file://makefile.patch;patch=1 \
@@ -40,9 +40,16 @@ do_install_append () {
 	install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/
 	install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/
 	rm -rf ${D}/${mandir}/man8/man8
+	if [ ${MACHINE} = "dm600pvr" -o ${MACHINE} = "dm7020" ]; then
+		for i in pap-secrets options; do
+			rm ${D}/etc/ppp/$i
+		done
+	fi
 }
 
 CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
+CONFFILES_${PN}_dm600pvr = "${sysconfdir}/ppp/chap-secrets"
+CONFFILES_${PN}_dm7020 = "${sysconfdir}/ppp/chap-secrets"
 PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
 FILES_${PN}        = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
 FILES_ppp-oa       = "/usr/lib/pppd/2.4.3/pppoatm.so"