FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 04-29-2010, 03:54 PM
 
Default Lucid LBM pull request, SRU #568782

The following changes since commit 7610a4fd7ecf96d7ecbadde92d9e3511e8ca0929:
Andy Whitcroft (1):
UBUNTU: Lucid ABI 22

are available in the git repository at:

git://kernel.ubuntu.com/rtg/ubuntu-lucid-lbm lp568782

Tim Gardner (1):
UBUNTU: Make compat wireless udev glue unique by ABI

debian/changelog | 2 +-
debian/rules.d/2-binary-arch.mk | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
From 99d36d771562de092d23f921aa3451c55797cf82 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Thu, 29 Apr 2010 15:53:45 +0100
Subject: [PATCH] UBUNTU: Make compat wireless udev glue unique by ABI

BugLink: http://bugs.launchpad.net/bugs/568782

Compat wireless installs a udev helper to load wireless driver
firmware. Since these files collide between LBM packages, rename
them to be unique using the ABI number.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
debian/changelog | 2 +-
debian/rules.d/2-binary-arch.mk | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e949d6..dda638b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-linux-backports-modules-2.6.32 (2.6.32-22.12) UNRELEASED; urgency=low
+linux-backports-modules-2.6.32 (2.6.32-21.12) UNRELEASED; urgency=low

CHANGELOG: Do not edit directly. Autogenerated at release.
CHANGELOG: Use the printchanges target to see the curent changes.
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index e369c44..9c611ea 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -30,10 +30,16 @@ endif
prepare-%: $(stampdir)/stamp-prepare-%
@# Empty for make to be happy
$(stampdir)/stamp-prepare-%: target_flavour = $*
+$(stampdir)/stamp-prepare-%: cw = $(builddir)/build-$*/compat-wireless-2.6
$(stampdir)/stamp-prepare-%: $(confdir)/$(arch)
@echo "Preparing $*..."
install -d $(builddir)/build-$*
cd updates; tar cf - * | tar -C $(builddir)/build-$* -xf -
+ # Gross hackery to make the compat firmware class unique to this ABI
+ sed -i 's/compat_firmware/compat_firmware_'$(abinum)'/g' $(cw)/compat/compat_firmware_class.c $(cw)/compat/scripts/compat_firmware_install
+ $(cw)/udev/ubuntu/50-compat_firmware.rules
+ mv $(cw)/udev/ubuntu/50-compat_firmware.rules $(cw)/udev/ubuntu/50-compat_firmware_$(abinum).rules
+ mv $(cw)/udev/ubuntu/compat_firmware.sh $(cw)/udev/ubuntu/compat_firmware_$(abinum).sh
ifeq ($(do_nouveau_package),true)
$(builddir)/build-$*/MUNGE-NOUVEAU
echo "obj-y += nouveau/" >>$(builddir)/build-$*/Makefile
@@ -59,6 +65,7 @@ $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%

# Install the finished build
install-%: cwpkgdir = $(CURDIR)/debian/linux-backports-modules-wireless-$(release)-$(abinum)-$*
+install-%: cwblddir = $(builddir)/build-$*/compat-wireless-2.6
install-%: cwmoddir = $(cwpkgdir)/lib/modules/$(release)-$(abinum)-$*
install-%: cwsrcdir = $(CURDIR)/updates/compat-wireless-2.6
install-%: cspkgdir = $(CURDIR)/debian/linux-backports-modules-alsa-$(release)-$(abinum)-$*
@@ -107,9 +114,9 @@ install-%: $(stampdir)/stamp-build-%
# the compat_firmware_class has its own rules.
#
install -d $(cwpkgdir)/lib/udev
- install --mode=0755 $(cwsrcdir)/udev/ubuntu/compat_firmware.sh $(cwpkgdir)/lib/udev
+ install --mode=0755 $(cwblddir)/udev/ubuntu/compat_firmware_$(abinum).sh $(cwpkgdir)/lib/udev
install -d $(cwpkgdir)/lib/udev/rules.d
- install --mode=0644 $(cwsrcdir)/udev/ubuntu/50-compat_firmware.rules $(cwpkgdir)/lib/udev/rules.d
+ install --mode=0644 $(cwblddir)/udev/ubuntu/50-compat_firmware_$(abinum).rules $(cwpkgdir)/lib/udev/rules.d

#
# Build the ALSA snapshot packages.
--
1.7.0.4


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 
Old 04-29-2010, 04:19 PM
Andy Whitcroft
 
Default Lucid LBM pull request, SRU #568782

