wlan-ng-utils: unify

6 files changed, 77 insertions, 308 deletions

diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc
new file mode 100644
index 0000000000..bfd2ce377c
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils.inc
@@ -0,0 +1,65 @@
+DESCRIPTION = "linux-wlan-ng userland utilities"
+HOMEPAGE = "http://www.linux-wlan.org"
+SECTION = "kernel/userland"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+
+SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+	file://only-the-utils.patch;patch=1 \
+	file://wlan-ng.modutils \
+	file://wlan.agent \
+	file://usbctl \
+	file://resume \
+	file://pre-up \
+	file://post-down \
+	file://config.in"
+
+# yeah, it's kind of backwards, but otherwise the config step will fail
+inherit module
+
+do_configure() {
+	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
+	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
+
+        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
+                echo "PRISM2_PCMCIA=y"          >> config.mk
+                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
+        fi
+        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
+	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
+        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
+	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
+        echo "RC_DIR=${sysconfdir}/"             >> config.mk
+	echo "CC=${CC}"			>> config.mk
+	echo "LD=${LD}"			>> config.mk
+
+	# Shut up, you broken buildsystem
+	install -m 0655 config.mk src/prism2/config.mk
+	install -d src/prism2/driver/include
+	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
+	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
+}
+
+do_compile() {
+	oe_runmake all
+}
+
+do_install() {
+	oe_runmake install
+	mkdir -p ${D}${sysconfdir}/modutils/
+	mkdir -p ${D}${sysconfdir}/hotplug/
+	mkdir -p ${D}${base_sbindir}/
+	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
+	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
+	install -d ${D}${sysconfdir}/network/if-post-down.d
+	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
+	install -d ${D}${sysconfdir}/apm/resume.d
+	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
+	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
+	install -d ${D}${mandir}/man1
+	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
+}
+
+FILES_${PN} = "/etc /sbin"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
index 7fd9844e7d..9ac5348a98 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
@@ -1,67 +1,3 @@
-DESCRIPTION = "linux-wlan-ng userland utilities"
-HOMEPAGE = "http://www.linux-wlan.org"
-SECTION = "kernel/userland"
-DEPENDS = "virtual/kernel"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-	file://only-the-utils.patch;patch=1 \
-	file://wlan-ng.modutils \
-	file://wlan.agent \
-	file://usbctl \
-	file://resume \
-	file://pre-up \
-	file://post-down \
-	file://config.in"
-S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
-# yeah, it's kind of backwards, but otherwise the config step will fail
-inherit module
-
-do_configure() {
-	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
-	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
-
-        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
-                echo "PRISM2_PCMCIA=y"          >> config.mk
-                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
-        fi
-        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
-	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
-        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
-	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
-        echo "RC_DIR=${sysconfdir}/"             >> config.mk
-	echo "CC=${CC}"			>> config.mk
-	echo "LD=${LD}"			>> config.mk
+require wlan-ng-utils.inc
 
-	# Shut up, you broken buildsystem
-	install -m 0655 config.mk src/prism2/config.mk
-	install -d src/prism2/driver/include
-	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
-	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
-}
-
-do_compile() {
-	oe_runmake all
-}
-
-do_install() {
-	oe_runmake install
-	mkdir -p ${D}${sysconfdir}/modutils/
-	mkdir -p ${D}${sysconfdir}/hotplug/
-	mkdir -p ${D}${base_sbindir}/
-	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
-	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
-	install -d ${D}${sysconfdir}/network/if-post-down.d
-	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
-	install -d ${D}${sysconfdir}/apm/resume.d
-	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
-	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
-	install -d ${D}${mandir}/man1
-	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
-}
-
-FILES_${PN} = "/etc /sbin"
+PR = "r1"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
index 6206bbbbf5..d4e0a39c70 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
@@ -1,70 +1,7 @@
-DESCRIPTION = "linux-wlan-ng userland utilities"
-HOMEPAGE = "http://www.linux-wlan.org"
-SECTION = "kernel/userland"
-DEPENDS = "virtual/kernel"
-LICENSE = "GPL"
+require wlan-ng-utils.inc
+
 PR = "r2"
 
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-	file://only-the-utils.patch;patch=1 \
-	file://scripts-makefile-hostcc.patch;patch=1 \
+SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
 	file://pcmciasrc.patch;patch=1 \
