~ubuntu-branches/ubuntu/hardy/linux-backports-modules-2.6.24/hardy-security

« back to all changes in this revision

Viewing changes to debian/rules.d/2-binary-arch.mk

  • Committer: Bazaar Package Importer
  • Author(s): , Ben Collins
  • Date: 2008-04-02 06:59:04 UTC
  • Revision ID: james.westby@ubuntu.com-20080402065904-e5knh2gn2hms3xbb
Tags: 2.6.24-14.11
[Ben Collins]

* iwlwifi: Update to iwlwifi-1.2.25 and mac80211-10.0.4
  - LP: #200950
* ubuntu: Slight cleanups to module hiearchy and Makefiles
* mac80211: Enable LED triggers
* iwlwifi: Add LED trigger support (rx and tx only)
  - LP: #176090

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
        # XXX: generate real config
21
21
        touch $(builddir)/build-$*/ubuntu-config.h
22
22
        touch $(builddir)/build-$*/ubuntu-build
 
23
        if [ -z "$(filter $(no_alsa_flavours),$(target_flavour))" ] && grep 'CONFIG_ALSA=m' $(builddir)/build-$*/.config > /dev/null ; then \
 
24
      cd $(builddir)/build-$*/sound/alsa-driver && make SND_TOPDIR=`pwd` all-deps; \
 
25
      cd $(builddir)/build-$*/sound/alsa-driver && aclocal && autoconf; \
 
26
      cd $(builddir)/build-$*/sound/alsa-driver && ./configure --with-kernel=$(KDIR); \
 
27
      sed -i 's/CONFIG_SND_S3C2412_SOC_I2S=m/CONFIG_SND_S3C2412_SOC_I2S=/' $(builddir)/build-$*/sound/alsa-driver/toplevel.config; \
 
28
      cd $(builddir)/build-$*/sound/alsa-driver && make SND_TOPDIR=`pwd` dep; \
 
29
    fi
23
30
        touch $@
24
31
 
25
32
# Do the actual build, including image and modules
46
53
        dh_clean -k -plinux-backports-modules-$(release)-$(abinum)-$*
47
54
 
48
55
        install -d $(firmdir)
 
56
        #
 
57
        # This firmware file name has to be consistent with IWL4965_UCODE_API in iwl4965-base.c
 
58
        #
 
59
        cp updates/wireless/iwlwifi/firmware/*4965*/*.ucode $(firmdir)/iwlwifi-4965-1-lbm.ucode
49
60
        cd $(builddir)/build-$*; find . -type f -name '*.ko' | \
50
61
                cpio -dumpl $(moddir)/updates
51
62
 
61
72
        done
62
73
 
63
74
        # The flavour specific headers package
64
 
        install -d $(hdrdir)/sound
65
 
        # This is where you do the headers copy when the ALSA backport is done.
66
 
        #cp `find $(builddir)/build-$*/sound/alsa-kernel/include -type f` $(hdrdir)/sound
 
75
        if [ -z "$(filter $(no_alsa_flavours),$(target_flavour))" ] && grep 'CONFIG_ALSA=m' $(builddir)/build-$*/.config > /dev/null ; then \
 
76
      install -d $(hdrdir)/sound; \
 
77
      cp `find $(builddir)/build-$*/sound/alsa-kernel/include -type f` $(hdrdir)/sound; \
 
78
    fi
67
79
        dh_testdir
68
80
        dh_testroot
69
81
        dh_installchangelogs -p$(hdrpkg)