| Message ID | 1291147799-4063-2-git-send-email-apw@canonical.com |
|---|---|
| State | Rejected |
| Delegated to: | Tim Gardner |
| Headers | show |
On 11/30/2010 01:09 PM, Andy Whitcroft wrote: > It seems that when linux-backports-modules-wireless was converted > to linux-backports-modules-compat-wireless-2.6.36 that generic-pae > was missed from the mix. Add support there. > > Signed-off-by: Andy Whitcroft<apw@canonical.com> > --- > meta-source/debian/changelog | 8 ++++++++ > meta-source/debian/control.d/generic-pae | 16 ++++++++++++++++ > 2 files changed, 24 insertions(+), 0 deletions(-) > > diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog > index f1f3db5..c7d8654 100644 > --- a/meta-source/debian/changelog > +++ b/meta-source/debian/changelog > @@ -1,3 +1,11 @@ > +linux-meta (2.6.35.23.27) UNRELEASED; urgency=low > + > + [ Andy Whitcroft ] > + > + * Add compat-wireless-2.6.36/37 support for generic-pae. > + > + -- Andy Whitcroft<apw@canonical.com> Fri, 26 Nov 2010 14:33:46 +0000 > + > linux-meta (2.6.35.23.26) maverick-proposed; urgency=low > > [ Leann Ogasawara ] > diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae > index c735ebc..c95f1b2 100644 > --- a/meta-source/debian/control.d/generic-pae > +++ b/meta-source/debian/control.d/generic-pae > @@ -60,6 +60,22 @@ Description: Backported input drivers for generic-pae kernel image > This empty package allows people to keep their backported input modules > up-to-date when upgrading their Linux kernel. > > +Package: linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic-pae > +Architecture: amd64 i386 > +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic-pae > +#Conflicts: linux-backports-modules-compat-wireless-2.6.37-RELEASE_NAME-generic-pae > +Description: Backported wireless drivers for generic-pae kernel image. > + This empty package allows people to keep their backported wireless modules > + up-to-date when upgrading their Linux kernel. > + > +#Package: linux-backports-modules-compat-wireless-2.6.37-RELEASE_NAME-generic-pae > +#Architecture: amd64 i386 > +#Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.37-${kernel-abi-version}-generic-pae > +#Conflicts: linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic-pae > +#Description: Backported wireless drivers for generic-pae kernel image. > +# This empty package allows people to keep their backported wireless modules > +# up-to-date when upgrading their Linux kernel. > + > Package: linux-backports-modules-media-RELEASE_NAME-generic-pae > Architecture: i386 > Depends: ${misc:Depends}, linux-backports-modules-media-${kernel-abi-version}-generic-pae Acked-by: Tim Gardner <tim.gardner@canonical.com>
diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog index f1f3db5..c7d8654 100644 --- a/meta-source/debian/changelog +++ b/meta-source/debian/changelog @@ -1,3 +1,11 @@ +linux-meta (2.6.35.23.27) UNRELEASED; urgency=low + + [ Andy Whitcroft ] + + * Add compat-wireless-2.6.36/37 support for generic-pae. + + -- Andy Whitcroft <apw@canonical.com> Fri, 26 Nov 2010 14:33:46 +0000 + linux-meta (2.6.35.23.26) maverick-proposed; urgency=low [ Leann Ogasawara ] diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae index c735ebc..c95f1b2 100644 --- a/meta-source/debian/control.d/generic-pae +++ b/meta-source/debian/control.d/generic-pae @@ -60,6 +60,22 @@ Description: Backported input drivers for generic-pae kernel image This empty package allows people to keep their backported input modules up-to-date when upgrading their Linux kernel. +Package: linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic-pae +Architecture: amd64 i386 +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic-pae +#Conflicts: linux-backports-modules-compat-wireless-2.6.37-RELEASE_NAME-generic-pae +Description: Backported wireless drivers for generic-pae kernel image. + This empty package allows people to keep their backported wireless modules + up-to-date when upgrading their Linux kernel. + +#Package: linux-backports-modules-compat-wireless-2.6.37-RELEASE_NAME-generic-pae +#Architecture: amd64 i386 +#Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.37-${kernel-abi-version}-generic-pae +#Conflicts: linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic-pae +#Description: Backported wireless drivers for generic-pae kernel image. +# This empty package allows people to keep their backported wireless modules +# up-to-date when upgrading their Linux kernel. + Package: linux-backports-modules-media-RELEASE_NAME-generic-pae Architecture: i386 Depends: ${misc:Depends}, linux-backports-modules-media-${kernel-abi-version}-generic-pae
It seems that when linux-backports-modules-wireless was converted to linux-backports-modules-compat-wireless-2.6.36 that generic-pae was missed from the mix. Add support there. Signed-off-by: Andy Whitcroft <apw@canonical.com> --- meta-source/debian/changelog | 8 ++++++++ meta-source/debian/control.d/generic-pae | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-)