Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

7 files changed, 5 insertions, 4 deletions

diff --git a/packages/kismet/kismet-2004-04-R1/glibc3.3.2-getopt-throw.diff b/packages/kismet/files/glibc3.3.2-getopt-throw.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2004-04-R1/glibc3.3.2-getopt-throw.diff
+++ b/packages/kismet/files/glibc3.3.2-getopt-throw.diff
diff --git a/packages/kismet/kismet-2004-04-R1/no-chmod.diff b/packages/kismet/files/no-chmod.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2004-04-R1/no-chmod.diff
+++ b/packages/kismet/files/no-chmod.diff
diff --git a/packages/kismet/kismet-2004-04-R1/no-strip.diff b/packages/kismet/files/no-strip.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2004-04-R1/no-strip.diff
+++ b/packages/kismet/files/no-strip.diff
diff --git a/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch b/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch
diff --git a/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff b/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff
diff --git a/packages/kismet/kismet_2004-04-R1.bb b/packages/kismet/kismet_2004-04-R1.bb
index 5f03366541..f1510f9e87 100644
--- a/packages/kismet/kismet_2004-04-R1.bb
+++ b/packages/kismet/kismet_2004-04-R1.bb
@@ -2,15 +2,16 @@ SECTION = "console/network"
 DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 HOMEPAGE = "http://www.kismetwireless.net/"
 LICENSE = "GPLv2"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 DEPENDS = "expat gmp"
 
 SRC_URI = "http://www.kismetwireless.net/code/kismet-2004-04-R1.tar.gz \
 	file://no-strip.diff;patch=1;pnum=0 \
 	file://no-chmod.diff;patch=1;pnum=0 \
-	file://no-lib-modules-uname-include.diff;patch=1;pnum=0"
+	file://no-lib-modules-uname-include.diff;patch=1;pnum=0 \
+	file://packet_friend_fix.patch;patch=1 \
+	file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
 	
-SRC_URI_append_mipsel = " file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
 SRC_URI_append_mtx-1 = " file://kismet.conf"
 
 EXTRA_OECONF = "--with-pcap=linux --disable-setuid"
@@ -24,7 +25,7 @@ do_configure() {
 
 do_install_append() {
 	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}/${sysconfdir}/
+		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
 	fi
 }
 
diff --git a/packages/kismet/kismet_2005-01-R1.bb b/packages/kismet/kismet_2005-01-R1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kismet/kismet_2005-01-R1.bb