-	file://hostldflags.patch;patch=1 \
-	file://wlan-ng.modutils \
-	file://wlan.agent \
-	file://usbctl \
-	file://resume \
-	file://pre-up \
-	file://post-down \
-	file://config.in"
-S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
-# yeah, it's kind of backwards, but otherwise the config step will fail
-inherit module
-
-do_configure() {
-	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
-	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
-
-        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
-                echo "PRISM2_PCMCIA=y"          >> config.mk
-                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
-        fi
-        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
-	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
-        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
-	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
-        echo "RC_DIR=${sysconfdir}/"             >> config.mk
-	echo "CC=${CC}"			>> config.mk
-	echo "LD=${LD}"			>> config.mk
-
-	# Shut up, you broken buildsystem
-	install -m 0655 config.mk src/prism2/config.mk
-	install -d src/prism2/driver/include
-	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
-	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
-}
-
-do_compile() {
-	oe_runmake all
-}
-
-do_install() {
-	oe_runmake install
-	mkdir -p ${D}${sysconfdir}/modutils/
-	mkdir -p ${D}${sysconfdir}/hotplug/
-	mkdir -p ${D}${base_sbindir}/
-	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
-	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
-	install -d ${D}${sysconfdir}/network/if-post-down.d
-	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
-	install -d ${D}${sysconfdir}/apm/resume.d
-	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
-	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
-	install -d ${D}${mandir}/man1
-	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
-}
-
-FILES_${PN} = "/etc /sbin"
+	file://hostldflags.patch;patch=1"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
index 27cb04e97f..f71a2ee34a 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
@@ -1,8 +1,4 @@
-DESCRIPTION = "linux-wlan-ng userland utilities"
-HOMEPAGE = "http://www.linux-wlan.org"
-SECTION = "kernel/userland"
-DEPENDS = "virtual/kernel"
-LICENSE = "GPL"
+require wlan-ng-utils.inc
 
 SRCDATE = "20060823"
 PV = "0.2.4+svn${SRCDATE}"
@@ -20,53 +16,3 @@ SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
 	file://post-down \
 	file://config.in"
 S = "${WORKDIR}/trunk"
-
-# yeah, it's kind of backwards, but otherwise the config step will fail
-inherit module
-
-do_configure() {
-	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
-	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
-
-        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
-                echo "PRISM2_PCMCIA=y"          >> config.mk
-                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
-        fi
-        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
-	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
-        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
-	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
-        echo "RC_DIR=${sysconfdir}/"             >> config.mk
-	echo "CC=${CC}"			>> config.mk
-	echo "LD=${LD}"			>> config.mk
-
-	# Shut up, you broken buildsystem
-	install -m 0655 config.mk src/prism2/config.mk
-	install -d src/prism2/driver/include
-	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
-	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
-}
-
-do_compile() {
-	oe_runmake all
-}
-
-do_install() {
-	oe_runmake install
-	mkdir -p ${D}${sysconfdir}/modutils/
-	mkdir -p ${D}${sysconfdir}/hotplug/
-	mkdir -p ${D}${base_sbindir}/
-	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
-	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
-	install -d ${D}${sysconfdir}/network/if-post-down.d
-	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
-	install -d ${D}${sysconfdir}/apm/resume.d
-	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
-	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
-	install -d ${D}${mandir}/man1
-	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
-}
-
-FILES_${PN} = "/etc /sbin"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
index 929f67fe16..da76ea36f7 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
@@ -1,69 +1,5 @@
-DESCRIPTION = "linux-wlan-ng userland utilities"
-HOMEPAGE = "http://www.linux-wlan.org"
-SECTION = "kernel/userland"
-DEPENDS = "virtual/kernel"
-LICENSE = "GPL"
+require wlan-ng-utils.inc
 
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-	file://only-the-utils.patch;patch=1 \
-	file://scripts-makefile-hostcc.patch;patch=1 \
+SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
 	file://pcmciasrc.patch;patch=1 \
