merge of '2b4e1c7a35c118cf363c771f015c4fdfa5f84731'

     and '36fe2f5bf87b5a8eedda174012a2e93f8bb5a8f5'

5 files changed, 49 insertions, 121 deletions

diff --git a/packages/kismet/kismet-newcore_svn.bb b/packages/kismet/kismet-newcore_svn.bb
index fd1eadfeb7..6f3c00bdcb 100644
--- a/packages/kismet/kismet-newcore_svn.bb
+++ b/packages/kismet/kismet-newcore_svn.bb
@@ -1,28 +1,12 @@
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
-PV = "0.0+svnr${SRCREV}"
-PR = "r2"
-DEFAULT_PREFERENCE = "-1"
-SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http"
+require kismet.inc
 
-EXTRA_OECONF = "--disable-gpsmap --enable-wsp100 --with-pcap=linux \
-                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
-
-inherit autotools
-
-S = "${WORKDIR}/kismet-newcore"
-
-fakeroot do_install() {
-     oe_runmake "DESTDIR=${D}" suidinstall
-}
+DEFAULT_PREFERENCE = "-1"
 
-PACKAGES =+ "${PN}-sounds"
+PV = "0.0+svnr${SRCREV}"
+PR = "r3"
 
-FILES_${PN}-sounds = "${datadir}/kismet/wav"
-RDEPENDS_${PN}-sounds = "sox"
+SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http"
 
-CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
+EXTRA_OECONF += "--disable-gpsmap"
 
+S = "${WORKDIR}/kismet-newcore"
diff --git a/packages/kismet/kismet.inc b/packages/kismet/kismet.inc
new file mode 100644
index 0000000000..57298c5c00
--- /dev/null
+++ b/packages/kismet/kismet.inc
@@ -0,0 +1,33 @@
+DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+HOMEPAGE = "http://www.kismetwireless.net/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap"
+
+SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
+
+EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
+                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+
+inherit autotools
+
+fakeroot do_install() {
+     oe_runmake "DESTDIR=${D}" suidinstall
+}
+
+do_install_append() {
+	if test -e ${WORKDIR}/kismet.conf; then
+		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
+
+FILES_${PN}-sounds = "${datadir}/kismet/wav"
+RDEPENDS_${PN}-sounds = "sox"
+
+FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
+RDEPENDS_${PN}-gpsmap = "gpsd"
+
+CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
+
diff --git a/packages/kismet/kismet_2007-01-R1b.bb b/packages/kismet/kismet_2007-01-R1b.bb
index a908ac4637..ef1cf86c98 100644
--- a/packages/kismet/kismet_2007-01-R1b.bb
+++ b/packages/kismet/kismet_2007-01-R1b.bb
@@ -1,34 +1,3 @@
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
-PR = "r2"
-
-SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
-
-EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
-                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
-
-inherit autotools
-
-fakeroot do_install() {
-     oe_runmake "DESTDIR=${D}" suidinstall
-}
-
-do_install_append() {
-	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-	fi
-}
-
-PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
-
-FILES_${PN}-sounds = "${datadir}/kismet/wav"
-RDEPENDS_${PN}-sounds = "sox"
-
-FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
-RDEPENDS_${PN}-gpsmap = "gpsd"
-
-CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
+require kismet.inc
 
+PR = "r3"
diff --git a/packages/kismet/kismet_2007-10-R1.bb b/packages/kismet/kismet_2007-10-R1.bb
index 1a53c6f78f..ef1cf86c98 100644
--- a/packages/kismet/kismet_2007-10-R1.bb
+++ b/packages/kismet/kismet_2007-10-R1.bb
@@ -1,34 +1,3 @@
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap"
-PR = "r2"
-
-SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
-
-EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
-                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
-
-inherit autotools
-
-fakeroot do_install() {
-     oe_runmake "DESTDIR=${D}" suidinstall
-}
-
-do_install_append() {
-	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-	fi
-}
-
-PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
-
-FILES_${PN}-sounds = "${datadir}/kismet/wav"
-RDEPENDS_${PN}-sounds = "sox"
-
-FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
-RDEPENDS_${PN}-gpsmap = "gpsd"
-
-CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
+require kismet.inc
 
+PR = "r3"
diff --git a/packages/kismet/kismet_svn.bb b/packages/kismet/kismet_svn.bb
index 10723dd42a..878678052a 100644
--- a/packages/kismet/kismet_svn.bb
+++ b/packages/kismet/kismet_svn.bb
@@ -1,37 +1,10 @@
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
-PV = "2007-10-R1+svnr${SRCREV}"
-PR = "r1"
+require kismet.inc
+
 DEFAULT_PREFERENCE = "-1"
-SRC_URI = "svn://svn.kismetwireless.net/code/;module=trunk;proto=http"
 
-EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
-                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+PV = "2007-10-R1+svnr${SRCREV}"
+PR = "r2"
 
-inherit autotools
+SRC_URI = "svn://svn.kismetwireless.net/code/;module=trunk;proto=http"
 
 S = "${WORKDIR}/trunk"
-
-fakeroot do_install() {
-     oe_runmake "DESTDIR=${D}" suidinstall
-}
-
-do_install_append() {
-	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-	fi
-}
-
-PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
-
-FILES_${PN}-sounds = "${datadir}/kismet/wav"
-RDEPENDS_${PN}-sounds = "sox"
-
-FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
-RDEPENDS_${PN}-gpsmap = "gpsd"
-
-CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
-