From patchwork Mon Aug 8 17:19:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 109011 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id C3A16B6F76 for ; Tue, 9 Aug 2011 03:19:38 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QqTTx-0004hg-6q; Mon, 08 Aug 2011 17:19:17 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QqTTt-0004h4-EH for kernel-team@lists.ubuntu.com; Mon, 08 Aug 2011 17:19:14 +0000 Received: from sepang.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id 94E4F2DEF6E; Mon, 8 Aug 2011 10:18:32 -0700 (PDT) Received: from [127.0.0.1] (lochsa [127.0.0.1]) by sepang.rtg.net (Postfix) with ESMTP id 371D6F89F8; Mon, 8 Aug 2011 11:19:04 -0600 (MDT) Message-ID: <4E401A88.2050202@canonical.com> Date: Mon, 08 Aug 2011 11:19:04 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.18) Gecko/20110617 Thunderbird/3.1.11 MIME-Version: 1.0 To: Colin Watson Subject: Re: [PATCH] wireless-crda: port to libnl3 References: <20110808162038.GE3315@riva.dynamic.greenend.org.uk> In-Reply-To: <20110808162038.GE3315@riva.dynamic.greenend.org.uk> Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 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 > 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 Acked-by: Andy Whitcroft From 3064250fd65480aaa455cd02008ecbb624ef7d5b Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Mon, 8 Aug 2011 10:39:06 -0600 Subject: [PATCH 2/2] Ubuntu-1.14 Signed-off-by: Tim Gardner --- debian/changelog | 9 +++++++++ regulatory.bin | Bin 3224 -> 3268 bytes 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74c97b9..5f79308 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +wireless-crda (1.14) oneiric; urgency=low + + * Updated wireless-regdb to master-2011-04-28 + wireless-regdb: update regulatory.bin based on preceding changes + Update regulatory rules for Netherlands (NL) + regdb: fix moinmoin plugin license + + -- Tim Gardner Mon, 08 Aug 2011 10:35:36 -0600 + wireless-crda (1.13) natty; urgency=low * Updated wireless-regdb to master-2010-11-24 diff --git a/regulatory.bin b/regulatory.bin index ca8ceffb30d113a5e43f921e145b5de59e6e44ea..62b4262db70997beb6a428774fdc5ef73f1f4a3e 100644 GIT binary patch literal 3268 zcmZWo4``HS9DeV1ci*|DjFcL4$RV4awBW?cEEeqUzIk`MKc2hWc2311i!??KvZiJ@ zZIH=KGmTlxq%9G>Yz(y_(+nq>Etq6wuyB>Z>7=HNk~Hl3{oeOGKi3Ptd!P4tpWom2 zyPBZx7eY)I!dZa5RR{|43yeIcZ`k^U@9%tI=OiOdhv!h4u3EtWa&JnS2HJ@5t2 zX@EIbedT3(Pc8l0k2bs^+jF|C#o`?JTxP|ql9|=+RJLUr4WUEKiFAquHmC%1bzd9k~R>9)OWQEyBdpA{=ETv2MZ?hgKWR@Fi^M2_p{oOW3S8;t*d7 zqtyl@4b|3<9lpGJ@Jkx1^8!paVXq03uc0Ad!W}T;ixf8V<=_mB*Mv!L@G6(32^<;X zFjg@w6X2*{=q;PEH!D1XJ*Dto>=g?Z9-Uavi zVROR$#84Wv^?-B9{I)DO)$jkl6@zy|I{?>~NpX!BO)4&Ge<(k_ZH32!TVY@0 ztD@bZ`=Y$NeKFqG`{IhPpgm-(`Ondgpw3G-gR%I9Ckdfm_QHE)39+uH){@6ZG6ueAr*Uvmf8-<}Pyzrzzq zO8*k?z0+0|VBS-u>aOCtwW2B&Z*f@qEtYxoAouIggWRvZ zEhzo6L0R8O(9rSx?AajC&wek&`L#?))}IL}T}aJ2#5#u_R&xxidctyUnXvS053`@< z4y*dY%Dx;*XPk8oJSR9!buv!lGCn(P4YICG1IKaNx_&Ai-PE`6Ou-KAn@tUQ#V5V%tw*N6J3oEsiPmP< zru(jq`k56iW8%GaKOY*{dG15+JKlX;9-aL|SIMobuNLh3)KxrXqWb!m2hMbFSib+Y zzJ?c`{Nw1`-@l((a{Z;^mB%9OC)Nx_U+kRnMnUNGXVb#Eg1pE<}Cd&JTX-Emsd3Itm@fy;Xluv$?6}S=+4)bVer3Fl7-4l1wc` zff!<@q9KIAqC^m9vY06oXINlFB9K&Fq#D#AGnqPNAcRGW@jLh2Hy-FsPS1D0`<);6 z+}FBbKo>&XDTH$veuEGeI9kpu`zhPmyYlR(_CccwL3{GFr{#3<-m#B8#nbs@{5951 zc}2M2&5F_=<3jBAirD$Mh~EP(F!?1(<`c)`qM@W`l8^TlO5CtHEta|_Zj6nUT#p5w z)Bwv`eO{?Aef|K~1z$Q)D9WaLgaEGjtw)3xW`&qjC~?FM9{ms(-a0P%$UvKj{Ea(8 zLpXX6dT654J4E!MF3C^!jGVDIJvZL#?KY`*?-io-XUqk$i47jnu&kPSVW5{Weo zTTTFPx(z>uX5CE~_mXQ2zlgPD;0YUgyqm=Ikr5`%CYTM_4a2e&;>W-g@!K^aiF{2Bw?_rdYz;VP>qEcq5iHMl4~K-_i_BR*ZhglZNnR z_y`R7E$#5F3ZI2fD!c=}Lg7IZrns4kC#>{h=S^5?B(JevVz-JNy{@-(0aGn3OBO$7 zOnO>FFvUw;Bw6MuKdl~^!4o#~MlA8@S-zu92rIVMQ$pB)Z8NbkxSWYAfChco3Sr&Q z*s;ePt;l12PKbg4sA-CauHa!j75|>jIDeCh_vF6*x1;P;TOkUfQ6; zkchLL1*Tch`3dYVoAyQEwwrRcV4s1e{kn$cTrhz>^@SYP5$xAN0o-RgGj!D`L)fULnQEy#1*kQdN7XU()^Qve^EGl9y^Naj zmT-Mr7M!~8f4&QYcR|~OmeR1n|H%wK;Uq|fOpzaEt5tvb3vzE+*<_3K>clwK=& zm#*sROQl}ZWqzm2FZ0`5{4(C5`DMH_?dSNsU&h>_G8xq zVLlJ2xB%D5Rr)1gT&eo55l5k8vM^wdy``{tmKnb&oi|&w)7K zCm-i}`MAm#=X+)2s_qj0PV;rDP968}O>p0Vgqm|g=5?kM>fQ-;j|AVdI3fFX=92t9 zXOjFKjwSg$#*(t0Gn16_w0l!(E-Cp=_TCi7XHxuKw$yXo;d*}8@}+X`%r$acrjg$z zH}Citk1d{kbj!g&uZSA`z~GP`sH-NUf26yUm01oxFxk> VxU+rXl|}D$ZoGT{eGhzc>|bH5>zx1q -- 1.7.0.4