[oe-commits] org.oe.dev wireless-tools: unify

Laibsch commit openembedded-commits at lists.openembedded.org
Mon Jun 11 18:50:05 UTC 2007


wireless-tools: unify

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 1a8f49d6fe12797c51767a96e82fe212e93b5998
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1a8f49d6fe12797c51767a96e82fe212e93b5998
Files:
1
packages/wireless-tools/wireless-tools.inc
packages/wireless-tools/wireless-tools_28.bb
packages/wireless-tools/wireless-tools_29-pre10.bb
packages/wireless-tools/wireless-tools_29-pre21.bb
Diffs:

#
# mt diff -r1877cd2e9cf302d7d582ad4ad0947bd3f85e2f46 -r1a8f49d6fe12797c51767a96e82fe212e93b5998
#
# 
# 
# add_file "packages/wireless-tools/wireless-tools.inc"
#  content [05c8d51272b4f5cb586fd26324d5cca073f7ce89]
# 
# patch "packages/wireless-tools/wireless-tools_28.bb"
#  from [45ca7c8350fd1093034be2c5f3171b1478232215]
#    to [9deeb525cc9e9fda16538a44a0bc5a577d1e6224]
# 
# patch "packages/wireless-tools/wireless-tools_29-pre10.bb"
#  from [c9d683db22dbb62f526ceb6ecc7da5a45164ff89]
#    to [b1efca66c1b08a7fbb4fc44fe07e91f99f8f8ecc]
# 
# patch "packages/wireless-tools/wireless-tools_29-pre21.bb"
#  from [dfa2038b389bd7eccf1ce2ba9237f580eb490394]
#    to [3b563355328a1c0720bf0a0eabdaa7af976e9559]
# 
============================================================
--- packages/wireless-tools/wireless-tools.inc	05c8d51272b4f5cb586fd26324d5cca073f7ce89
+++ packages/wireless-tools/wireless-tools.inc	05c8d51272b4f5cb586fd26324d5cca073f7ce89
@@ -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"
============================================================
--- packages/wireless-tools/wireless-tools_28.bb	45ca7c8350fd1093034be2c5f3171b1478232215
+++ packages/wireless-tools/wireless-tools_28.bb	9deeb525cc9e9fda16538a44a0bc5a577d1e6224
@@ -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"
============================================================
--- packages/wireless-tools/wireless-tools_29-pre10.bb	c9d683db22dbb62f526ceb6ecc7da5a45164ff89
+++ packages/wireless-tools/wireless-tools_29-pre10.bb	b1efca66c1b08a7fbb4fc44fe07e91f99f8f8ecc
@@ -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}"
============================================================
--- packages/wireless-tools/wireless-tools_29-pre21.bb	dfa2038b389bd7eccf1ce2ba9237f580eb490394
+++ packages/wireless-tools/wireless-tools_29-pre21.bb	3b563355328a1c0720bf0a0eabdaa7af976e9559
@@ -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}"






More information about the Openembedded-commits mailing list