@@ -37,12 +37,12 @@ $(stampdir)/stamp-prepare-%: $(confdir)/$(arch)
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' \
+ sed -i 's/compat_firmware/compat_firmware_'$(abinum)_$(target_flavour)'/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
+ mv $(cw)/udev/ubuntu/50-compat_firmware.rules $(cw)/udev/ubuntu/50-compat_firmware_$(abinum)_$(target_flavour).rules
+ mv $(cw)/udev/ubuntu/compat_firmware.sh $(cw)/udev/ubuntu/compat_firmware_$(abinum)_$(target_flavour).sh
ifeq ($(do_nouveau_package),true)
$(builddir)/build-$*/MUNGE-NOUVEAU
echo "obj-y += nouveau/" >>$(builddir)/build-$*/Makefile
@@ -120,9 +120,9 @@ install-%: $(stampdir)/stamp-build-%
# the compat_firmware_class has its own rules.
#
install -d $(cwpkgdir)/lib/udev
- install --mode=0755 $(cwblddir)/udev/ubuntu/compat_firmware_$(abinum).sh $(cwpkgdir)/lib/udev
+ install --mode=0755 $(cwblddir)/udev/ubuntu/compat_firmware_$(abinum)_$(target_flavour).sh $(cwpkgdir)/lib/udev
install -d $(cwpkgdir)/lib/udev/rules.d
- install --mode=0644 $(cwblddir)/udev/ubuntu/50-compat_firmware_$(abinum).rules $(cwpkgdir)/lib/udev/rules.d
+ install --mode=0644 $(cwblddir)/udev/ubuntu/50-compat_firmware_$(abinum)_$(target_flavour).rules $(cwpkgdir)/lib/udev/rules.d
#
# Build the ALSA snapshot packages.
The following changes since commit 3b3855df43601103a5d1c17703efafdae676d996: Steve Conklin (1): UBUNTU: Bump ABI are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-lucid-lbm lp535132-compat-wireless Tim Gardner (1): UBUNTU: Make udev firmware helper file name unique by ABI and flavour debian/rules.d/2-binary-arch.mk | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) From 5b570a2c740daf84d3b590c5f226ae5976c00dcd Mon Sep 17 00:00:00 2001 From: Tim Gardner <tim.gardner@canonical.com> Date: Fri, 2 Jul 2010 11:03:22 -0600 Subject: [PATCH] UBUNTU: Make udev firmware helper file name unique by ABI and flavour Buglink: http://bugs.launchpad.net/bugs/535132 /lib/udev/compat_firmware.sh is delivered in the linux-backports-modules-wireless-2.6.32-24 binary package. However, it _should_ have been delivered in an architecture independent package. (my bad) Therefore, make the file name and firmware class unique by ABI _and_ flavour. This builds on some previous gross hackery in commit 63d418f41c427e416b06b321c4ffcec0fae7100b 'UBUNTU: Make compat wireless udev glue unique by ABI'. If a little gross hackery is good, then a bit more must be better. Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian/rules.d/2-binary-arch.mk | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)