lp:~gandelman-a/ubuntu/oneiric/dahdi-linux/spinlock_patch

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/oneiric/dahdi-linux

Dave Walker (community): Approve on 2011-05-26

Ubuntu branches: Pending requested 2011-05-24

Diff: 16587 lines (+246/-16096)

33 files modified

.pc/applied-patches (+0/-5)
.pc/chanmute/include/dahdi/dahdi_config.h (+0/-187)
.pc/dahdi_linux_extra/drivers/dahdi/Kbuild (+0/-153)
.pc/dahdi_linux_extra/drivers/dahdi/Kconfig (+0/-294)
.pc/no_firmware_download/Makefile (+0/-222)
.pc/oslec_auto/drivers/dahdi/Kbuild (+0/-149)
.pc/wcb4xxp_bn4s0e/drivers/dahdi/wcb4xxp/base.c (+0/-3047)
Makefile (+1/-1)
debian/changelog (+8/-0)
debian/patches/define_spinlock (+234/-0)
debian/patches/series (+1/-0)
drivers/dahdi/Kbuild (+1/-12)
drivers/dahdi/Kconfig (+0/-51)
drivers/dahdi/ap400/Kbuild (+0/-26)
drivers/dahdi/ap400/ap400.h (+0/-107)
drivers/dahdi/ap400/ap400_drv.c (+0/-2363)
drivers/dahdi/ap400/apec.c (+0/-390)
drivers/dahdi/ap400/apec.h (+0/-48)
drivers/dahdi/opvxa1200.c (+0/-3026)
drivers/dahdi/wcb4xxp/base.c (+0/-1)
drivers/dahdi/wcopenpci.c (+0/-1850)
drivers/dahdi/zaphfc/Kbuild (+0/-10)
drivers/dahdi/zaphfc/base.c (+0/-1710)
drivers/dahdi/zaphfc/fifo.c (+0/-375)
drivers/dahdi/zaphfc/fifo.h (+0/-139)
drivers/dahdi/zaphfc/zaphfc.h (+0/-418)
drivers/staging/echo/Kbuild (+0/-6)
drivers/staging/echo/echo.c (+0/-662)
drivers/staging/echo/echo.h (+0/-175)
drivers/staging/echo/fir.h (+0/-286)
drivers/staging/echo/mmx.h (+0/-288)
drivers/staging/echo/oslec.h (+0/-94)
include/dahdi/dahdi_config.h (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

22. By Adam Gandelman on 2011-05-24

debian/patches/define_spinlock: Fix DKMS FTBFS, move test for
DEFINE_SPINLOCK into include/dahdi/kernel.h. Cherry picked from upstream
commit (r9411)

21. By Adam Gandelman on 2011-05-24

upstream commit r9411

20. By Adam Gandelman on 2011-05-19

* Merge from Debian unstable (Remaining changes):
  - debian/dahdi-dkms.install.in : add .version
  - debian/rules : cleanup dahdi-dkms.install and dkms.conf after build
  - debian/control: Fix typo (right command is m-a a-i dahdi-source)
  - Import modifications by Javier Uruen Val <email address hidden>:
    - debian/system.conf
    - debian/modules
  - DKMS support:
    - debian/control: Added Depends to dahdi-linux (dahdi-dkms | dahdi-source)
    - debian/control: Add dkms package
    - debian/dahdi-dkms.install
    - debian/dahdi-dkms.postinst
    - debian/dahdi-dkms.prerm
    - debian/dahdi-linux.install
    - debian/rules: add code to automatically configure dkms.conf
    - debian/dkms.conf.in

19. By Dave Walker on 2011-04-13

* debian/patches/bkl_fix_ioctl: Do not ioctl when unlocked_ioctl is available.
  Previous behaviour was causing a dkms build failure. Patch cherry picked
  from upstream commit (r9142). (LP: #731197)
* debian/patches/drop_semaphores_as_mutexes: Use of semaphores as mutexes
  feature was removed from the kernel, causing dkms build failure. Patch
  cherry picked from upstream commit (r9464), with minor alterations.

18. By Stefan Lesicnik on 2010-11-11

* Merge from Debian testing (Remaining changes):
  - debian/dahdi-dkms.install.in : add .version
  - debian/dkms.conf.in : do not 'make clean' after compile. We have to
    do this because the wanpipe (sangoma) drivers need Module.symvers.
  - debian/rules : cleanup dahdi-dkms.install and dkms.conf after build
  - debian/control: Change Maintainer
  - debian/control: Removed Uploaders field.
  - debian/control: Removed Debian Vcs-Svn entry and replaced with
    ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
  - debian/control: Fix typo (right command is m-a a-i dahdi-source)
  - Import modifications by Javier Uruen Val <email address hidden>:
    - debian/system.conf
    - debian/modules
  - DKMS support:
    - debian/control: Added Depends to dahdi-linux (dahdi-dkms | dahdi-source)
    - debian/control: Add dkms package
    - debian/dahdi-dkms.install
    - debian/dahdi-dkms.postinst
    - debian/dahdi-dkms.prerm
    - debian/dahdi-linux.install
    - debian/rules: add code to automatically configure dkms.conf
    - debian/dkms.conf.in
* debian/dkms.conf.in: Add () so make.log captures all output
* debian/dkms.conf.in: Build dahdi_dummy as module to fix dkms build failure

17. By Stefan Lesicnik on 2010-11-11

xpp rules no longer required

16. By Stefan Lesicnik on 2010-11-11

Remove uploaders as per merge
Remove quilt as it builds without and is like that in debian

15. By Stefan Lesicnik on 2010-11-11

Remove patch as no longer required

14. By Stefan Lesicnik on 2010-11-11

Remove 2.6.35-build.patch as it is no longer required

13. By Stefan Lesicnik on 2010-11-11

Fix dkms make.log and dkms failure status 7 by building dahdi_dummy