[OE stablebranch] [Review] wlan-ng update and clean-up
Koen Kooi
k.kooi at student.utwente.nl
Sat Jun 7 12:59:13 CEST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 7 jun 2008, om 12:21 heeft Gordon het volgende geschreven:
> To finish up my previous wlan-ng backport request, the attached
> patch uses SRCREV instead of SRCDATE and cleaned up obsolete wlan-ng
> recipes. 0.2.8+svnr1859 is needed to support 2.6.24 kernel. It's
> part of the effort to unbreak tosa image building problem in the
> stable branch. Close oebug 4108.
>
> Regards
> Gordon
>
Acked-by: Koen Kooi <koen at openembedded.org>
> #
> # old_revision [bd4ba2fd71050052f29fee21732babadd8567208]
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-
> compat.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-
> modules.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.3"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.3/config.in"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.3/
> module_param_array.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.3/modules-
> symvers.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-
> modules.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.3/
> prism2sta_commsqual_defer.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-
> the-modules.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-
> the-modules.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/
> config.in"
> #
> # delete "packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-
> the-modules.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb"
> #
> # delete "packages/wlan-ng/wlan-ng-modules_0.2.3.bb"
> #
> # delete "packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb"
> #
> # delete "packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb"
> #
> # delete "packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.1-pre26"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-
> utils.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.2"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.2/config.in"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.3"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.3/config.in"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-
> utils.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.8"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.8/config.in"
> #
> # delete "packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch"
> #
> # delete "packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb"
> #
> # delete "packages/wlan-ng/wlan-ng-utils_0.2.3.bb"
> #
> # delete "packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb"
> #
> # delete "packages/wlan-ng/wlan-ng-utils_0.2.8.bb"
> #
> # add_dir "packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859"
> #
> # add_dir "packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859"
> #
> # patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
> # from [b91b7a7f1be5fe7327adabc18f0ef5ed4b4a987a]
> # to [1a6b5174cc8c8b6b9f88dbc9d762e00b25819003]
> #
> # patch "conf/distro/include/sane-srcrevs.inc"
> # from [50a2b7673fcd47b11feb3fa45dabecffc61729af]
> # to [bc33c5e53ea68fa478207349af4ea3f9d2f2b4d2]
> #
> # patch "packages/wlan-ng/wlan-ng-modules.inc"
> # from [9134e81b8d389adc85a6e6a3f9f91bce36faeafc]
> # to [fb6cba86430c37eeb3877b759dac9935a5ff0eb8]
> #
> # patch "packages/wlan-ng/wlan-ng-modules_0.2.7.bb"
> # from [eaf518590d6acebdd35fcd19d1ce91cc2c6fc805]
> # to [b948b5f25ed94937cfaca544748e05efe4362dc3]
> #
> # patch "packages/wlan-ng/wlan-ng-modules_svn.bb"
> # from [81e83b49cc5c22b8e3737339843390121d244a92]
> # to [214da073b32005432328903505585d05bd521bed]
> #
> # patch "packages/wlan-ng/wlan-ng-utils.inc"
> # from [e2a62370e4e850b3d5a933dac0793eb3d35ead6a]
> # to [ad0d62aa6cde077f31e564df80a5ae28f73fe158]
> #
> # patch "packages/wlan-ng/wlan-ng-utils_0.2.7.bb"
> # from [4ce418904c8b39baad69268f821d8b0881701394]
> # to [04f0321c3bb2e745fcc22b3d74f7d4e4cb58ffb7]
> #
> # patch "packages/wlan-ng/wlan-ng-utils_svn.bb"
> # from [f143922414fe20748d67c86ac43627a249810a39]
> # to [43750c8158cacd3eea5fd30f1c2e13144160a927]
> #
> ============================================================
> --- conf/distro/include/angstrom-2007-preferred-versions.inc
> b91b7a7f1be5fe7327adabc18f0ef5ed4b4a987a
> +++ conf/distro/include/angstrom-2007-preferred-versions.inc
> 1a6b5174cc8c8b6b9f88dbc9d762e00b25819003
> @@ -1954,8 +1954,8 @@ PREFERRED_VERSION_wireshark ?= "0.99.4"
> PREFERRED_VERSION_win4 ?= "1.0.1"
> PREFERRED_VERSION_windowswmproto ?= "1.0.3"
> PREFERRED_VERSION_wireshark ?= "0.99.4"
> -PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
> -PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
> +PREFERRED_VERSION_wlan-ng-modules ?= "0.2.8"
> +PREFERRED_VERSION_wlan-ng-utils ?= "0.2.8"
> PREFERRED_VERSION_wmctrl ?= "1.07"
> PREFERRED_VERSION_wpa-gui ?= "0.4.8"
> PREFERRED_VERSION_wpa-supplicant ?= "0.5.5"
> ============================================================
> --- conf/distro/include/sane-srcrevs.inc
> 50a2b7673fcd47b11feb3fa45dabecffc61729af
> +++ conf/distro/include/sane-srcrevs.inc
> bc33c5e53ea68fa478207349af4ea3f9d2f2b4d2
> @@ -127,6 +127,8 @@ SRCREV_pn-wesnoth ?= "22021"
> SRCREV_pn-webkit-qt ?= "28656"
> SRCREV_pn-webkit-qtopia ?= "28656"
> SRCREV_pn-wesnoth ?= "22021"
> +SRCREV_pn-wlan-ng-modules ?= "1859"
> +SRCREV_pn-wlan-ng-utils ?= "1859"
> SRCREV_pn-xoo ?= "1623"
> SRCREV_pn-mplayer ?= "24587"
> SRCREV_pn-networkmanager ?= "2887"
> ============================================================
> --- packages/wlan-ng/wlan-ng-modules.inc
> 9134e81b8d389adc85a6e6a3f9f91bce36faeafc
> +++ packages/wlan-ng/wlan-ng-modules.inc
> fb6cba86430c37eeb3877b759dac9935a5ff0eb8
> @@ -1,9 +1,7 @@ DEPENDS = "virtual/kernel"
> DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb)
> driver for 11Mbps wireless lan cards"
> HOMEPAGE = "http://www.linux-wlan.org"
> SECTION = "kernel/modules"
> DEPENDS = "virtual/kernel"
> -RRECOMMENDS = "wlan-ng-utils"
> -RPROVIDES += "wlan-ng-modules-usb"
> LICENSE = "GPL"
>
> SRC_URI = "file://no-compat.patch;patch=1 \
> @@ -55,15 +53,22 @@ do_install() {
> # Listen closely... sssshhh... can you hear the wlan-ng
> build system suck?
> rm -f ${KERNEL_SOURCE}/../config.mk
> rm -f ${KERNEL_SOURCE}/../../config.mk
> +
> + # man page and configure scripts are shipped by wlan-ng-utils
> + rm -rf ${D}/usr/local/man
> + rm -rf ${D}/etc
> }
>
> -PACKAGES = "${PN}-dbg wlan-ng-modules-usb wlan-ng-modules-cs wlan-
> ng-modules-pci wlan-ng-modules-p80211"
> -FILES_wlan-ng-modules-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-
> ng/p80211${KERNEL_OBJECT_SUFFIX}"
> -FILES_wlan-ng-modules-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/
> prism2_usb${KERNEL_OBJECT_SUFFIX}"
> -FILES_wlan-ng-modules-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/
> prism2_cs${KERNEL_OBJECT_SUFFIX}"
> -FILES_wlan-ng-modules-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/
> prism2_pci${KERNEL_OBJECT_SUFFIX} \
> +PACKAGES =+ "${PN}-p80211 ${PN}-usb ${PN}-cs ${PN}-pci"
> +ALLOW_EMPTY_${PN} = "1"
> +FILES_${PN}-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211$
> {KERNEL_OBJECT_SUFFIX}"
> +FILES_${PN}-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb
> ${KERNEL_OBJECT_SUFFIX}"
> +FILES_${PN}-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs$
> {KERNEL_OBJECT_SUFFIX}"
> +FILES_${PN}-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci
> ${KERNEL_OBJECT_SUFFIX} \
> /lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_plx$
> {KERNEL_OBJECT_SUFFIX}"
> +
> +RDEPENDS_${PN}-p80211 = "wlan-ng-utils"
> +RDEPENDS_${PN} = "${PN}-p80211"
> +RDEPENDS_${PN}-usb = "${PN}-p80211"
> +RDEPENDS_${PN}-cs = "${PN}-p80211"
> +RDEPENDS_${PN}-pci = "${PN}-p80211"
> -RDEPENDS_wlan-ng-modules-p80211 = "wlan-ng-utils"
> -RDEPENDS_wlan-ng-modules-usb = "wlan-ng-modules-p80211"
> -RDEPENDS_wlan-ng-modules-cs = "wlan-ng-modules-p80211"
> -RDEPENDS_wlan-ng-modules-pci = "wlan-ng-modules-p80211"
> ============================================================
> --- packages/wlan-ng/wlan-ng-modules_0.2.7.bb
> eaf518590d6acebdd35fcd19d1ce91cc2c6fc805
> +++ packages/wlan-ng/wlan-ng-modules_0.2.7.bb
> b948b5f25ed94937cfaca544748e05efe4362dc3
> @@ -1,6 +1,6 @@ require wlan-ng-modules.inc
> require wlan-ng-modules.inc
>
> -PR = "r1"
> +PR = "r2"
>
> SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-
> ${PV}.tar.bz2 \
> file://2.6.22-fixes.patch;patch=1"
> ============================================================
> --- packages/wlan-ng/wlan-ng-modules_svn.bb
> 81e83b49cc5c22b8e3737339843390121d244a92
> +++ packages/wlan-ng/wlan-ng-modules_svn.bb
> 214da073b32005432328903505585d05bd521bed
> @@ -1,10 +1,9 @@ require wlan-ng-modules.inc
> require wlan-ng-modules.inc
> +
> PR = "r0"
> -PV = "0.2.4+svn${SRCDATE}"
>
> +PV = "0.2.8+svnr${SRCREV}"
> +
> SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
> +
> S = "${WORKDIR}/trunk"
> -
> -DEFAULT_PREFERENCE = "-1"
> -
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/$
> {PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/
> wlan-ng-modules' ], d)}"
> ============================================================
> --- packages/wlan-ng/wlan-ng-utils.inc
> e2a62370e4e850b3d5a933dac0793eb3d35ead6a
> +++ packages/wlan-ng/wlan-ng-utils.inc
> ad0d62aa6cde077f31e564df80a5ae28f73fe158
> @@ -1,12 +1,10 @@ DEPENDS = "virtual/kernel"
> DESCRIPTION = "linux-wlan-ng userland utilities"
> HOMEPAGE = "http://www.linux-wlan.org"
> SECTION = "kernel/userland"
> LICENSE = "GPL"
> DEPENDS = "virtual/kernel"
> -S = "${WORKDIR}/linux-wlan-ng-${PV}"
>
> -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-
> ${PV}.tar.bz2 \
> - file://only-the-utils.patch;patch=1 \
> +SRC_URI = "file://only-the-utils.patch;patch=1 \
> file://wlan-ng.modutils \
> file://wlan.agent \
> file://usbctl \
> @@ -61,8 +59,8 @@ do_install() {
> install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
> install -d ${D}${mandir}/man1
> install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
> + rm -rf ${D}/usr/local/man
> }
>
> -FILES_${PN}-doc += "/usr/local/man"
> FILES_${PN}-dbg += "/sbin/.debug"
> FILES_${PN} = "/etc /sbin"
> ============================================================
> --- packages/wlan-ng/wlan-ng-utils_0.2.7.bb
> 4ce418904c8b39baad69268f821d8b0881701394
> +++ packages/wlan-ng/wlan-ng-utils_0.2.7.bb
> 04f0321c3bb2e745fcc22b3d74f7d4e4cb58ffb7
> @@ -1,7 +1,10 @@ require wlan-ng-utils.inc
> require wlan-ng-utils.inc
>
> -SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
> +SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-$
> {PV}.tar.bz2 \
> + file://scripts-makefile-hostcc.patch;patch=1 \
> file://pcmciasrc.patch;patch=1 \
> file://hostldflags.patch;patch=1"
>
> +S = "${WORKDIR}/linux-wlan-ng-${PV}"
> +
> +PR = "r3"
> -PR = "r1"
> ============================================================
> --- packages/wlan-ng/wlan-ng-utils_svn.bb
> f143922414fe20748d67c86ac43627a249810a39
> +++ packages/wlan-ng/wlan-ng-utils_svn.bb
> 43750c8158cacd3eea5fd30f1c2e13144160a927
> @@ -1,24 +1,12 @@ require wlan-ng-utils.inc
> require wlan-ng-utils.inc
>
> -PR = "r2"
> -PV = "0.2.4+svn${SRCDATE}"
> +PR = "r0"
>
> -SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
> - file://only-the-utils.patch;patch=1 \
> - file://scripts-makefile-hostcc.patch;patch=1 \
> +PV = "0.2.8+svnr${SRCREV}"
> +
> +SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
> + 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}/trunk"
> + file://hostldflags.patch;patch=1"
>
> +S = "${WORKDIR}/trunk"
> -FILES_${PN} = "/etc /sbin"
> -
> -DEFAULT_PREFERENCE = "-1"
> -
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/$
> {PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/
> wlan-ng-utils' ], d)}"
> _______________________________________________
> Openembedded-stablebranch mailing list
> Openembedded-stablebranch at openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFISmoDMkyGM64RGpERAs5DAJ9Jtp6EkZusrV5OqZsyHRObTtYcDACfTSdD
hVJKR2vQ4CGdSOGRrTXrivI=
=LpbS
-----END PGP SIGNATURE-----
More information about the Openembedded-stablebranch
mailing list