Commit Graph

8 Commits

Author SHA1 Message Date
Shaun Ruffell
22645d1267 make_version: Use 'git rev-parse' if only looking for a sha5.
Different versions of git have variability in how the log output looks.
Instead of git log, we can use git rev-parse directly.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9475

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9760 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-02-11 17:52:09 +00:00
Kinsey Moore
b47c3c2e0b make_version: svn and git metadata directory not checked properly.
(closes issue #16143)
Reported by: Max Khon

Signed-off-by: Kinsey Moore <kmoore@digium.com>
Signed-off-by: Shaun Ruffell <sruffell@digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9418

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9759 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-02-11 17:52:04 +00:00
Shaun Ruffell
372e539242 make_version: '[[' -> '[' since it's not a bash script.
'[[' is a bash construct specifically, yet #!/bin/sh is at the top of the
file.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Review: https://reviewboard.asterisk.org/r/940/

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9408

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9758 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-02-11 17:51:59 +00:00
Shaun Ruffell
a102bf28d1 dahdi: Generate include/dahdi/version.h when building in a git repository.
If building within a git repository search the last log message for a
'git-svn-id'.  If found, the commit has a corresponding svn revision
number and we will use the SVN-xxx-rxxx revision form. Otherwise use the
output of 'git describe --long --always --tags --dirty=M' as the
version.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9396

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9757 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-02-11 17:51:54 +00:00
Tzafrir Cohen
025cacfe11 live_dahdi: Fix regression from r9508
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9532

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9745 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-02-09 12:45:39 +00:00
Tzafrir Cohen
c23a4dcab1 live_dahdi: fix usage of xpp.conf
Link live/usr/share/dahdi/xpp.conf from live/etc/dahdi/xpp.conf in
'config'. This makes the 'live' xpp.conf used rather than the global
xpp.conf .

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9508

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9681 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-01-21 05:31:18 +00:00
Shaun Ruffell
88d8b68370 live_dahdi: only check for TOOLS_DIR when used
Only check that TOOLD_DIR is valid when it is actually needed (configure,
install, config). This allows not checking for it with *load on a
rsync-ed copy.

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9479

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9677 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-01-21 05:30:47 +00:00
Shaun Ruffell
bf3fe05dfb wct4xxp: Moving the transmit short detection behind debug module param.
This needs some more testing before it's on by default.  If the card is
otherwise functioning, these messages may be confusing to the user.  If
the card is not functioning, the driver can be reloaded with debug to
check for this condition.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9205 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2010-08-27 21:59:27 +00:00