summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-03-08 11:35:38 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-03-08 11:35:38 +0000
commit1742750db3dd0fee4647b0abc95a2166e26b78cc (patch)
treeb6d1fe006fdb8523ae24b09d3a355ca6f2b3eeaa /packages
parent809063c9dc2fcca1b9e69101ff4765bd8aa367ba (diff)
wireless-tools: remove .29 prereleases, add .29 release, refactor .inc file
Diffstat (limited to 'packages')
-rw-r--r--packages/wireless-tools/wireless-tools.inc18
-rw-r--r--packages/wireless-tools/wireless-tools_28+29pre10.bb14
-rw-r--r--packages/wireless-tools/wireless-tools_28+29pre21.bb16
-rw-r--r--packages/wireless-tools/wireless-tools_28.bb14
4 files changed, 16 insertions, 46 deletions
diff --git a/packages/wireless-tools/wireless-tools.inc b/packages/wireless-tools/wireless-tools.inc
index 857f63c91b..36ee3eddef 100644
--- a/packages/wireless-tools/wireless-tools.inc
+++ b/packages/wireless-tools/wireless-tools.inc
@@ -4,10 +4,15 @@ SECTION = "base"
PRIORITY = "optional"
LICENSE = "GPL"
-SRC_URI = "file://man.patch;patch=1 \
- file://wireless-tools.if-pre-up"
+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 \
+ file://zzz-wireless.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}' \
@@ -24,6 +29,15 @@ do_stage() {
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
+ install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless
+}
+
PACKAGES += "libiw libiw-dev libiw-doc libiw-dbg ifrename ifrename-dbg ifrename-doc"
FILES_libiw += "${libdir}/*.so.*"
FILES_libiw-dbg += "${libdir}/.debug/*.so.*"
diff --git a/packages/wireless-tools/wireless-tools_28+29pre10.bb b/packages/wireless-tools/wireless-tools_28+29pre10.bb
deleted file mode 100644
index cf519cd9f1..0000000000
--- a/packages/wireless-tools/wireless-tools_28+29pre10.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 41bd546b6d..0000000000
--- a/packages/wireless-tools/wireless-tools_28+29pre21.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require wireless-tools.inc
-
-PR = "r1"
-
-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.bb b/packages/wireless-tools/wireless-tools_28.bb
deleted file mode 100644
index 92a49daae2..0000000000
--- a/packages/wireless-tools/wireless-tools_28.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-}