Merge oe-devel@oe-devel.bkbits.net:packages

into null.(none):/data/mtx/oe/packages

2004/12/02 19:05:10+01:00 (none)!br1
added some more licenses to SRC_DISTRIBUTE_LICENSES. replaced as-is licenses with packagename. made packagname licenses lowercase

2004/12/02 18:30:48+01:00 (none)!br1
little nylon updates

2004/12/02 18:29:36+01:00 (none)!br1
added CONFFILES for nylon. once CONFFILES should be used in all oe, the "_nylon" part can be removed

2004/12/02 17:19:19+01:00 (none)!br1
src_distribute: better output when LICENSE is not valid

BKrev: 41af59791fZQQgIzG_GWbh0227Ar0w

28 files changed, 121 insertions, 17 deletions

diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index 6f4bef6546..a48d743e5a 100644
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -159,3 +159,6 @@ RDEPENDS_${PN}-unslung = "nslu2-linksys-ramdisk"
 RPROVIDES_${PN}-unslung = "${PN}"
 
 FILES_${PN}-unslung = ""
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
+
diff --git a/bzip2/bzip2_1.0.2.oe b/bzip2/bzip2_1.0.2.oe
index 9bb6ea9313..cdbba084be 100644
--- a/bzip2/bzip2_1.0.2.oe
+++ b/bzip2/bzip2_1.0.2.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "Very high-quality data compression program."
 SECTION = "console/utils"
 
-LICENSE = "BZIP2"
+LICENSE = "bzip2"
 SRC_URI = "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-${PV}.tar.gz \
 	   file://installpaths.patch;patch=1"
 