-	file://hostldflags.patch;patch=1 \
-	file://wlan-ng.modutils \
-	file://wlan.agent \
-	file://usbctl \
-	file://resume \
-	file://pre-up \
-	file://post-down \
-	file://config.in"
-S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
-# yeah, it's kind of backwards, but otherwise the config step will fail
-inherit module
-
-do_configure() {
-	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
-	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
-
-        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
-                echo "PRISM2_PCMCIA=y"          >> config.mk
-                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
-        fi
-        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
-	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
-        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
-	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
-        echo "RC_DIR=${sysconfdir}/"             >> config.mk
-	echo "CC=${CC}"			>> config.mk
-	echo "LD=${LD}"			>> config.mk
-
-	# Shut up, you broken buildsystem
-	install -m 0655 config.mk src/prism2/config.mk
-	install -d src/prism2/driver/include
-	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
-	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
-}
-
-do_compile() {
-	oe_runmake all
-}
-
-do_install() {
-	oe_runmake install
-	mkdir -p ${D}${sysconfdir}/modutils/
-	mkdir -p ${D}${sysconfdir}/hotplug/
-	mkdir -p ${D}${base_sbindir}/
-	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
-	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
-	install -d ${D}${sysconfdir}/network/if-post-down.d
-	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
-	install -d ${D}${sysconfdir}/apm/resume.d
-	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
-	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
-	install -d ${D}${mandir}/man1
-	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
-}
-
-FILES_${PN} = "/etc /sbin"
+	file://hostldflags.patch;patch=1"
diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
index c85779abc2..fae48545ff 100644
--- a/packages/wlan-ng/wlan-ng-utils_svn.bb
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -1,8 +1,5 @@
-DESCRIPTION = "linux-wlan-ng userland utilities"
-HOMEPAGE = "http://www.linux-wlan.org"
-SECTION = "kernel/userland"
-DEPENDS = "virtual/kernel"
-LICENSE = "GPL"
+require wlan-ng-utils.inc
+
 PR = "r2"
 PV = "0.2.4+svn${SRCDATE}"
 
@@ -20,54 +17,6 @@ SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
 	file://config.in"
 S = "${WORKDIR}/trunk"
 
-# yeah, it's kind of backwards, but otherwise the config step will fail
-inherit module
-
-do_configure() {
-	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
-	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
-
-        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
-                echo "PRISM2_PCMCIA=y"          >> config.mk
-                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
-        fi
-        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
-	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
-        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
-	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
-        echo "RC_DIR=${sysconfdir}/"             >> config.mk
-	echo "CC=${CC}"			>> config.mk
-	echo "LD=${LD}"			>> config.mk
-
-	# Shut up, you broken buildsystem
-	install -m 0655 config.mk src/prism2/config.mk
-	install -d src/prism2/driver/include
-	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
-	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
-}
-
-do_compile() {
-	oe_runmake all
-}
-
-do_install() {
-	oe_runmake install
-	mkdir -p ${D}${sysconfdir}/modutils/
-	mkdir -p ${D}${sysconfdir}/hotplug/
-	mkdir -p ${D}${base_sbindir}/
-	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
-	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
-	install -d ${D}${sysconfdir}/network/if-post-down.d
-	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
-	install -d ${D}${sysconfdir}/apm/resume.d
-	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
-	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
-	install -d ${D}${mandir}/man1
-	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
-}
-
 FILES_${PN} = "/etc /sbin"
 
 DEFAULT_PREFERENCE = "-1"