Commit Graph

28 Commits

Author SHA1 Message Date
Shaun Ruffell 7ca082887a build_tools/make_version: Remove support for subversion working copies.
It has now been years since subversion has been used with this project. We can
go ahead and simplify the version script now.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
2015-05-13 14:45:01 -05:00
Shaun Ruffell 41b5353338 build_tools/dkms-helper: Use bash to process dkms-helper script.
Looks like there are some bashims in the script. Make this explicit in the
script until they can be taken out.

This fixes failures to run this script on Ubuntu when dash is the default shell.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
2014-10-20 11:26:14 -05:00
Tzafrir Cohen adfd0910b7 Don't install firmware to /usr/lib/hotplug/firmware
/usr/lib/hotplug/firmware is an old location not used since the move
from the old hotplug system. We no longer need to support it. No need to
keep two copies of the firmware files.

Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
2014-04-30 13:58:07 -05:00
Shaun Ruffell 6cebc1c1fb build_tools/install_firwmare: Try to extract the .bin file from .tar.gz
This allows a .tar.gz file that is normally downloaded from the server to be
checked directly into a test branch. Now when the firmware is being installed,
it can be extracted from any present .tar.gz.  Again, this is primarily to
simplify testing.

A nice side effect is that when going from a newer version to an older version,
any stale .bin files in the firmware directory will not be installed into
/lib/firmware, but instead the bin file from the *versioned* .tar.gz will always
be installed. This should reduce problems where you have to run "make
dist-clean" when reverting to an older version that has a firmware change.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
2014-03-12 23:45:16 -05:00
Shaun Ruffell 7ce8498465 firmware: Refactor by using build_tools/install_firmware.
This is intended to simplify the Makefile and move a large common part into a
subscript. The behavior is the same as it was before.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
2014-03-12 23:12:40 -05:00
Shaun Ruffell d536c3e203 build_tools/dkms-helper: Helper script for DKMS integration.
DKMS (Dynamic Kernel Module Support) [1] provides a mechanism where kernel
modules can be automatically updated when a new kernel is booted.  This is a
simple helper script to automate the process of adding dahdi-linux to the local
DKMS system.

[1] http://linux.dell.com/dkms/

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
2013-12-12 16:08:43 -06:00
Oron Peled d803fad133 Makefile: new 'make-dist' target
Creates a tar.gz:
* Identical results to the existing distributed tarballs
* Named "dahdi-linux-<version>.tar.gz"
* Only from committed files (uses git-archive)
* Adds a .version file

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>
2013-12-02 22:59:00 +02:00
Oron Peled be25fdb6fa remove udev rules: moved to dahdi-tools
* Removed xpp.rules
* Removed generation of dahdi.rules

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>
2013-11-24 14:53:20 +02:00
Oron Peled 06daf6c270 live_dahdi: load "dahdi" with tools_rootdir=$DESTDIR
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>
2013-11-24 14:52:35 +02:00
Shaun Ruffell 0469efb733 build_tools/make_version: Fix typo in build_tools/make_version.
The make_version script would test for a .version file in the proper location,
but then would not properly read it. Since make_version is always reading the
.version script correctly now, the Makefile can be slightly simpilfied and
always defer to it.

This has no user impact since build_tools/make_version was never used to read
the .version file previously but will allow external scripts to use the
make_version script.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
2013-06-26 14:32:15 -05:00
Shaun Ruffell 7714d5d94e build_tools/make_version: Only strip 'v' if followed by a digit.
Do not want to accidentally change the tag "very_cool" to "ery_cool".

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
2013-03-08 12:09:18 -06:00
Shaun Ruffell 9b0d19c054 build_tools/make_version: Strip off the leading 'v' in the version string.
Quote: "It's a change. People hate change"

Make the version string say something like 2.6.2 instead of v2.6.2.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
2013-03-08 11:30:44 -06:00
Shaun Ruffell 37371f19e9 build_tools/make_version: If making from a tag show only the tag in the version.
Also, if there is no other version information use the directory name. Downloads
from gitweb will include the sha information in the build and otherwise a user
could locate the source directory via the embedded version information. I
believe this is better than an empty string.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
2013-03-07 16:17:48 -06:00
Tzafrir Cohen 41c24c400e live_dahdi: optionally generate FreePBX DB entries
If LIVE_DAHDI_FREEPBXDB=yes is set in live.conf, live_dahdi will also
generate FreePBX astdb entries for the FXS entensions it probed (using
the dahdi_genconf module freepbxdb).

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

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10151 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-08-24 08:03:19 +00:00
Tzafrir Cohen 26116a08c5 live_dahdi: symlink_ast
live_dahdi: Add a new command: symlink_ast, to make the system's
/etc/asterisk/dahdi-channels.conf a symlink to the one generated by
'reload' / 'genconf'.

If the system dahdi-channels.conf is a generated one and has not edited,
there's no real harm with running this.

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

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10057 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-07-20 16:50:34 +00:00
Tzafrir Cohen dd270a3fdc live_dahdi: xpp_fxloader: use live xpp.conf
xpp_fxloader also reads /etc/dahdi/xpp.conf in one specific case. Make
it use the live copy.

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10051 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-07-20 16:48:24 +00:00
Tzafrir Cohen f7dadef95f live_dahdi: no need to create asterisk at genconf
/etc/asterisk already gets generated at config. No need to re-create it
at genconf time.

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

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10050 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-07-20 16:48:05 +00:00
Tzafrir Cohen f31c6ad717 live_dahdi: create asterisk in the live tree
Make sure you have etc/asterisk in the live tree before generating
configuration.

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

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10028 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-07-07 13:43:25 +00:00
Tzafrir Cohen ecccab18d5 Also loca xpd_echo in live_dahdi, if available
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10014 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2011-06-30 22:02:31 +00:00
Tzafrir Cohen af9a089714 live_dahdi: Fix regression from r9508
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9532 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2010-12-13 15:56:16 +00:00
Tzafrir Cohen 8b43a66913 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>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9508 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2010-12-07 12:00:28 +00:00
Tzafrir Cohen 76f35e5d31 live_dahdi: rsync to /tmp/dahdi
* Change the destination of rsync to /tmp/dahdi
* Add variable LIVE_DAHDI_RSYNC_DIR to allow overriding this.


git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9480 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2010-11-15 14:56:32 +00:00
Tzafrir Cohen daa79cc634 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.


git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9479 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2010-11-15 14:53:24 +00:00
Shaun Ruffell d013943b4b 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>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9475 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2010-11-11 19:32:58 +00:00
Kinsey Moore d802a2738d 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>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9418 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2010-09-29 21:21:45 +00:00
Shaun Ruffell 7872d47517 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/

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9408 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2010-09-24 22:44:41 +00:00
Shaun Ruffell f19999c8d9 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>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9396 a0bf4364-ded3-4de4-8d8a-66a801d63aff
2010-09-21 19:26:17 +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