git.openpandora.org / openembedded.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d1af5e1)
wireless-tools: unify
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 17:42:22 +0000 (17:42 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 17:42:22 +0000 (17:42 +0000)
packages/wireless-tools/wireless-tools.inc [new file with mode: 0644] patch | blob
packages/wireless-tools/wireless-tools_28.bb patch | blob | history
packages/wireless-tools/wireless-tools_29-pre10.bb patch | blob | history
packages/wireless-tools/wireless-tools_29-pre21.bb patch | blob | history

diff --git a/packages/wireless-tools/wireless-tools.inc b/packages/wireless-tools/wireless-tools.inc
new file mode 100644 (file)
index 0000000..857f63c
--- /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_28.bb b/packages/wireless-tools/wireless-tools_28.bb
index 8fc94af..92a49da 100644 (file)
--- a/packages/wireless-tools/wireless-tools_28.bb
+++ b/packages/wireless-tools/wireless-tools_28.bb
@@ -1,42 +1,14 @@
-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"
+require wireless-tools.inc
 
-SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.tar.gz \
-           file://man.patch;patch=1 \
-          file://wireless-tools.if-pre-up \
+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"
 
-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_29-pre10.bb b/packages/wireless-tools/wireless-tools_29-pre10.bb
index bf55960..cf519cd 100644 (file)
--- a/packages/wireless-tools/wireless-tools_29-pre10.bb
+++ b/packages/wireless-tools/wireless-tools_29-pre10.bb
@@ -1,33 +1,10 @@
-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 = "r3"
+require wireless-tools.inc
 
-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"
+PR = "r3"
 
+SRC_URI += "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre10.tar.gz"
 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}
@@ -35,16 +12,3 @@ do_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
 }
-
-PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \
-libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc"
-
-FILES_libiw-dbg = "${libdir}/.debug/*.so.*"
-FILES_ifrename-dbg = "${sbindir}/.debug/ifrename"
-FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
-FILES_libiw-doc = "${mandir}/man7"
-FILES_ifrename = "${sbindir}/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}"
diff --git a/packages/wireless-tools/wireless-tools_29-pre21.bb b/packages/wireless-tools/wireless-tools_29-pre21.bb
index 2b0272a..b42af6f 100644 (file)
--- a/packages/wireless-tools/wireless-tools_29-pre21.bb
+++ b/packages/wireless-tools/wireless-tools_29-pre21.bb
@@ -1,32 +1,9 @@
-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"
+require wireless-tools.inc
 
-SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre21.tar.gz \
-           file://man.patch;patch=1 \
-          file://wireless-tools.if-pre-up \
+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"
 
-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}
@@ -35,16 +12,3 @@ do_install() {
        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-dbg ifrename-dbg ${PN}-dbg \
-libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc"
-
-FILES_libiw-dbg = "${libdir}/.debug/*.so.*"
-FILES_ifrename-dbg = "${sbindir}/.debug/ifrename"
-FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
-FILES_libiw-doc = "${mandir}/man7"
-FILES_ifrename = "${sbindir}/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}"
Clone of mainline OpenEmbedded repository