← Back to branch summary

~ubuntu-branches/ubuntu/vivid/linux-fsl-imx51/vivid

« back to all changes in this revision

Viewing changes to debian.master/scripts/sub-flavour

  • Committer: Bazaar Package Importer
  • Author(s): Andy Whitcroft, Andy Whitcroft, Ubuntu: 2.6.31-15.49, Ubuntu: 2.6.31-14.48, Ubuntu: 2.6.31-14.47
  • Date: 2009-11-03 11:20:59 UTC
  • Revision ID: james.westby@ubuntu.com-20091103112059-w0j70xwckr8vwflv
Tags: 2.6.31-600.1
https://launchpad.net/bugs/446146
https://launchpad.net/bugs/453335
https://launchpad.net/bugs/458299
https://launchpad.net/bugs/462824
https://launchpad.net/bugs/451375
https://launchpad.net/bugs/454285
https://launchpad.net/bugs/462111
https://launchpad.net/bugs/453073
https://launchpad.net/bugs/433801
https://launchpad.net/bugs/464552
https://launchpad.net/bugs/451872
https://launchpad.net/bugs/381037
https://launchpad.net/bugs/430809
https://launchpad.net/bugs/430809
[ Andy Whitcroft ]

* rebase to Ubuntu-2.6.31-15.49

[ Ubuntu: 2.6.31-15.49 ]

* [Upstream] (drop after 2.6.31) usb-storage: Workaround devices with
  bogus sense size
  - LP: #446146
* SAUCE: AppArmor: AppArmor wrongly reports allow perms as denied
  - LP: #453335
* SAUCE: AppArmor: Policy load and replacement can fail to alloc mem
  - LP: #458299
* SAUCE: AppArmor: AppArmor fails to audit change_hat correctly
  - LP: #462824
* SAUCE: AppArmor: AppArmor disallows truncate of deleted files.
  - LP: #451375
* SAUCE: [x86] fix report of cs-limit nx-emulation
  - LP: #454285
* Revert "SAUCE: trace: add trace_event for the open() syscall"
* SAUCE: trace: add trace events for open(), exec() and uselib()
  - LP: #462111
* SAUCE: Fix sub-flavour script to not stop on missing directories
  - LP: #453073
* [Upstream] (drop after 2.6.31) Input: synaptics - add another Protege
  M300 to rate blacklist
  - LP: #433801
* PM: Make warning in suspend_test_finish() less likely to happen
  - LP: #464552

[ Ubuntu: 2.6.31-14.48 ]

* Add more e100 firmware to nic-modules
  - LP: #451872
* Add qla1280 firmware to scsi-modules
  - LP: #381037

[ Ubuntu: 2.6.31-14.47 ]

* SAUCE: dell-laptop: Store the HW switch status internally rather than
  requerying every time
  - LP: #430809
* SAUCE: dell-laptop: Blacklist machines not supporting dell-laptop
  - LP: #430809

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian.master/scripts/sub-flavour
27
27
        #
28
28
        if echo "$line" | grep '\*' > /dev/null
29
29
        then
30
 
                if [ `eval find "$line" -name '*.ko'|wc -l` -lt 1 ]
 
30
                if [ `eval find "$line" -name '*.ko' 2>/dev/null|wc -l` -lt 1 ]
31
31
                then
32
32
                        echo SUB_INST Warning - No files in $line
33
33
                fi
46
46
        cd debian/$from_pkg/lib/modules/$ABI_RELEASE-$FROM/kernel;
47
47
        if echo "$line" | grep '\*' > /dev/null
48
48
        then
49
 
                eval find "$line" -name '*.ko'
 
49
                eval find "$line" -name '*.ko' 2>/dev/null || true
50
50
        elif [ -f "$line" ]
51
51
        then
52
52
                echo "$line"
60
60
        while read m; do
61
61
                m="${fromdir}$m"
62
62
                test -f debian/$to_pkg/$m && continue
63
 
                echo "SUB_INST installing: $mod"
 
63
                echo "SUB_INST installing: $m"
64
64
                install -D -m644 debian/$from_pkg/$m \
65
65
                        debian/$to_pkg/$m
66
66
        done