[PATCH] wireless-crda: port to libnl3

[Tim Gardner]

On 08/08/2011 10:20 AM, Colin Watson wrote:
> This patch ports wireless-crda to libnl3.
>
> The rationale is that we want to have only one version of any given
> library in main, and since the current version of wpasupplicant in
> unstable (which I've just synced into oneiric in order to support WPA in
> d-i) uses libnl3, this makes it desirable for us to port everything else
> in main too.
>
> Incidentally, neither
> http://kernel.ubuntu.com/git?p=rtg/wireless-crda.git nor
> http://kernel.ubuntu.com/git?p=ubuntu/wireless-crda.git seems to be up
> to date with the current version in the archive, and debian/control
> lists a URL (http://kernel.ubuntu.com/git-repos/rtg/wireless-crda.git)
> which doesn't work when passed to 'git clone'.  It would be nice to have
> working Vcs-Git and Vcs-Browser fields here.
>
> === modified file 'Makefile'
> --- Makefile	2010-02-23 15:46:55 +0000
> +++ Makefile	2011-08-08 16:10:47 +0000
> @@ -47,6 +47,7 @@ INSTALL ?= install
>
>   NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1&&  echo Y)
>   NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0&&  echo Y)
> +NL3FOUND := $(shell pkg-config --atleast-version=3 libnl-3.0&&  echo Y)
>
>   ifeq ($(NL1FOUND),Y)
>   NLLIBNAME = libnl-1
> @@ -58,6 +59,12 @@ NLLIBS += -lnl-genl
>   NLLIBNAME = libnl-2.0
>   endif
>
> +ifeq ($(NL3FOUND),Y)
> +CFLAGS += -DCONFIG_LIBNL20
> +NLLIBS += -lnl-genl
> +NLLIBNAME = libnl-3.0
> +endif
> +
>   ifeq ($(NLLIBNAME),)
>   $(error Cannot find development files for any supported version of libnl)
>   endif
>
> === modified file 'debian/changelog'
> --- debian/changelog	2010-11-29 09:04:56 +0000
> +++ debian/changelog	2011-08-08 16:11:45 +0000
> @@ -1,3 +1,9 @@
> +wireless-crda (1.14) UNRELEASED; urgency=low
> +
> +  * Port to libnl3.
> +
> + -- Colin Watson<cjwatson at ubuntu.com>   Mon, 08 Aug 2011 17:11:42 +0100
> +
>   wireless-crda (1.13) natty; urgency=low
>
>     * Updated wireless-regdb to master-2010-11-24
>
> === modified file 'debian/control'
> --- debian/control	2009-03-10 16:49:38 +0000
> +++ debian/control	2011-08-08 16:11:37 +0000
> @@ -3,7 +3,7 @@ Section: admin
>   Priority: optional
>   Maintainer: Ubuntu Kernel Team<kernel-team at lists.ubuntu.com>
>   Standards-Version: 3.6.2.1
> -Build-Depends: debhelper (>= 5.0.0), pkg-config, libgcrypt11-dev, libnl-dev
> +Build-Depends: debhelper (>= 5.0.0), pkg-config, libgcrypt11-dev, libnl3-dev
>   Vcs-Git: http://kernel.ubuntu.com/git-repos/rtg/wireless-crda.git
>
>   Package: wireless-crda
>
> Thanks,
>

wireless-crda is a combination of 2 upstream repositories which can be a 
little confusing. I've fixed the Vcs-Git information in debian/control, 
but you also must have the correct branch checked out. For example,

git clone git://kernel.ubuntu.com/ubuntu/wireless-crda.git
git checkout -b oneiric remotes/origin/oneiric

How about the 2 attached patches for the oneiric branch libnl-3.0 
support? I'll see about getting these changes propagated upstream.

rtg
-- 
Tim Gardner tim.gardner at canonical.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Add-support-for-libnl-3.0.patch
Type: text/x-patch
Size: 2338 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20110808/c5c9b359/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Ubuntu-1.14.patch
Type: text/x-patch
Size: 5256 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20110808/c5c9b359/attachment-0001.bin>