| Message ID | 4E401A88.2050202@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Aug 08, 2011 at 11:19:04AM -0600, Tim Gardner wrote: > 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@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@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@canonical.com > From 6c38ee86044366f08799d1bac98b6c2f120f9115 Mon Sep 17 00:00:00 2001 > From: Tim Gardner <tim.gardner@canonical.com> > Date: Mon, 8 Aug 2011 10:52:59 -0600 > Subject: [PATCH 1/2] Add support for libnl-3.0 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > Makefile | 21 ++++++++++++++------- > crda.c | 4 ++-- > debian/control | 2 +- > 3 files changed, 17 insertions(+), 10 deletions(-) > > diff --git a/Makefile b/Makefile > index b8bc7d3..084d8e5 100644 > --- a/Makefile > +++ b/Makefile > @@ -47,15 +47,22 @@ 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 > -endif > - > -ifeq ($(NL2FOUND),Y) > -CFLAGS += -DCONFIG_LIBNL20 > +ifeq ($(NL3FOUND),Y) > +CFLAGS += -DCONFIG_LIBNL30 > NLLIBS += -lnl-genl > -NLLIBNAME = libnl-2.0 > +NLLIBNAME = libnl-3.0 > +else > + ifeq ($(NL2FOUND),Y) > + CFLAGS += -DCONFIG_LIBNL20 > + NLLIBS += -lnl-genl > + NLLIBNAME = libnl-2.0 > + else > + ifeq ($(NL1FOUND),Y) > + NLLIBNAME = libnl-1 > + endif > + endif The indentation here seem a little odd in the 2.0 section? > endif > > ifeq ($(NLLIBNAME),) > diff --git a/crda.c b/crda.c > index d2ba29a..6857e3f 100644 > --- a/crda.c > +++ b/crda.c > @@ -21,7 +21,7 @@ > #include "regdb.h" > #include "reglib.h" > > -#ifndef CONFIG_LIBNL20 > +#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) > /* libnl 2.0 compatibility code */ > static inline struct nl_handle *nl_socket_alloc(void) > { > @@ -44,7 +44,7 @@ static inline int __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache * > > #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache > #define nl_sock nl_handle > -#endif /* CONFIG_LIBNL20 */ > +#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 */ > > struct nl80211_state { > struct nl_sock *nl_sock; > diff --git a/debian/control b/debian/control > index ba0f803..57c7d97 100644 > --- a/debian/control > +++ b/debian/control > @@ -3,7 +3,7 @@ Section: admin > Priority: optional > Maintainer: Ubuntu Kernel Team <kernel-team@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: git://kernel.ubuntu.com/ubuntu/wireless-crda.git > > Package: wireless-crda > -- > 1.7.0.4 > > From 3064250fd65480aaa455cd02008ecbb624ef7d5b Mon Sep 17 00:00:00 2001 > From: Tim Gardner <tim.gardner@canonical.com> > Date: Mon, 8 Aug 2011 10:39:06 -0600 > Subject: [PATCH 2/2] Ubuntu-1.14 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > 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 <tim.gardner@canonical.com> 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 > 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 > > literal 3224 > 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 > VxU+rXl|}D$ZoGT{eGhzc>|bH5>zx1q If I take your word for the binary blob, then overall other than the odd indentation it looks feasable. So for testing: Acked-by: Andy Whitcroft <apw@canonical.com> -apw
On Mon, Aug 08, 2011 at 11:19:04AM -0600, Tim Gardner wrote: > 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. Ah, OK, I may have missed that. > How about the 2 attached patches for the oneiric branch libnl-3.0 > support? I'll see about getting these changes propagated upstream. > >From 6c38ee86044366f08799d1bac98b6c2f120f9115 Mon Sep 17 00:00:00 2001 > From: Tim Gardner <tim.gardner@canonical.com> > Date: Mon, 8 Aug 2011 10:52:59 -0600 > Subject: [PATCH 1/2] Add support for libnl-3.0 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Looks good to me. I don't know that a separate CONFIG_LIBNL30 definition is necessary since it just does the same as CONFIG_LIBNL20, but it also obviously isn't harmful. > >From 3064250fd65480aaa455cd02008ecbb624ef7d5b Mon Sep 17 00:00:00 2001 > From: Tim Gardner <tim.gardner@canonical.com> > Date: Mon, 8 Aug 2011 10:39:06 -0600 > Subject: [PATCH 2/2] Ubuntu-1.14 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > 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 <tim.gardner@canonical.com> Mon, 08 Aug 2011 10:35:36 -0600 > + > wireless-crda (1.13) natty; urgency=low > > * Updated wireless-regdb to master-2010-11-24 I'll take your word for it on this, and the upstream update is fine at this point in the cycle; the libnl3 change should be mentioned in debian/changelog as well, though. Thanks,
On 08/09/2011 06:48 AM, Colin Watson wrote: > On Mon, Aug 08, 2011 at 11:19:04AM -0600, Tim Gardner wrote: >> 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. > > Ah, OK, I may have missed that. > >> How about the 2 attached patches for the oneiric branch libnl-3.0 >> support? I'll see about getting these changes propagated upstream. > >> > From 6c38ee86044366f08799d1bac98b6c2f120f9115 Mon Sep 17 00:00:00 2001 >> From: Tim Gardner<tim.gardner@canonical.com> >> Date: Mon, 8 Aug 2011 10:52:59 -0600 >> Subject: [PATCH 1/2] Add support for libnl-3.0 >> >> Signed-off-by: Tim Gardner<tim.gardner@canonical.com> > > Looks good to me. I don't know that a separate CONFIG_LIBNL30 > definition is necessary since it just does the same as CONFIG_LIBNL20, > but it also obviously isn't harmful. > >> > From 3064250fd65480aaa455cd02008ecbb624ef7d5b Mon Sep 17 00:00:00 2001 >> From: Tim Gardner<tim.gardner@canonical.com> >> Date: Mon, 8 Aug 2011 10:39:06 -0600 >> Subject: [PATCH 2/2] Ubuntu-1.14 >> >> Signed-off-by: Tim Gardner<tim.gardner@canonical.com> >> --- >> 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<tim.gardner@canonical.com> Mon, 08 Aug 2011 10:35:36 -0600 >> + >> wireless-crda (1.13) natty; urgency=low >> >> * Updated wireless-regdb to master-2010-11-24 > > I'll take your word for it on this, and the upstream update is fine at > this point in the cycle; the libnl3 change should be mentioned in > debian/changelog as well, though. > > Thanks, > Done, uploaded.
From 3064250fd65480aaa455cd02008ecbb624ef7d5b Mon Sep 17 00:00:00 2001 From: Tim Gardner <tim.gardner@canonical.com> Date: Mon, 8 Aug 2011 10:39:06 -0600 Subject: [PATCH 2/2] Ubuntu-1.14 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- 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 <tim.gardner@canonical.com> 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 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 literal 3224 zcmZuwe{54#6u#~HOF*2u;EbS4=myFQ_K!&<8Q8vd>$?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&kPSV<w2DJgHHS z?2Yb{KAe*{*3UDdSel!8R#FdsQcw9Q&svNfxPF0Yo==TW#tIAi5=Agt!!R>W5{Weo zTTTFPx(z>uX5CE~_mXQ2zlgPD;0YUgyqm=Ikr5`%CYTM_4a2e&;>W-<O?a*emz%KH zgww#yFuaq6Fx4g84Ubxaa`(e1o)%%^X%UV{#5iEWl!sOZX2cRU^n{T|-j}dhZ{#7~ z4a2hZ;RkxT_TiU!>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!<KeWwKDg@4~WRJsIVK2ctV7p-lV7;&b#Kd94h}(u- z4sdQ$uDRfMsC+il+0ad#3o$#P9YhZ5(*w(c>j75|>jIDeCh_vF6*x1;P;TOkUfQ6; zkchLL1*Tch`3dYVoAyQEwwrRcV4s1e{kn$cTrhz>^@SYP5$xAN<ArsDH)_-ThSa@` zddtC$nKVX!)PvDqAF!b>0o-RgGj!D`L)fULnQEy#1*kQdN7XU()^Qve^EGl9y^Naj zmT-Mr7M!~8f4&QYcR|~OmeR1n|H%<i9D2W@KD}dw$AeR0kNYagJ2W4ug`?0Hm43M| zCcWmXBk#=kl4_rl`yyY1+BZtyulsnf>wK;Uq|fOpzaEt5tvb3vzE+*<_3K>clwK=& zm#*sROQl}ZWqzm2FZ0`5{4(C5`DMH_?dSNsU&h<Bei`p5_9r;ruk!e19(!>>_G8xq zVLlJ2xB%D5Rr)1gT&eo5<i5u$Rlcea$5nA1Ehz8n(1P;5_Ld;W^#{4Xo}i(V^Rs7z za(?!aYFXczsh0i2D_ymkbG6htw2+!(Nc9uqxn)8emkx1UKBW2!srVZCj?PRC&vkAM zzBasfCd_&AVKv9F<Q*Mhna4g6mhb8;536}Z_<s3_x_5;8-WgGKBC5|wJ<la7-^rPa z@*Ml4YR*yaqbRE4qWEgjPd3W$6N&M?w3yU6v>5l5k8vM^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<o;mtKRhQOz@t9@ho;RAlZ`rmokhuE8$RD0vC%?J$ZPT7#|0+Ir zyY=(cn^(M*x<zlkE%oRHYy14oKP@|WdHQDsFQ%V3+`H$s%*LuME$M6C8H+lKD!iTZ zyY5(Rb5y<45uN?j?wY$QuC`qq|1<yKz?C(l`=33x^~BhWlS|I)FKk`^W!aon6WNcC zbRS+D_&szqwYI6cbl#En;Hfq4d&SVST~l_n=V~X$dSCr#R`Af1_cu01w9~cj*B5LW zZYnH0^pV@Xe(I;Uo_V=<Bz5V-r_a=QFU;->&uZSA`z~GP`sH-NUf26yUm01oxFxk> VxU+rXl|}D$ZoGT{eGhzc>|bH5>zx1q -- 1.7.0.4