[oe-commits] org.oe.dev kismet: unify

[Laibsch commit]

kismet: unify

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 6f1924a9cb59f4666b349d99b29afb73856bd865
ViewMTN: http://monotone.openembedded.org/revision/info/6f1924a9cb59f4666b349d99b29afb73856bd865
Files:
1
packages/kismet/kismet.inc
packages/kismet/kismet-newcore_svn.bb
packages/kismet/kismet_2007-01-R1b.bb
packages/kismet/kismet_2007-10-R1.bb
packages/kismet/kismet_svn.bb
Diffs:

#
# mt diff -r9ee71c339fc798195acda4afb00247d656cb11b6 -r6f1924a9cb59f4666b349d99b29afb73856bd865
#
# 
# 
# add_file "packages/kismet/kismet.inc"
#  content [6d7f0ae5376d1127a682ca46b5c14143495885a1]
# 
# patch "packages/kismet/kismet-newcore_svn.bb"
#  from [613997394be7e86e20920124bb2c4b10ce09a6d6]
#    to [312f6dbfa409f99e4016d13495545a9846e66abc]
# 
# patch "packages/kismet/kismet_2007-01-R1b.bb"
#  from [7e83fb1593b2bd1fd42096c78c76fda8b806160c]
#    to [44c52fb61cc91d305df7c9f9ad5404b97f45f5c4]
# 
# patch "packages/kismet/kismet_2007-10-R1.bb"
#  from [b8971fcf7ccf5f139688680c6faccc7b2cfe9bff]
#    to [44c52fb61cc91d305df7c9f9ad5404b97f45f5c4]
# 
# patch "packages/kismet/kismet_svn.bb"
#  from [318ffe650be4c09ccb40afed1857af643d02a724]
#    to [a4c2a34319b0225d1132aa1120dfc35897253ead]
# 
============================================================
--- packages/kismet/kismet.inc	6d7f0ae5376d1127a682ca46b5c14143495885a1
+++ packages/kismet/kismet.inc	6d7f0ae5376d1127a682ca46b5c14143495885a1
@@ -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"
+
============================================================
--- packages/kismet/kismet-newcore_svn.bb	613997394be7e86e20920124bb2c4b10ce09a6d6
+++ packages/kismet/kismet-newcore_svn.bb	312f6dbfa409f99e4016d13495545a9846e66abc
@@ -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"
+require kismet.inc
+
 DEFAULT_PREFERENCE = "-1"
-SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http"
 
-EXTRA_OECONF = "--disable-gpsmap --enable-wsp100 --with-pcap=linux \
-                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+PV = "0.0+svnr${SRCREV}"
+PR = "r3"
 
-inherit autotools
+SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http"
 
-S = "${WORKDIR}/kismet-newcore"
+EXTRA_OECONF += "--disable-gpsmap"
 
+S = "${WORKDIR}/kismet-newcore"
-fakeroot do_install() {
-     oe_runmake "DESTDIR=${D}" suidinstall
-}
-
-PACKAGES =+ "${PN}-sounds"
-
-FILES_${PN}-sounds = "${datadir}/kismet/wav"
-RDEPENDS_${PN}-sounds = "sox"
-
-CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
-
============================================================
--- packages/kismet/kismet_2007-01-R1b.bb	7e83fb1593b2bd1fd42096c78c76fda8b806160c
+++ packages/kismet/kismet_2007-01-R1b.bb	44c52fb61cc91d305df7c9f9ad5404b97f45f5c4
@@ -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"
+require kismet.inc
 
+PR = "r3"
-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"
-
============================================================
--- packages/kismet/kismet_2007-10-R1.bb	b8971fcf7ccf5f139688680c6faccc7b2cfe9bff
+++ packages/kismet/kismet_2007-10-R1.bb	44c52fb61cc91d305df7c9f9ad5404b97f45f5c4
@@ -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"
+require kismet.inc
 
+PR = "r3"
-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"
-
============================================================
--- packages/kismet/kismet_svn.bb	318ffe650be4c09ccb40afed1857af643d02a724
+++ packages/kismet/kismet_svn.bb	a4c2a34319b0225d1132aa1120dfc35897253ead
@@ -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"
-