On Thu, Apr 29, 2010 at 09:54:00AM -0600, Tim Gardner wrote:
> The following changes since commit 7610a4fd7ecf96d7ecbadde92d9e3511e8ca0929:
> Andy Whitcroft (1):
> UBUNTU: Lucid ABI 22
>
> are available in the git repository at:
>
> git://kernel.ubuntu.com/rtg/ubuntu-lucid-lbm lp568782
>
> Tim Gardner (1):
> UBUNTU: Make compat wireless udev glue unique by ABI
>
> debian/changelog | 2 +-
> debian/rules.d/2-binary-arch.mk | 11 +++++++++--
> 2 files changed, 10 insertions(+), 3 deletions(-)
> From 99d36d771562de092d23f921aa3451c55797cf82 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Thu, 29 Apr 2010 15:53:45 +0100
> Subject: [PATCH] UBUNTU: Make compat wireless udev glue unique by ABI
>
> BugLink: http://bugs.launchpad.net/bugs/568782
>
> Compat wireless installs a udev helper to load wireless driver
> firmware. Since these files collide between LBM packages, rename
> them to be unique using the ABI number.
>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
> debian/changelog | 2 +-
> debian/rules.d/2-binary-arch.mk | 11 +++++++++--
> 2 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index 7e949d6..dda638b 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,4 +1,4 @@
> -linux-backports-modules-2.6.32 (2.6.32-22.12) UNRELEASED; urgency=low
> +linux-backports-modules-2.6.32 (2.6.32-21.12) UNRELEASED; urgency=low
>
> CHANGELOG: Do not edit directly. Autogenerated at release.
> CHANGELOG: Use the printchanges target to see the curent changes.

I presume this is unintended.

> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index e369c44..9c611ea 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -30,10 +30,16 @@ endif
> prepare-%: $(stampdir)/stamp-prepare-%
> @# Empty for make to be happy
> $(stampdir)/stamp-prepare-%: target_flavour = $*
> +$(stampdir)/stamp-prepare-%: cw = $(builddir)/build-$*/compat-wireless-2.6
> $(stampdir)/stamp-prepare-%: $(confdir)/$(arch)
> @echo "Preparing $*..."
> install -d $(builddir)/build-$*
> cd updates; tar cf - * | tar -C $(builddir)/build-$* -xf -
> + # Gross hackery to make the compat firmware class unique to this ABI
> + sed -i 's/compat_firmware/compat_firmware_'$(abinum)'/g' $(cw)/compat/compat_firmware_class.c $(cw)/compat/scripts/compat_firmware_install
> + $(cw)/udev/ubuntu/50-compat_firmware.rules
> + mv $(cw)/udev/ubuntu/50-compat_firmware.rules $(cw)/udev/ubuntu/50-compat_firmware_$(abinum).rules
> + mv $(cw)/udev/ubuntu/compat_firmware.sh $(cw)/udev/ubuntu/compat_firmware_$(abinum).sh
> ifeq ($(do_nouveau_package),true)
> $(builddir)/build-$*/MUNGE-NOUVEAU
> echo "obj-y += nouveau/" >>$(builddir)/build-$*/Makefile
> @@ -59,6 +65,7 @@ $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
>
> # Install the finished build
> install-%: cwpkgdir = $(CURDIR)/debian/linux-backports-modules-wireless-$(release)-$(abinum)-$*
> +install-%: cwblddir = $(builddir)/build-$*/compat-wireless-2.6
> install-%: cwmoddir = $(cwpkgdir)/lib/modules/$(release)-$(abinum)-$*
> install-%: cwsrcdir = $(CURDIR)/updates/compat-wireless-2.6
> install-%: cspkgdir = $(CURDIR)/debian/linux-backports-modules-alsa-$(release)-$(abinum)-$*
> @@ -107,9 +114,9 @@ install-%: $(stampdir)/stamp-build-%
> # the compat_firmware_class has its own rules.
> #
> install -d $(cwpkgdir)/lib/udev
> - install --mode=0755 $(cwsrcdir)/udev/ubuntu/compat_firmware.sh $(cwpkgdir)/lib/udev
> + install --mode=0755 $(cwblddir)/udev/ubuntu/compat_firmware_$(abinum).sh $(cwpkgdir)/lib/udev
> install -d $(cwpkgdir)/lib/udev/rules.d
> - install --mode=0644 $(cwsrcdir)/udev/ubuntu/50-compat_firmware.rules $(cwpkgdir)/lib/udev/rules.d
> + install --mode=0644 $(cwblddir)/udev/ubuntu/50-compat_firmware_$(abinum).rules $(cwpkgdir)/lib/udev/rules.d
>
> #
> # Build the ALSA snapshot packages.

Nasty bug, vile but reasonable solution to my eye.

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 
Old 04-29-2010, 04:20 PM
Stefan Bader
 
Default Lucid LBM pull request, SRU #568782

Beside the changelog, which is already fixed, it looks ok.

Acked-by: Stefan Bader <stefan.bader@canonical.com>

