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

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/29 14:18:16-05:00 thegrantclan.org!jgrant
fix typo and create resolv.conf in base-files

2004/10/29 14:03:14-05:00 thegrantclan.org!jgrant
Keymaping additions for tosa in qte.

2004/10/29 11:43:46-05:00 thegrantclan.org!jgrant
Changes based on Murray Jensen's patchs sent to the oe mailing list.  Mostly hotplug fixes and location of init scripts.

BKrev: 4182bcefIQKf4dZo5GWM-5QhxcjYcQ

8 files changed, 142 insertions, 2 deletions

diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index 26cfa0f6e2..f00f9cb203 100644
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -56,7 +56,7 @@ do_install () {
 		install -m 2755 -d ${D}/$d
 	done
 
-	if [ -n "${MACHINE}" -a "${hostname}" == "openembedded" ]; then
+	if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then
 		echo ${MACHINE} > ${D}/${sysconfdir}/hostname
 	else
 		echo ${hostname} > ${D}/${sysconfdir}/hostname
@@ -106,6 +106,7 @@ do_install () {
 		echo ">/var/log/wtmp" >> ${D}/etc/init.d/populate-var.sh
 		echo ">/var/log/lastlog" >> ${D}/etc/init.d/populate-var.sh
 		echo "chmod 0664 /var/run/utmp /var/log/wtmp /var/log/lastlog"	>> ${D}/etc/init.d/populate-var.sh
+		echo "touch /var/run/resolv.conf"	>> ${D}/etc/init.d/populate-var.sh
 
 #		rmdir ${D}/var/*
 		chmod 0755 ${D}/${sysconfdir}/init.d/populate-var.sh
diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
index 48260d37c9..b0a53a7b45 100644
--- a/conf/distro/openzaurus-3.5.1.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
@@ -26,6 +26,7 @@ PREFERRED_VERSION_qte-for-opie = "2.3.7"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
+PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
 
 #
 # Opie
diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index e69de29bb2..fe06ddf403 100644
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -0,0 +1,30 @@
+include conf/distro/openzaurus.conf
+DISTRO = "openzaurus"
+
+FEED_URIS_openzaurus = "OZ-3.5.2##http://openzaurus.org/official/unstable/3.5.2/feed/ \
+  		        OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/"
+
+# CVSDATE = 20041025
+ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
+PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
+PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+OEINCLUDELOGS = "yes"
+KERNEL_CONSOLE = "tty1"
+TARGET_FPU = "soft"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
+PREFERRED_VERSION_binutils-cross = "2.15.91.0.1"
+PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
+PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
+PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
+
diff --git a/qte/qte-2.3.7/kernel-keymap-tosa.patch b/qte/qte-2.3.7/kernel-keymap-tosa.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/qte/qte-2.3.7/kernel-keymap-tosa.patch
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index 75771b6ea5..b8c36d4a64 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -25,7 +25,7 @@ SRC_URI_append_simpad   	= "file://devfs.patch;patch=1 file://simpad.patch;patch
 SRC_URI_append_corgi		= "file://kernel-keymap.patch;patch=1 "
 SRC_URI_append_shepherd		= "file://kernel-keymap.patch;patch=1 "
 SRC_URI_append_husky		= "file://kernel-keymap.patch;patch=1 "
-SRC_URI_append_tosa		= "file://kernel-keymap.patch;patch=1 "
+SRC_URI_append_tosa		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_beagle   	= "file://beagle.patch;patch=1 "
 
 S = "${WORKDIR}/qt-${PV}"
diff --git a/wlan-ng/files/OZ-Configure.patch b/wlan-ng/files/OZ-Configure.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/wlan-ng/files/OZ-Configure.patch
diff --git a/wlan-ng/files/wlan.agent b/wlan-ng/files/wlan.agent
index e69de29bb2..945d646984 100644
--- a/wlan-ng/files/wlan.agent
+++ b/wlan-ng/files/wlan.agent
@@ -0,0 +1,107 @@
+#!/bin/sh
+#
+# p80211/wlan hotplug policy agent.
+#
+# wlan hotplug params include:
+#	
+#	ACTION=%s [register|remove|shutdown|startup|suspend|resume]
+#	INTERFACE=%s
+#       NSDNAME=%s
+#
+
+cd /etc/hotplug
+# must have ./ here or busybox shell barfs
+. ./hotplug.functions
+
+#DEBUG=yes export DEBUG
+
+if [ "$INTERFACE" = "" ]; then
+    mesg Bad WLAN invocation: \$INTERFACE is not set
+    exit 1
+fi
+
+if [ "$NSDNAME" = "" ]; then
+    mesg Bad WLAN invocation: \$NSDNAME is not set
+    exit 1
+fi
+
+debug_mesg WLAN $ACTION on $INTERFACE \($NSDNAME\)
+
+if [ "$NSDNAME" = "prism2_cs" ] ; then
+    mesg "WLAN Hotplug bypassed for pcmcia"
+    exit 0
+fi
+
+# load up the shared scripts
+if [ ! -f /etc/wlan/shared ] ; then
+    mesg "/etc/wlan/shared not present, aborting"
+    exit 1
+fi
+
+ECHO=mesg
+. /etc/wlan/shared
+
+case $ACTION in
+'register'|'resume')
+	eval 'WLAN_ENABLE=$ENABLE_'$INTERFACE
+	if ! is_true $WLAN_ENABLE ; then
+	    mesg "WLAN $ACTION - interface $INTERFACE not enabled, aborting"
+	    exit 1
+	fi
+	debug_mesg WLAN $INTERFACE registered.
+	wlan_bring_it_up $INTERFACE
+	if [ $? = 0 ] ; then
+	    mesg WLAN $INTERFACE brought up successfully.
+		if [ -x /etc/wlan/network ] ; then
+			mesg "WLAN bringing up layer 3+ with /etc/wlan/network"
+			/etc/wlan/network start $INTERFACE
+		elif [ -x /etc/wlan/pre-ifup ] ; then
+			# pre-ifup is presumed to call ifup if it
+			#  wants to...it may choose to skip it.
+			mesg "WLAN bringing up layer 3+ with /etc/wlan/pre-ifup"
+			/etc/wlan/pre-ifup $INTERFACE
+		else
+			mesg "WLAN bringing up layer 3+ with /sbin/ifup"
+			/sbin/ifup $INTERFACE
+		fi
+	else
+	    mesg WLAN Could not bring up $INTERFACE
+		 exit 1
+	fi
+	# eventually invoke net.agent on $INTERFACE w/ REGISTER
+;;
+'remove'|'suspend')
+	debug_mesg WLAN $INTERFACE removed.
+	eval 'WLAN_ENABLE=$ENABLE_'$INTERFACE
+	if ! is_true $WLAN_ENABLE ; then
+	    mesg "WLAN $ACTION - interface $INTERFACE not enabled, aborting"
+	    exit 1
+	fi
+	if [ -x /etc/wlan/network ] ; then
+		mesg "WLAN taking down layer 3+ with /etc/wlan/network"
+		/etc/wlan/network stop $INTERFACE
+	elif [ -x /etc/wlan/post-ifdown ] ; then
+		# post-ifdown is presumed to call ifdown if it
+		#  wants to...it may choose to skip it.
+		mesg "WLAN taking down layer 3+ with /etc/wlan/post-ifdown"
+		/etc/wlan/post-ifdown $INTERFACE
+	else
+		mesg "WLAN taking down layer 3+ with /sbin/ifdown"
+		/sbin/ifdown $INTERFACE
+	fi
+	wlan_disable $INTERFACE
+;;
+'startup')
+	# kick off wland.
+	debug_mesg WLAN p80211 starting!
+	start_wland
+;;
+'shutdown')
+	debug_mesg WLAN p80211 shutting down!
+	stop_wland
+;;
+*)
+    debug_mesg WLAN $ACTION event not supported
+    exit 1 ;;
+
+esac
diff --git a/wlan-ng/wlan-ng-modules_0.2.1pre22.oe b/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
index b5b8a10e85..08cf03367b 100644
--- a/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
+++ b/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
@@ -11,6 +11,7 @@ SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz
 	file://Ambit_usb.patch;patch=1 \
 	file://scripts-makefile-hostcc.diff;patch=1;pnum=0 \
 	file://pass-kernel-cross.patch;patch=1;pnum=0 \
+	file://OZ-Configure.patch;patch=1 \
 	file://wlan-ng.modutils \
 	file://wlan.agent \
 	file://config.in \