merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'

     and '8dfee9b2427785432e4161eb7cc749155230e08e'

8 files changed, 78 insertions, 165 deletions

diff --git a/packages/wireless-tools/wireless-tools.inc b/packages/wireless-tools/wireless-tools.inc
new file mode 100644
index 0000000000..857f63c91b
--- /dev/null
+++ b/packages/wireless-tools/wireless-tools.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
+HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "file://man.patch;patch=1 \
+	   file://wireless-tools.if-pre-up"
+
+CFLAGS =+ "-I${S}"
+EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
+		'INSTALL_DIR=${D}${base_sbindir}' \
+		'INSTALL_LIB=${D}${libdir}' \
+		'INSTALL_INC=${D}${includedir}' \
+		'INSTALL_MAN=${D}${mandir}'"
+
+do_compile() {
+	oe_runmake all libiw.a
+}
+
+do_stage() {
+	install -m 0644 wireless.h ${STAGING_INCDIR}/
+	install -m 0644 iwlib.h ${STAGING_INCDIR}/
+	oe_libinstall -a -so libiw ${STAGING_LIBDIR}/
+}
+
+PACKAGES += "libiw libiw-dev libiw-doc libiw-dbg ifrename ifrename-dbg ifrename-doc"
+FILES_libiw += "${libdir}/*.so.*"
+FILES_libiw-dbg += "${libdir}/.debug/*.so.*"
+FILES_libiw-dev += "${libdir}/*.a ${libdir}/*.so ${includedir}"
+FILES_libiw-doc += "${mandir}/man7"
+FILES_ifrename += "${sbindir}/ifrename"
+FILES_ifrename-dbg += "${sbindir}/.debug/ifrename"
+FILES_ifrename-doc += "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5"
+FILES_${PN} += "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
+FILES_${PN}-doc += "${mandir}/man8"
diff --git a/packages/wireless-tools/wireless-tools_26.bb b/packages/wireless-tools/wireless-tools_26.bb
deleted file mode 100644
index 4a478663e6..0000000000
--- a/packages/wireless-tools/wireless-tools_26.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
-HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "virtual/kernel"
-LICENSE = "GPL"
-PR = "r6"
-
-SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \
-	   file://man.patch;patch=1 \
-	   file://wireless-tools.if-pre-up"
-S = "${WORKDIR}/wireless_tools.${PV}"
-
-inherit module-base
-
-do_configure() {
-	rm -f wireless.h
-}
-
-do_compile() {
-        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-        oe_runmake KERNEL_SRC=${KERNEL_SOURCE} KERNEL_VERSION=${KERNEL_VERSION} BUILD_SHARED=y
-}
-
-do_install() {
-	oe_runmake PREFIX=${D} install
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
-}
-
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
-               ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-               /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \
-	       /etc/network"
diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_27.bb
deleted file mode 100644
index c26e40cf3c..0000000000
--- a/packages/wireless-tools/wireless-tools_27.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
-HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-SECTION = "base"
-PRIORITY = "optional"
-#DEPENDS = "virtual/kernel"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \
-	   file://man.patch;patch=1 \
-	   file://fixheaders.patch;patch=1 \
-	   file://wireless-tools.if-pre-up"
-S = "${WORKDIR}/wireless_tools.${PV}"
-
-CFLAGS =+ "-I${S}"
-EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
-		'INSTALL_DIR=${D}${base_sbindir}' \
-		'INSTALL_LIB=${D}${libdir}' \
-		'INSTALL_INC=${D}${includedir}' \
-		'INSTALL_MAN=${D}${mandir}'"
-
-do_compile() {
-	oe_runmake all libiw.a
-}
-
-do_stage () {
-	install -m 0644 wireless.h ${STAGING_INCDIR}/
-	install -m 0644 iwlib.h ${STAGING_INCDIR}/
-	oe_libinstall -a -so libiw ${STAGING_LIBDIR}/
-}
-
-do_install() {
-	oe_runmake PREFIX=${D} install install-static
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
-}
-
-PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc"
-FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
-FILES_libiw-doc = "${mandir}/man7"
-FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
-FILES_${PN}-doc = "${mandir}/man8"
diff --git a/packages/wireless-tools/wireless-tools_28+29pre10.bb b/packages/wireless-tools/wireless-tools_28+29pre10.bb
new file mode 100644
index 0000000000..cf519cd9f1
--- /dev/null
+++ b/packages/wireless-tools/wireless-tools_28+29pre10.bb
@@ -0,0 +1,14 @@
+require wireless-tools.inc
+
+PR = "r3"
+
+SRC_URI += "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre10.tar.gz"
+S = "${WORKDIR}/wireless_tools.29"
+
+do_install() {
+	oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr
+	install -d ${D}${sbindir}
+	install -m 0755 ifrename ${D}${sbindir}/ifrename
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
+}
diff --git a/packages/wireless-tools/wireless-tools_28+29pre21.bb b/packages/wireless-tools/wireless-tools_28+29pre21.bb
new file mode 100644
index 0000000000..b42af6fee2
--- /dev/null
+++ b/packages/wireless-tools/wireless-tools_28+29pre21.bb
@@ -0,0 +1,14 @@
+require wireless-tools.inc
+
+SRC_URI += "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre21.tar.gz \
+	   file://zzz-wireless.if-pre-up"
+S = "${WORKDIR}/wireless_tools.29"
+
+do_install() {
+	oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr
+	install -d ${D}${sbindir}
+	install -m 0755 ifrename ${D}${sbindir}/ifrename
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
+	install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless
+}
diff --git a/packages/wireless-tools/wireless-tools_28-pre13.bb b/packages/wireless-tools/wireless-tools_28-pre13.bb
deleted file mode 100644
index 170f67deeb..0000000000
--- a/packages/wireless-tools/wireless-tools_28-pre13.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
-HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre13.tar.gz \
-           file://man.patch;patch=1 \
-	   file://wireless-tools.if-pre-up \
-	   file://zzz-wireless.if-pre-up"
-S = "${WORKDIR}/wireless_tools.28"
-
-CFLAGS =+ "-I${S}"
-EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
-		'INSTALL_DIR=${D}${base_sbindir}' \
-		'INSTALL_LIB=${D}${libdir}' \
-		'INSTALL_INC=${D}${includedir}' \
-		'INSTALL_MAN=${D}${mandir}'"
-
-do_compile() {
-	oe_runmake all libiw.a
-}
-
-do_stage() {
-	install -m 0644 wireless.h ${STAGING_INCDIR}/
-	install -m 0644 iwlib.h ${STAGING_INCDIR}/
-	oe_libinstall -a -so libiw ${STAGING_LIBDIR}/
-}
-
-do_install() {
-	oe_runmake PREFIX=${D} install-iwmulticall install-dynamic
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
-	install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless
-}
-
-PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc"
-FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
-FILES_libiw-doc = "${mandir}/man7"
-FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
-FILES_${PN}-doc = "${mandir}/man8"
diff --git a/packages/wireless-tools/wireless-tools_28.bb b/packages/wireless-tools/wireless-tools_28.bb
new file mode 100644
index 0000000000..92a49daae2
--- /dev/null
+++ b/packages/wireless-tools/wireless-tools_28.bb
@@ -0,0 +1,14 @@
+require wireless-tools.inc
+
+PR = "r1"
+
+SRC_URI += "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre13.tar.gz \
+	   file://zzz-wireless.if-pre-up"
+S = "${WORKDIR}/wireless_tools.28"
+
+do_install() {
+	oe_runmake PREFIX=${D} install-iwmulticall install-dynamic
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
+	install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless
+}
diff --git a/packages/wireless-tools/wireless-tools_29-pre10.bb b/packages/wireless-tools/wireless-tools_29-pre10.bb
deleted file mode 100644
index febe662602..0000000000
--- a/packages/wireless-tools/wireless-tools_29-pre10.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
-HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre10.tar.gz \
-           file://man.patch;patch=1 \
-	   file://wireless-tools.if-pre-up"
-
-S = "${WORKDIR}/wireless_tools.29"
-
-CFLAGS =+ "-I${S}"
-EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
-		'INSTALL_DIR=${D}${base_sbindir}' \
-		'INSTALL_LIB=${D}${libdir}' \
-		'INSTALL_INC=${D}${includedir}' \
-		'INSTALL_MAN=${D}${mandir}'"
-
-do_compile() {
-	oe_runmake all libiw.a
-}
-
-do_stage() {
-	install -m 0644 wireless.h ${STAGING_INCDIR}/
-	install -m 0644 iwlib.h ${STAGING_INCDIR}/
-	oe_libinstall -a -so libiw ${STAGING_LIBDIR}/
-}
-
-do_install() {
-	oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr
-	install -d ${D}${sbindir}
-	install -m 0755 ifrename ${D}${sbindir}/ifrename
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
-}
-
-PACKAGES = "libiw libiw-dev libiw-doc ifrename ${PN} ${PN}-doc ${PN}-dbg "
-FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
-FILES_libiw-doc = "${mandir}/man7"
-FILES_ifrename = "${sbindir}/ifrename"
-FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
-FILES_${PN}-doc = "${mandir}/man8"