Tim Gardner wrote:
> The following changes since commit 7610a4fd7ecf96d7ecbadde92d9e3511e8ca0929:
> Andy Whitcroft (1):
> UBUNTU: Lucid ABI 22
>
> are available in the git repository at:
>
> git://kernel.ubuntu.com/rtg/ubuntu-lucid-lbm lp568782
>
> Tim Gardner (1):
> UBUNTU: Make compat wireless udev glue unique by ABI
>
> debian/changelog | 2 +-
> debian/rules.d/2-binary-arch.mk | 11 +++++++++--
> 2 files changed, 10 insertions(+), 3 deletions(-)
> From 99d36d771562de092d23f921aa3451c55797cf82 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Thu, 29 Apr 2010 15:53:45 +0100
> Subject: [PATCH] UBUNTU: Make compat wireless udev glue unique by ABI
>
> BugLink: http://bugs.launchpad.net/bugs/568782
>
> Compat wireless installs a udev helper to load wireless driver
> firmware. Since these files collide between LBM packages, rename
> them to be unique using the ABI number.
>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
> debian/changelog | 2 +-
> debian/rules.d/2-binary-arch.mk | 11 +++++++++--
> 2 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index 7e949d6..dda638b 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,4 +1,4 @@
> -linux-backports-modules-2.6.32 (2.6.32-22.12) UNRELEASED; urgency=low
> +linux-backports-modules-2.6.32 (2.6.32-21.12) UNRELEASED; urgency=low
>
> CHANGELOG: Do not edit directly. Autogenerated at release.
> CHANGELOG: Use the printchanges target to see the curent changes.
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index e369c44..9c611ea 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -30,10 +30,16 @@ endif
> prepare-%: $(stampdir)/stamp-prepare-%
> @# Empty for make to be happy
> $(stampdir)/stamp-prepare-%: target_flavour = $*
> +$(stampdir)/stamp-prepare-%: cw = $(builddir)/build-$*/compat-wireless-2.6
> $(stampdir)/stamp-prepare-%: $(confdir)/$(arch)
> @echo "Preparing $*..."
> install -d $(builddir)/build-$*
> cd updates; tar cf - * | tar -C $(builddir)/build-$* -xf -
> + # Gross hackery to make the compat firmware class unique to this ABI
> + sed -i 's/compat_firmware/compat_firmware_'$(abinum)'/g' $(cw)/compat/compat_firmware_class.c $(cw)/compat/scripts/compat_firmware_install
> + $(cw)/udev/ubuntu/50-compat_firmware.rules
> + mv $(cw)/udev/ubuntu/50-compat_firmware.rules $(cw)/udev/ubuntu/50-compat_firmware_$(abinum).rules
> + mv $(cw)/udev/ubuntu/compat_firmware.sh $(cw)/udev/ubuntu/compat_firmware_$(abinum).sh
> ifeq ($(do_nouveau_package),true)
> $(builddir)/build-$*/MUNGE-NOUVEAU
> echo "obj-y += nouveau/" >>$(builddir)/build-$*/Makefile
> @@ -59,6 +65,7 @@ $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
>
> # Install the finished build
> install-%: cwpkgdir = $(CURDIR)/debian/linux-backports-modules-wireless-$(release)-$(abinum)-$*
> +install-%: cwblddir = $(builddir)/build-$*/compat-wireless-2.6
> install-%: cwmoddir = $(cwpkgdir)/lib/modules/$(release)-$(abinum)-$*
> install-%: cwsrcdir = $(CURDIR)/updates/compat-wireless-2.6
> install-%: cspkgdir = $(CURDIR)/debian/linux-backports-modules-alsa-$(release)-$(abinum)-$*
> @@ -107,9 +114,9 @@ install-%: $(stampdir)/stamp-build-%
> # the compat_firmware_class has its own rules.
> #
> install -d $(cwpkgdir)/lib/udev
> - install --mode=0755 $(cwsrcdir)/udev/ubuntu/compat_firmware.sh $(cwpkgdir)/lib/udev
> + install --mode=0755 $(cwblddir)/udev/ubuntu/compat_firmware_$(abinum).sh $(cwpkgdir)/lib/udev
> install -d $(cwpkgdir)/lib/udev/rules.d
> - install --mode=0644 $(cwsrcdir)/udev/ubuntu/50-compat_firmware.rules $(cwpkgdir)/lib/udev/rules.d
> + install --mode=0644 $(cwblddir)/udev/ubuntu/50-compat_firmware_$(abinum).rules $(cwpkgdir)/lib/udev/rules.d
>
> #
> # Build the ALSA snapshot packages.


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 
Old 04-29-2010, 04:31 PM
Andy Whitcroft
 
Default Lucid LBM pull request, SRU #568782

Applied to Lucid.

-apw

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 

Thread Tools




All times are GMT. The time now is 05:26 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org