Merge bk://openembedded@openembedded.bkbits.net/packages

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

2004/10/19 12:35:10+02:00 (none)!br1
nylon and mtx-1 updates

2004/10/19 12:33:19+02:00 (none)!br1
prism54: fixed firmware path, updated dependencies

2004/10/19 12:31:39+02:00 (none)!br1
dnsmasq: add init script

BKrev: 4174eebdzmnIpmOU7hQenuCUYspTYw

8 files changed, 20 insertions, 15 deletions

diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf
index 7ec6409f8b..391174733a 100644
--- a/conf/machine/mtx-1.conf
+++ b/conf/machine/mtx-1.conf
@@ -17,4 +17,4 @@ USE_DEVFS = "1"
 USE_VT = "0"
 SERIAL_CONSOLE = "115200 tts/0 vt100"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usb-storage kernel-module-scsi-mod kernel-module-sd-mod kernel-module-usbnet kernel-module-mii"
\ No newline at end of file
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usb-storage kernel-module-scsi-mod kernel-module-sd-mod kernel-module-fat kernel-module-vfat kernel-module-usbnet kernel-module-mii"
\ No newline at end of file
diff --git a/dnsmasq/dnsmasq_2.15.oe b/dnsmasq/dnsmasq_2.15.oe
index 91e5725505..b9c2a81884 100644
--- a/dnsmasq/dnsmasq_2.15.oe
+++ b/dnsmasq/dnsmasq_2.15.oe
@@ -2,8 +2,10 @@ SECTION = "console/network"
 DESCRIPTION = "Dnsmasq is a lightweight, easy to configure \
 DNS forwarder and DHCP server."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PR = "r1"
 
-SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${PV}.tar.gz"
+SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${PV}.tar.gz \
+	file://init"
 S = "${WORKDIR}/dnsmasq-${PV}"
 
 do_install () {
@@ -11,6 +13,7 @@ do_install () {
 		   "BINDIR=${D}/${bindir}" \
 		   "MANDIR=${D}/${mandir}" \
 		   install
-	install -d ${D}/etc/
-	install -m 0755 ${S}/dnsmasq.conf.example ${D}/etc/dnsmasq.conf
+	install -d ${D}/${sysconfdir}/ ${D}/${sysconfdir}/init.d
+	install -m 0755 ${S}/dnsmasq.conf.example ${D}/${sysconfdir}/dnsmasq.conf
+	install -m 755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/dnsmasq
 }
diff --git a/dnsmasq/files/init b/dnsmasq/files/init
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/dnsmasq/files/init
diff --git a/linux/linux-mtx-1_2.4.24.oe b/linux/linux-mtx-1_2.4.24.oe
index 14148393e8..cfaa3012f9 100644
--- a/linux/linux-mtx-1_2.4.24.oe
+++ b/linux/linux-mtx-1_2.4.24.oe
@@ -26,9 +26,9 @@ pkg_postinst_kernel() {
 if test "x$D" != "x"; then
 	exit 1
 else
-	if test -e /tmp/zImage.flash.bin-${KV}; then
+	if test -e /tmp/zImage.flash-${KV}; then
 		echo "*** flashing kernel ***"
-		flashcp -v /tmp/zImage.flash.bin-${KV} /dev/mtd/2
+		flashcp -v /tmp/zImage.flash-${KV} /dev/mtd/2
 		echo "*** done. please reboot ***"
 	fi
 fi
diff --git a/meta/nylon-feed.oe b/meta/nylon-feed.oe
index 398bef60a9..925a0a55c4 100644
--- a/meta/nylon-feed.oe
+++ b/meta/nylon-feed.oe
@@ -58,6 +58,7 @@ stunnel \
 sysvinit \
 tcpdump \
 tinc \
+timezones \
 unik-olsrd \
 vtun \
 wireless-tools \
@@ -71,13 +72,13 @@ zlib \
 # gdb-cross: install paths, sdk?
 # screen: sgttyb?
 # nocat
-# ppp init scipts
-# zoneinfo? timezones /etc/localtime
+# ppp init script
 # snmp
 # mrtg
 # ipac-ng
 # dyndns: http://ez-ipupdate.com/
 # pptp
+# meshroaming
 
 # egrep -i Pattern matched against "$Section $Package-Name"
 export FEED_PATTERN = "^locale-|^glibc-|^net|^libs|^base"
diff --git a/meta/nylon-image-base.oe b/meta/nylon-image-base.oe
index 708e211d77..4f33369165 100644
--- a/meta/nylon-image-base.oe
+++ b/meta/nylon-image-base.oe
@@ -9,14 +9,14 @@ NYLON_COMMON = "base-files base-passwd bash busybox bridge-utils \
 	nano ncurses netbase nylon-scripts \
 	openssh openvpn ppp rp-pppoe \
 	shorewall sysvinit \
-	tcpdump tinylogin \
+	tcpdump timezones tinylogin \
 	wireless-tools"
 
 DEPENDS = "virtual/kernel hostap-modules ntp \ 
 	${NYLON_COMMON} ${BOOTSTRAP_EXTRA_DEPENDS}"
 	
 RDEPENDS = "kernel modutils-depmod modutils-modinfo \
-	ncurses-terminfo ntpdate hostap-modules-pci \
+	ntpdate hostap-modules-pci \
 	${NYLON_COMMON} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
 export IPKG_INSTALL = "${RDEPENDS}" 
@@ -25,4 +25,5 @@ IMAGE_LINGUAS = ""
 
 inherit image_ipk
 
-ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
\ No newline at end of file
+# we dont need the kernel in the image
+ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
diff --git a/prism54/prism54-firmware_1.0.4.3.oe b/prism54/prism54-firmware_1.0.4.3.oe
index 03204d2420..ada7a59d3a 100644
--- a/prism54/prism54-firmware_1.0.4.3.oe
+++ b/prism54/prism54-firmware_1.0.4.3.oe
@@ -9,8 +9,8 @@ SRC_URI = "http://prism54.org/~mcgrof/firmware/${PV}.arm"
 S = "${WORKDIR}/prism54.org"
 
 do_install() {
-	install -d ${D}/usr/lib/hotplug/firmware/
-	install -m 0644 ${PV}.arm ${D}/usr/lib/hotplug/firmware/
+	install -d ${D}/lib/firmware/
+	install -m 0644 ${PV}.arm ${D}/lib/firmware/isl3890
 }
 
-FILES_${PN} = "/usr/lib/hotplug/firmware/"
+FILES_${PN} = "/lib/firmware/"
diff --git a/prism54/prism54-module_1.2.oe b/prism54/prism54-module_1.2.oe
index 4b998dd435..a4d93931b0 100644
--- a/prism54/prism54-module_1.2.oe
+++ b/prism54/prism54-module_1.2.oe
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
-RDEPENDS = "kernel (${KERNEL_VERSION}) kernel-module-firmware-class prism54-firmware"
+RDEPENDS = "kernel (${KERNEL_VERSION}) kernel-module-firmware-class prism54-firmware hotplug"
 DEPENDS = "virtual/kernel"
 
 SRC_URI = "http://prism54.org/pub/linux/testing/tars/2004-06/prism54-1.2.tar.bz2"