[oe-commits] org.oe.dev wlan-ng-utils: unify
Laibsch commit
openembedded-commits at lists.openembedded.org
Tue May 15 09:11:27 UTC 2007
wlan-ng-utils: unify
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 21d6858e4e5cc24c11d69ea4de896bb5d3dcf945
ViewMTN: http://monotone.openembedded.org/revision.psp?id=21d6858e4e5cc24c11d69ea4de896bb5d3dcf945
Files:
1
packages/wlan-ng/wlan-ng-utils.inc
packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
packages/wlan-ng/wlan-ng-utils_0.2.3.bb
packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-utils_0.2.7.bb
packages/wlan-ng/wlan-ng-utils_svn.bb
Diffs:
#
# mt diff -r990392a71744fa8ec062ee769a883473775269ee -r21d6858e4e5cc24c11d69ea4de896bb5d3dcf945
#
#
#
# add_file "packages/wlan-ng/wlan-ng-utils.inc"
# content [bcdad0d064990dbfc6a264a7852dd3d71ed5fe3f]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb"
# from [6096b1b06ca1707e9db6cb484321adf735c573fa]
# to [1e9dc87127f307617fe44af03fc256a82223ce9d]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.3.bb"
# from [b4f1e8108a9b6438dfa101c4acf73b6f41b3b941]
# to [1df8fe394ad7e6395a116f90be3fad6b0f80dd9a]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb"
# from [33b9b0a18e8b4817e1e039fd529d1211ac6d1402]
# to [17277cd3d25e45adef8268b44d455323c84846aa]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.7.bb"
# from [4c3ae7b71fae6b28387c57cf2f4653f46869c0e7]
# to [70b39797fde641428519f20aafb4629f35fd7877]
#
# patch "packages/wlan-ng/wlan-ng-utils_svn.bb"
# from [ff329d27d0312c31857ee57d5861d096c11fce58]
# to [f143922414fe20748d67c86ac43627a249810a39]
#
============================================================
--- packages/wlan-ng/wlan-ng-utils.inc bcdad0d064990dbfc6a264a7852dd3d71ed5fe3f
+++ packages/wlan-ng/wlan-ng-utils.inc bcdad0d064990dbfc6a264a7852dd3d71ed5fe3f
@@ -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"
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb 6096b1b06ca1707e9db6cb484321adf735c573fa
+++ packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb 1e9dc87127f307617fe44af03fc256a82223ce9d
@@ -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"
+require wlan-ng-utils.inc
+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
-
- # 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"
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.3.bb b4f1e8108a9b6438dfa101c4acf73b6f41b3b941
+++ packages/wlan-ng/wlan-ng-utils_0.2.3.bb 1df8fe394ad7e6395a116f90be3fad6b0f80dd9a
@@ -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://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"
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb 33b9b0a18e8b4817e1e039fd529d1211ac6d1402
+++ packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb 17277cd3d25e45adef8268b44d455323c84846aa
@@ -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 @@ S = "${WORKDIR}/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"
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.7.bb 4c3ae7b71fae6b28387c57cf2f4653f46869c0e7
+++ packages/wlan-ng/wlan-ng-utils_0.2.7.bb 70b39797fde641428519f20aafb4629f35fd7877
@@ -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://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"
============================================================
--- packages/wlan-ng/wlan-ng-utils_svn.bb ff329d27d0312c31857ee57d5861d096c11fce58
+++ packages/wlan-ng/wlan-ng-utils_svn.bb f143922414fe20748d67c86ac43627a249810a39
@@ -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 @@ S = "${WORKDIR}/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%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list