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>
/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>
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>
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>
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>
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>
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>
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>
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>
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
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
/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
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
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
* 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
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
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
'[[' 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
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
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