diff --git a/chillispot/chillispot_0.98.oe b/chillispot/chillispot_0.98.oe
index 31783d65a5..3e52abd914 100644
--- a/chillispot/chillispot_0.98.oe
+++ b/chillispot/chillispot_0.98.oe
@@ -13,3 +13,5 @@ do_install_append() {
 	install ${S}/doc/chilli.conf ${D}/${sysconfdir}
 	install -m 755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/chillispot
 }
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/chilli.conf"
diff --git a/classes/src_distribute.oeclass b/classes/src_distribute.oeclass
index 8fe329c105..9b10cd6986 100644
--- a/classes/src_distribute.oeclass
+++ b/classes/src_distribute.oeclass
@@ -26,7 +26,7 @@ python do_distribute_sources () {
 		if lvalid != 1:
 			valid = 0
 	if valid == 0:
-		oe.note("Licenses in LICENSE are not all listed in SRC_DISTRIBUTE_LICENSES, skipping source distribution")
+		oe.note("Licenses (%s) are not all listed in SRC_DISTRIBUTE_LICENSES, skipping source distribution" % licenses)
 		return
 	import re
 	for s in (oe.data.getVar('A', d, 1) or "").split():
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index a72e639f64..89c3b332cc 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -30,9 +30,6 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7"
 PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
 PREFERRED_VERSION_binutils = "2.14.90.0.7"
 
-#PREFERRED_VERSION_prism54-module = "1.2"
-PREFERRED_VERSION_unik-olsrd = "0.4.7"
-
 # use meshcub.org mirrors
 CVS_TARBALL_STASH = "http://meshcube.org/nylon/unstable/sources/"
 INHERIT += "nylon-mirrors"
diff --git a/conf/licenses.conf b/conf/licenses.conf
index 247c668943..db3f78e10f 100644
--- a/conf/licenses.conf
+++ b/conf/licenses.conf
@@ -1,2 +1,4 @@
-SRC_DISTRIBUTE_LICENSES = "GPL GPLv2 BSD LGPL Apache-2.0 BZIP2 QPL AFL"
-SRC_DISTRIBUTE_LICENSES += "NTP MIT Sleepycat Classpath"
+SRC_DISTRIBUTE_LICENSES = "GPL GPLv2 BSD LGPL Apache-2.0 QPL AFL"
+SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic"
+SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf"
+
diff --git a/cron/cron_3.0pl1.oe b/cron/cron_3.0pl1.oe
index 9212871d7b..46f2da8b7c 100644
--- a/cron/cron_3.0pl1.oe
+++ b/cron/cron_3.0pl1.oe
@@ -1,6 +1,6 @@
 SECTION = "base"
 DESCRIPTION = "Vixie cron."
-LICENSE = "as-is"
+LICENSE = "cron"
 
 SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \
 	   file://nonrootinstall.patch;patch=1 \
diff --git a/ddclient/ddclient_3.6.3.oe b/ddclient/ddclient_3.6.3.oe
index a038dc5bea..159b1105cd 100644
--- a/ddclient/ddclient_3.6.3.oe
+++ b/ddclient/ddclient_3.6.3.oe
@@ -18,3 +18,5 @@ do_install() {
 	install ${S}/COPY* ${D}/${docdir}/ddclient
 	install ${S}/sample* ${D}/${docdir}/ddclient
 }
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/ddclient.conf"
diff --git a/dhcp-forwarder/dhcp-forwarder_0.6.oe b/dhcp-forwarder/dhcp-forwarder_0.6.oe
index a6a46e508f..56af0cc66a 100644
--- a/dhcp-forwarder/dhcp-forwarder_0.6.oe
+++ b/dhcp-forwarder/dhcp-forwarder_0.6.oe
@@ -21,5 +21,7 @@ INITSCRIPT_PARAMS="defaults"
 do_install_append() {
 	install -d ${D}/${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}/etc/init.d/dhcp-forwarder
-	install -m 0644 ${WORKDIR}/dhcp-fwd.cfg ${D}/etc/
+	install -m 0644 ${WORKDIR}/dhcp-fwd.cfg ${D}/${sysconfdir}
 }
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/dhcp-fwd.cfg"
diff --git a/dhcp/dhcp_3.0.1.oe b/dhcp/dhcp_3.0.1.oe
index 921c5c119d..471164942f 100644
--- a/dhcp/dhcp_3.0.1.oe
+++ b/dhcp/dhcp_3.0.1.oe
@@ -38,3 +38,7 @@ FILES_dhcp-server = "/usr/sbin/dhcpd /etc/init.d/dhcp-server /etc/default/dhcp-s
 FILES_dhcp-relay = "/usr/sbin/dhcrelay /etc/init.d/dhcp-relay /etc/default/dhcp-relay"
 FILES_dhcp-client = "/sbin/ /etc/dhcp/dhclient.conf"
 FILES_dhcp-omshell = "/usr/bin/omshell"
+
+CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf"
+CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay"
+CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf"
diff --git a/dnsmasq/dnsmasq_2.15.oe b/dnsmasq/dnsmasq_2.15.oe
index e911f4d827..bdeff40673 100644
--- a/dnsmasq/dnsmasq_2.15.oe
+++ b/dnsmasq/dnsmasq_2.15.oe
@@ -9,6 +9,11 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${PV}.tar.gz \
 	file://init"
 S = "${WORKDIR}/dnsmasq-${PV}"
 
+inherit update-rc.d
+
+INITSCRIPT_NAME = "dnsmasq"
+INITSCRIPT_PARAMS = "defaults"
+
 do_install () {
 	oe_runmake "PREFIX=${D}/${prefix}" \
 		   "BINDIR=${D}/${bindir}" \
@@ -18,3 +23,5 @@ do_install () {
 	install -m 0755 ${S}/dnsmasq.conf.example ${D}/${sysconfdir}/dnsmasq.conf
 	install -m 755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/dnsmasq
 }
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/dnsmasq.conf"
diff --git a/ifplugd/ifplugd_0.25.oe b/ifplugd/ifplugd_0.25.oe
index ed6274d4d5..192520822a 100644
--- a/ifplugd/ifplugd_0.25.oe
+++ b/ifplugd/ifplugd_0.25.oe
@@ -11,4 +11,6 @@ inherit autotools update-rc.d pkgconfig
 EXTRA_OECONF = "--disable-lynx"
 
 INITSCRIPT_NAME = "ifplugd"
-INITSCRIPT_PARAMS = "defaults"
\ No newline at end of file
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/ifplugd/ifplugd.conf"
diff --git a/kismet/kismet_2004-04-R1.oe b/kismet/kismet_2004-04-R1.oe
index c8511216aa..75ef7f484f 100644
--- a/kismet/kismet_2004-04-R1.oe
+++ b/kismet/kismet_2004-04-R1.oe
@@ -30,3 +30,5 @@ do_install_append() {
 
 PACKAGES =+ "kismet-sounds"
 FILES_kismet-sounds = "/usr/share/kismet/wav"
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf"
diff --git a/libpng/libpng_1.2.7.oe b/libpng/libpng_1.2.7.oe
index 2da15b60cf..06c69dfcdb 100644
--- a/libpng/libpng_1.2.7.oe
+++ b/libpng/libpng_1.2.7.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "PNG Library"
 HOMEPAGE = "http://www.libpng.org/"
-LICENSE = "as-is"
+LICENSE = "libpng"
 SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
diff --git a/maradns/maradns_1.0.23.oe b/maradns/maradns_1.0.23.oe
index d977bcfa1c..cf87aa0e77 100644
--- a/maradns/maradns_1.0.23.oe
+++ b/maradns/maradns_1.0.23.oe
@@ -32,7 +32,7 @@ do_install() {
                 MAN8=${D}/usr/share/man/man8 \
                 install
 	
-	mv ${D}/${sysconfdir}/mararc/example_mararc ${D}/${sysconfdir}/maradns
+	mv ${D}/${sysconfdir}/mararc/example_mararc ${D}/${sysconfdir}/maradns/mararc
 	rm -r ${D}/${sysconfdir}/mararc/
 	install -m 755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/maradns
 }
@@ -40,3 +40,5 @@ do_install() {
 PACKAGES = "maradns-zone maradns-ask maradns maradns-doc"
 FILES_maradns-zone = "${sbindir}/zoneserver ${bindir}/getzone"
 FILES_maradns-ask = "${bindir}/askmara"
+
+CONFFILES_${PN}_nylon = "/etc/maradns/mararc"
diff --git a/meta/nylon-feed.oe b/meta/nylon-feed.oe
index b9d63754fd..5e61cc0827 100644
--- a/meta/nylon-feed.oe
+++ b/meta/nylon-feed.oe
@@ -55,6 +55,7 @@ openvpn \
 openswan \
 perl \
 ppp \
+ppp-dsl \
 rp-pppoe \
 rrdtool \
 prism2-firmware-update \
diff --git a/mobilemesh/mobilemesh_1.2.oe b/mobilemesh/mobilemesh_1.2.oe
index 36e1164512..b0f57bbfef 100644
--- a/mobilemesh/mobilemesh_1.2.oe
+++ b/mobilemesh/mobilemesh_1.2.oe
@@ -33,3 +33,5 @@ do_install() {
 	install ${S}/doc/README ${D}/${docdir}
 	install ${S}/mobilemesh.init ${D}/${sysconfdir}/init.d/mobilemesh
 }
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/mobilemesh/mmrp.conf ${sysconfdir}/mobilemesh/mmdiscover.conf"
diff --git a/net-snmp/net-snmp_5.1.2.oe b/net-snmp/net-snmp_5.1.2.oe
index 0a17e4b37e..1ee66edda5 100644
--- a/net-snmp/net-snmp_5.1.2.oe
+++ b/net-snmp/net-snmp_5.1.2.oe
@@ -51,4 +51,6 @@ else
 	/etc/init.d/snmpd stop
 fi
 update-rc.d $D snmpd remove
-}
\ No newline at end of file
+}
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/snmp/snmpd.conf ${sysconfdir}/snmp/snmptrapd.conf"
diff --git a/netbase/netbase_4.19.oe b/netbase/netbase_4.19.oe
index b13138ec0b..622f9a5fd8 100644
--- a/netbase/netbase_4.19.oe
+++ b/netbase/netbase_4.19.oe
@@ -33,3 +33,5 @@ do_install () {
 	install -m 0644 update-inetd.8 ${D}/${mandir}/man8/
 	install -m 0644 ${WORKDIR}/interfaces ${D}/${sysconfdir}/network/interfaces
 }
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
diff --git a/openssh/openssh_3.8p1.oe b/openssh/openssh_3.8p1.oe
index 31d990b406..3c9bc8c20a 100644
--- a/openssh/openssh_3.8p1.oe
+++ b/openssh/openssh_3.8p1.oe
@@ -79,3 +79,6 @@ else
 	update-rc.d -f sshd remove
 fi
 }
+
+CONFFILES_openssh-sshd_nylon = "${sysconfdir}/ssh/sshd_config"
+CONFFILES_openssh-ssh_nylon = "${sysconfdir}/ssh/ssh_config"
diff --git a/openswan/openswan_2.2.0.oe b/openswan/openswan_2.2.0.oe
index 03b8f6bf84..63c3903403 100644
--- a/openswan/openswan_2.2.0.oe
+++ b/openswan/openswan_2.2.0.oe
@@ -26,3 +26,5 @@ do_install () {
 }
 
 FILES_${PN} += "/usr/lib/ipsec/"
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/ipsec/ipsec.conf"
diff --git a/ppp-dsl/ppp-dsl_0.1.oe b/ppp-dsl/ppp-dsl_0.1.oe
index e69de29bb2..938b9ec963 100644
--- a/ppp-dsl/ppp-dsl_0.1.oe
+++ b/ppp-dsl/ppp-dsl_0.1.oe
@@ -0,0 +1,28 @@
+SECTION = "console/network"
+DESCRIPTION = "Enables PPP dial-in through a DSL connection"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "PD"
+DEPENDS = "ppp rp-pppoe"
+RDEPENDS = "ppp rp-pppoe kernel-module-ppp-async kernel-module-ppp-generic kernel-module-slhc"
+PR = "r1"
+
+SRC_URI = "file://dsl-provider \
+	file://ppp_on_boot.dsl"
+
+do_install() {
+	install -d ${D}/${sysconfdir}/ppp/peers
+	install -m 0644 ${WORKDIR}/dsl-provider ${D}/${sysconfdir}/ppp/peers/
+	install -m 0755 ${WORKDIR}/ppp_on_boot.dsl ${D}/${sysconfdir}/ppp/
+}
+
+pkg_postinst() {
+if test "x$D" != "x"; then
+	exit 1
+else
+	if ! test -e ${sysconfdir}/ppp/ppp_on_boot; then
+		ln -s ppp_on_boot.dsl ${sysconfdir}/ppp/ppp_on_boot
+	fi
+fi
+}
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/ppp/peers/dsl-provider"
diff --git a/ppp/ppp_2.4.1.oe b/ppp/ppp_2.4.1.oe
index ece8c8c5dd..002e56ba6e 100644
--- a/ppp/ppp_2.4.1.oe
+++ b/ppp/ppp_2.4.1.oe
@@ -28,3 +28,5 @@ do_install_append () {
 	install -d ${D}${sysconfdir}/ppp/ip-up.d/
 	install -d ${D}${sysconfdir}/ppp/ip-down.d/
 }
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets"
diff --git a/shorewall/shorewall_2.0.9.oe b/shorewall/shorewall_2.0.9.oe
index 0edc5ce59c..1767e9340f 100644
--- a/shorewall/shorewall_2.0.9.oe
+++ b/shorewall/shorewall_2.0.9.oe
@@ -15,3 +15,31 @@ do_install() {
 	export PREFIX=${D}
 	${S}/install.sh
 }
+
+CONFFILES_${PN}_nylon = "\
+${sysconfdir}/shorewall/accounting \
+${sysconfdir}/shorewall/actions \
+${sysconfdir}/shorewall/blacklist \
+${sysconfdir}/shorewall/ecn \
+${sysconfdir}/shorewall/hosts \
+${sysconfdir}/shorewall/init \
+${sysconfdir}/shorewall/initdone \
+${sysconfdir}/shorewall/interfaces \
+${sysconfdir}/shorewall/maclist \
+${sysconfdir}/shorewall/masq \
+${sysconfdir}/shorewall/modules \
+${sysconfdir}/shorewall/nat \
+${sysconfdir}/shorewall/netmap \
+${sysconfdir}/shorewall/params \
+${sysconfdir}/shorewall/policy \
+${sysconfdir}/shorewall/proxyarp \
+${sysconfdir}/shorewall/routestopped \
+${sysconfdir}/shorewall/rules \
+${sysconfdir}/shorewall/shorewall.conf \
+${sysconfdir}/shorewall/start \
+${sysconfdir}/shorewall/stop \
+${sysconfdir}/shorewall/stopped \
+${sysconfdir}/shorewall/tcrules \
+${sysconfdir}/shorewall/tos \
+${sysconfdir}/shorewall/tunnels \
+${sysconfdir}/shorewall/zones"
diff --git a/unik-olsrd/files/olsrd.conf b/unik-olsrd/files/olsrd.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/unik-olsrd/files/olsrd.conf
diff --git a/unik-olsrd/unik-olsrd_cvs.oe b/unik-olsrd/unik-olsrd_cvs.oe
index d799aa82fc..bbe93001ce 100644
--- a/unik-olsrd/unik-olsrd_cvs.oe
+++ b/unik-olsrd/unik-olsrd_cvs.oe
@@ -8,21 +8,28 @@ LICENSE = "BSD"
 PV = "cvs${CVSDATE}"
 
 SRC_URI="cvs://anonymous@cvs.sourceforge.net/cvsroot/olsrd;module=olsrd-current \
-	file://unik-olsrd"
+	file://unik-olsrd \
+	file://olsrd.conf"
 
 PACKAGES =+ "unik-olsrd-libs"
 FILES_unik-olsrd-libs = "${libdir}"
 
 S = "${WORKDIR}/olsrd-current"
 
+inherit update-rc.d
+
+INITSCRIPT_NAME = "unik-olsrd"
+INITSCRIPT_PARAMS = "defaults"
+
 do_compile() {
 	oe_runmake OS=linux clean all libs
 }
 
 do_install () {
 	oe_runmake INSTALL_PREFIX=${D} install install_libs
-	install -d ${D}/etc/init.d
+	install -d ${D}/${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/unik-olsrd ${D}/${sysconfdir}/init.d
+	install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir}
 }
 
-CONFFILES_${PN} = "/etc/olsrd.conf"
+CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
diff --git a/vtun/vtun_2.6.oe b/vtun/vtun_2.6.oe
index 7a8d5f0e2b..f464e51afc 100644
--- a/vtun/vtun_2.6.oe
+++ b/vtun/vtun_2.6.oe
@@ -25,3 +25,5 @@ do_install() {
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vtund
 	install ${S}/scripts/vtund-start.conf ${D}${sysconfdir}
 }
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/vtund-start.conf"
diff --git a/zlib/zlib_1.2.2.oe b/zlib/zlib_1.2.2.oe
index 3c63a22066..03ec866b46 100644
--- a/zlib/zlib_1.2.2.oe
+++ b/zlib/zlib_1.2.2.oe
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://www.gzip.org/zlib/"
-LICENSE = "ZLIB"
+LICENSE = "zlib"
 
 SRC_URI = "http://www.libpng.org/pub/png/src/zlib-${PV}.tar.gz"
 S = "${WORKDIR}/zlib-${PV}"