[dahdi-commits] dahdi/linux.git branch "master" updated.
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Wed May 13 06:44:58 CDT 2015
branch "master" has been updated
via 4df03284a89abae9e03445f7ec0081992b57e453 (commit)
via 8cd0823978170cb42e2e53b647cfed4bb202c382 (commit)
via 64a98af676ee722f9d3b41911a89350a02c136d3 (commit)
via 7ca082887a88bfff8bc2791f12362189352299d3 (commit)
from a008cc03b7bbd9965fec17949672d4f2daad02c8 (commit)
Summary of changes:
build_tools/make_version | 115 +++----------------------------------
drivers/dahdi/pciradio.c | 3 +-
drivers/dahdi/tor2.c | 7 ++-
drivers/dahdi/voicebus/voicebus.c | 2 +-
drivers/dahdi/wcb4xxp/base.c | 7 ++-
drivers/dahdi/wcfxo.c | 2 +-
drivers/dahdi/wct1xxp.c | 10 +++-
drivers/dahdi/wct4xxp/base.c | 4 +-
drivers/dahdi/wctc4xxp/base.c | 13 +++--
drivers/dahdi/wctdm.c | 3 +-
drivers/dahdi/wcte11xp.c | 10 +++-
drivers/dahdi/wcxb.c | 2 +-
include/dahdi/kernel.h | 4 --
13 files changed, 50 insertions(+), 132 deletions(-)
- Log -----------------------------------------------------------------
commit 4df03284a89abae9e03445f7ec0081992b57e453
Author: Russ Meyerriecks <rmeyerriecks at digium.com>
Date: Thu Apr 16 12:08:25 2015 -0500
wctc4xxp: Fix continuous "errored receive packets" with 2+ transcoders
In the case where two transcoders are loaded in a system and one transcoder
experiences an errored receive packet condition, the logic would ping pong the
error between the two cards, causing a runaway stream of errors in the kernel
log.
This fix moves the global error count var into the wcdte struct to allow for
per-card logic.
Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>
Acked-by: Shaun Ruffell <sruffell at digium.com>
diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c
index 02ea625..20a03f3 100644
--- a/drivers/dahdi/wctc4xxp/base.c
+++ b/drivers/dahdi/wctc4xxp/base.c
@@ -375,6 +375,7 @@ struct wcdte {
#endif
struct timer_list watchdog;
u16 open_channels;
+ unsigned long packet_errors;
};
struct wcdte_netdev_priv {
@@ -2019,14 +2020,16 @@ wctc4xxp_disable_polling(struct wcdte *wc)
static void wctc4xxp_check_for_rx_errors(struct wcdte *wc)
{
- static unsigned long last_errors = 0;
+ /* get_packet_errors() returns the accumulated total errors */
unsigned long errors = wctc4xxp_get_packet_errors(wc->rxd);
- if (last_errors != errors) {
+
+ /* Print warning when the number of errors changes */
+ if (wc->packet_errors != errors) {
if (printk_ratelimit()) {
dev_err(&wc->pdev->dev,
"%lu errored receive packets.\n",
- errors - last_errors);
- last_errors = errors;
+ errors - wc->packet_errors);
+ wc->packet_errors = errors;
}
}
}
commit 8cd0823978170cb42e2e53b647cfed4bb202c382
Author: Shaun Ruffell <sruffell at digium.com>
Date: Mon Apr 20 11:07:11 2015 -0500
dahdi: Remove IRQF_DISABLED.
The IRQF_DISABLED flag was removed in 4.1 in commit
"genirq: Remove the deprecated 'IRQF_DISABLED' request_irq() flag entirely" [1].
By default all interrupt handlers are now run with interrupts disabled and
therefore should all be considered "fast interrupts". Any driver that was still
using the flag will now lock interrupts directly in the handler in case running
on an older kernel that is not disabling interrupts when running the handler.
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=d8bf368d0631d4bc2612d8bf2e4e8e74e620d0cc
Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>
diff --git a/drivers/dahdi/tor2.c b/drivers/dahdi/tor2.c
index f3d2c6f..99fb464 100644
--- a/drivers/dahdi/tor2.c
+++ b/drivers/dahdi/tor2.c
@@ -543,8 +543,7 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
for (x = 0; x < 256; x++)
writel(0x7f7f7f7f, &tor->mem32[x]);
- if (request_irq(tor->irq, tor2_intr,
- IRQF_SHARED | IRQF_DISABLED, "tor2", tor)) {
+ if (request_irq(tor->irq, tor2_intr, IRQF_SHARED, "tor2", tor)) {
printk(KERN_ERR "Unable to request tormenta IRQ %d\n", tor->irq);
goto err_out_release_all;
}
@@ -1201,6 +1200,7 @@ DAHDI_IRQ_HANDLER(tor2_intr)
unsigned char c, rxc;
unsigned char abits, bbits;
struct tor2 *tor = (struct tor2 *) dev_id;
+ unsigned long flags;
/* make sure its a real interrupt for us */
if (!(readb(&tor->mem8[STATREG]) & INTACTIVE)) /* if not, just return */
@@ -1208,6 +1208,8 @@ DAHDI_IRQ_HANDLER(tor2_intr)
return IRQ_NONE;
}
+ local_irq_save(flags);
+
if (tor->cardtype == TYPE_E1) {
/* set outbit, interrupt enable, and ack interrupt */
writeb(OUTBIT | INTENA | INTACK | E1DIV | tor->master,
@@ -1505,6 +1507,8 @@ DAHDI_IRQ_HANDLER(tor2_intr)
else
/* clear OUTBIT and enable interrupts */
writeb(INTENA | tor->master, &tor->mem8[CTLREG]);
+
+ local_irq_restore(flags);
return IRQ_RETVAL(1);
}
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c
index 6789cc9..fb86a39 100644
--- a/drivers/dahdi/wcb4xxp/base.c
+++ b/drivers/dahdi/wcb4xxp/base.c
@@ -2953,6 +2953,7 @@ DAHDI_IRQ_HANDLER(b4xxp_interrupt)
{
struct b4xxp *b4 = dev_id;
unsigned char status;
+ unsigned long flags;
int i;
/* Make sure it's really for us */
@@ -2966,6 +2967,8 @@ DAHDI_IRQ_HANDLER(b4xxp_interrupt)
* That way if we get behind, we don't lose anything.
* We don't actually do any processing here, we simply flag the bottom-half to do the heavy lifting.
*/
+ local_irq_save(flags);
+
if (status & V_FR_IRQSTA) {
b4->fifo_irqstatus[0] |= __pci_in8(b4, R_IRQ_FIFO_BL0);
b4->fifo_irqstatus[1] |= __pci_in8(b4, R_IRQ_FIFO_BL1);
@@ -3001,6 +3004,8 @@ DAHDI_IRQ_HANDLER(b4xxp_interrupt)
/* tasklet_hi_schedule(&b4->b4xxp_tlet); */
b4xxp_bottom_half((unsigned long)b4);
+ local_irq_restore(flags);
+
return IRQ_RETVAL(1);
}
@@ -3354,8 +3359,7 @@ static int __devinit b4xx_probe(struct pci_dev *pdev, const struct pci_device_id
create_sysfs_files(b4);
- if (request_irq(pdev->irq, b4xxp_interrupt,
- IRQF_SHARED | IRQF_DISABLED, "b4xxp", b4)) {
+ if (request_irq(pdev->irq, b4xxp_interrupt, IRQF_SHARED, "b4xxp", b4)) {
dev_err(&b4->pdev->dev, "Unable to request IRQ %d\n",
pdev->irq);
ret = -EIO;
diff --git a/drivers/dahdi/wct1xxp.c b/drivers/dahdi/wct1xxp.c
index 86dd6b8..1d8f591 100644
--- a/drivers/dahdi/wct1xxp.c
+++ b/drivers/dahdi/wct1xxp.c
@@ -1174,6 +1174,8 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
if (!ints)
return IRQ_NONE;
+ local_irq_save(flags);
+
outb(ints, wc->ioaddr + WC_INTSTAT);
if (!wc->intcount) {
@@ -1188,13 +1190,13 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
t1xxp_receiveprep(wc, ints);
t1xxp_transmitprep(wc, ints);
}
- spin_lock_irqsave(&wc->lock, flags);
+ spin_lock(&wc->lock);
#if 1
__handle_leds(wc);
#endif
- spin_unlock_irqrestore(&wc->lock, flags);
+ spin_unlock(&wc->lock);
/* Count down timers */
t1xxp_do_counters(wc);
@@ -1220,6 +1222,8 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
if (ints & 0x20)
printk(KERN_INFO "PCI Target abort\n");
+ local_irq_restore(flags);
+
return IRQ_RETVAL(1);
}
@@ -1333,8 +1337,7 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
/* Keep track of which device we are */
pci_set_drvdata(pdev, wc);
- if (request_irq(pdev->irq, t1xxp_interrupt,
- IRQF_SHARED | IRQF_DISABLED, "t1xxp", wc)) {
+ if (request_irq(pdev->irq, t1xxp_interrupt, IRQF_SHARED, "t1xxp", wc)) {
printk(KERN_NOTICE "t1xxp: Unable to request IRQ %d\n", pdev->irq);
kfree(wc);
return -EIO;
diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c
index 8c4ab6e..044787f 100644
--- a/drivers/dahdi/wcte11xp.c
+++ b/drivers/dahdi/wcte11xp.c
@@ -1351,6 +1351,8 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
if (!ints)
return IRQ_NONE;
+ local_irq_save(flags);
+
outb(ints, wc->ioaddr + WC_INTSTAT);
if (!wc->intcount) {
@@ -1365,13 +1367,13 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
t1xxp_receiveprep(wc, ints);
t1xxp_transmitprep(wc, ints);
}
- spin_lock_irqsave(&wc->lock, flags);
+ spin_lock(&wc->lock);
#if 1
__handle_leds(wc);
#endif
- spin_unlock_irqrestore(&wc->lock, flags);
+ spin_unlock(&wc->lock);
/* Count down timers */
t1_do_counters(wc);
@@ -1398,6 +1400,7 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
if (ints & 0x20)
printk(KERN_NOTICE "PCI Target abort\n");
+ local_irq_restore(flags);
return IRQ_RETVAL(1);
}
@@ -1535,7 +1538,7 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
pci_set_drvdata(pdev, wc);
if (request_irq(pdev->irq, t1xxp_interrupt,
- IRQF_SHARED | IRQF_DISABLED, "wcte11xp", wc)) {
+ IRQF_SHARED, "wcte11xp", wc)) {
printk(KERN_NOTICE "wcte11xp: Unable to request IRQ %d\n", pdev->irq);
kfree(wc);
return -EIO;
commit 64a98af676ee722f9d3b41911a89350a02c136d3
Author: Shaun Ruffell <sruffell at digium.com>
Date: Mon Apr 20 11:17:09 2015 -0500
Remove DAHDI_IRQF_[SHARED|DISABLED] flags.
These flags are direct mappings to the IRQF_[SHARED|DISABLED] flags and no
longer need to be kept separate.
Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>
diff --git a/drivers/dahdi/pciradio.c b/drivers/dahdi/pciradio.c
index 07b85b3..d287b40 100644
--- a/drivers/dahdi/pciradio.c
+++ b/drivers/dahdi/pciradio.c
@@ -1784,7 +1784,8 @@ static int __devinit pciradio_init_one(struct pci_dev *pdev, const struct pci_de
}
- if (request_irq(pdev->irq, pciradio_interrupt, DAHDI_IRQ_SHARED, "pciradio", rad)) {
+ if (request_irq(pdev->irq, pciradio_interrupt,
+ IRQF_SHARED, "pciradio", rad)) {
printk(KERN_NOTICE "pciradio: Unable to request IRQ %d\n", pdev->irq);
if (rad->freeregion)
release_region(rad->ioaddr, 0xff);
diff --git a/drivers/dahdi/tor2.c b/drivers/dahdi/tor2.c
index 5d2f37e..f3d2c6f 100644
--- a/drivers/dahdi/tor2.c
+++ b/drivers/dahdi/tor2.c
@@ -543,7 +543,8 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
for (x = 0; x < 256; x++)
writel(0x7f7f7f7f, &tor->mem32[x]);
- if (request_irq(tor->irq, tor2_intr, DAHDI_IRQ_SHARED_DISABLED, "tor2", tor)) {
+ if (request_irq(tor->irq, tor2_intr,
+ IRQF_SHARED | IRQF_DISABLED, "tor2", tor)) {
printk(KERN_ERR "Unable to request tormenta IRQ %d\n", tor->irq);
goto err_out_release_all;
}
diff --git a/drivers/dahdi/voicebus/voicebus.c b/drivers/dahdi/voicebus/voicebus.c
index 28b8e32..7ee7763 100644
--- a/drivers/dahdi/voicebus/voicebus.c
+++ b/drivers/dahdi/voicebus/voicebus.c
@@ -1885,7 +1885,7 @@ __voicebus_init(struct voicebus *vb, const char *board_name,
goto cleanup;
#if !defined(CONFIG_VOICEBUS_TIMER)
- retval = request_irq(vb->pdev->irq, vb_isr, DAHDI_IRQ_SHARED,
+ retval = request_irq(vb->pdev->irq, vb_isr, IRQF_SHARED,
board_name, vb);
if (retval) {
dev_warn(&vb->pdev->dev, "Failed to request interrupt line.\n");
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c
index daf6b30..6789cc9 100644
--- a/drivers/dahdi/wcb4xxp/base.c
+++ b/drivers/dahdi/wcb4xxp/base.c
@@ -3354,7 +3354,8 @@ static int __devinit b4xx_probe(struct pci_dev *pdev, const struct pci_device_id
create_sysfs_files(b4);
- if (request_irq(pdev->irq, b4xxp_interrupt, DAHDI_IRQ_SHARED_DISABLED, "b4xxp", b4)) {
+ if (request_irq(pdev->irq, b4xxp_interrupt,
+ IRQF_SHARED | IRQF_DISABLED, "b4xxp", b4)) {
dev_err(&b4->pdev->dev, "Unable to request IRQ %d\n",
pdev->irq);
ret = -EIO;
diff --git a/drivers/dahdi/wcfxo.c b/drivers/dahdi/wcfxo.c
index ad74137..b79d2fe 100644
--- a/drivers/dahdi/wcfxo.c
+++ b/drivers/dahdi/wcfxo.c
@@ -972,7 +972,7 @@ static int __devinit wcfxo_init_one(struct pci_dev *pdev, const struct pci_devic
/* Keep track of which device we are */
pci_set_drvdata(pdev, wc);
- if (request_irq(pdev->irq, wcfxo_interrupt, DAHDI_IRQ_SHARED, "wcfxo", wc)) {
+ if (request_irq(pdev->irq, wcfxo_interrupt, IRQF_SHARED, "wcfxo", wc)) {
printk(KERN_NOTICE "wcfxo: Unable to request IRQ %d\n", pdev->irq);
if (wc->freeregion)
release_region(wc->ioaddr, 0xff);
diff --git a/drivers/dahdi/wct1xxp.c b/drivers/dahdi/wct1xxp.c
index adc917e..86dd6b8 100644
--- a/drivers/dahdi/wct1xxp.c
+++ b/drivers/dahdi/wct1xxp.c
@@ -1333,7 +1333,8 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
/* Keep track of which device we are */
pci_set_drvdata(pdev, wc);
- if (request_irq(pdev->irq, t1xxp_interrupt, DAHDI_IRQ_SHARED_DISABLED, "t1xxp", wc)) {
+ if (request_irq(pdev->irq, t1xxp_interrupt,
+ IRQF_SHARED | IRQF_DISABLED, "t1xxp", wc)) {
printk(KERN_NOTICE "t1xxp: Unable to request IRQ %d\n", pdev->irq);
kfree(wc);
return -EIO;
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c
index bb00bcd..6b9072e 100644
--- a/drivers/dahdi/wct4xxp/base.c
+++ b/drivers/dahdi/wct4xxp/base.c
@@ -5334,7 +5334,7 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
#ifdef SUPPORT_GEN1
if (request_irq(pdev->irq, (wc->devtype->flags & FLAG_2NDGEN) ?
t4_interrupt_gen2 : t4_interrupt,
- DAHDI_IRQ_SHARED,
+ IRQF_SHARED,
(wc->numspans == 8) ? "wct8xxp" :
(wc->numspans == 2) ? "wct2xxp" :
"wct4xxp",
@@ -5348,7 +5348,7 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
if (request_irq(pdev->irq, t4_interrupt_gen2,
- DAHDI_IRQ_SHARED, "t4xxp", wc)) {
+ IRQF_SHARED, "t4xxp", wc)) {
#endif
dev_notice(&wc->dev->dev, "Unable to request IRQ %d\n",
pdev->irq);
diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c
index d1e1507..02ea625 100644
--- a/drivers/dahdi/wctc4xxp/base.c
+++ b/drivers/dahdi/wctc4xxp/base.c
@@ -4105,7 +4105,7 @@ wctc4xxp_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_master(pdev);
pci_set_drvdata(pdev, wc);
res = request_irq(pdev->irq, wctc4xxp_interrupt,
- DAHDI_IRQ_SHARED, wc->board_name, wc);
+ IRQF_SHARED, wc->board_name, wc);
if (res) {
dev_err(&wc->pdev->dev,
"Unable to request IRQ %d\n", pdev->irq);
diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c
index f82bc6d..9f43e52 100644
--- a/drivers/dahdi/wctdm.c
+++ b/drivers/dahdi/wctdm.c
@@ -2684,7 +2684,8 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic
/* Keep track of which device we are */
pci_set_drvdata(pdev, wc);
- if (request_irq(pdev->irq, wctdm_interrupt, DAHDI_IRQ_SHARED, "wctdm", wc)) {
+ if (request_irq(pdev->irq, wctdm_interrupt,
+ IRQF_SHARED, "wctdm", wc)) {
printk(KERN_NOTICE "wctdm: Unable to request IRQ %d\n", pdev->irq);
if (wc->freeregion)
release_region(wc->ioaddr, 0xff);
diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c
index eac62e3..8c4ab6e 100644
--- a/drivers/dahdi/wcte11xp.c
+++ b/drivers/dahdi/wcte11xp.c
@@ -1534,7 +1534,8 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
/* Keep track of which device we are */
pci_set_drvdata(pdev, wc);
- if (request_irq(pdev->irq, t1xxp_interrupt, DAHDI_IRQ_SHARED_DISABLED, "wcte11xp", wc)) {
+ if (request_irq(pdev->irq, t1xxp_interrupt,
+ IRQF_SHARED | IRQF_DISABLED, "wcte11xp", wc)) {
printk(KERN_NOTICE "wcte11xp: Unable to request IRQ %d\n", pdev->irq);
kfree(wc);
return -EIO;
diff --git a/drivers/dahdi/wcxb.c b/drivers/dahdi/wcxb.c
index f45125a..7068fae 100644
--- a/drivers/dahdi/wcxb.c
+++ b/drivers/dahdi/wcxb.c
@@ -685,7 +685,7 @@ int wcxb_init(struct wcxb *xb, const char *board_name, u32 int_mode)
xb->flags.have_msi = (int_mode) ? 0 : (0 == pci_enable_msi(pdev));
if (request_irq(pdev->irq, wcxb_isr,
- (xb->flags.have_msi) ? 0 : DAHDI_IRQ_SHARED,
+ (xb->flags.have_msi) ? 0 : IRQF_SHARED,
board_name, xb)) {
dev_notice(&xb->pdev->dev, "Unable to request IRQ %d\n",
pdev->irq);
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index 90d48a3..ce16668 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -76,10 +76,6 @@
#define HAVE_NET_DEVICE_OPS
#endif
-#define DAHDI_IRQ_SHARED IRQF_SHARED
-#define DAHDI_IRQ_DISABLED IRQF_DISABLED
-#define DAHDI_IRQ_SHARED_DISABLED IRQF_SHARED | IRQF_DISABLED
-
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
# ifdef RHEL_RELEASE_VERSION
# if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 6)
commit 7ca082887a88bfff8bc2791f12362189352299d3
Author: Shaun Ruffell <sruffell at digium.com>
Date: Thu Apr 16 09:37:22 2015 -0500
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 at digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>
diff --git a/build_tools/make_version b/build_tools/make_version
index 319842b..bab9e5b 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -2,119 +2,18 @@
if [ -f ${1}/.version ]; then
cat ${1}/.version
-elif [ -f ${1}/.svnrevision ]; then
- echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
-elif [ -d ${1}/.svn ]; then
- PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/${2}/:: | sed -e 's:/: :g'`
- BRANCH=0
- TEAM=0
-
- REV=`svnversion -c ${1} | cut -d: -f2`
-
- if [ "${PARTS}" = "trunk" ]
- then
- echo SVN-'trunk'-r${REV}
- exit 0
- fi
-
- for PART in $PARTS
- do
- if [ ${BRANCH} != 0 ]
- then
- RESULT="${RESULT}-${PART}"
- break
- fi
-
- if [ ${TEAM} != 0 ]
- then
- RESULT="${RESULT}-${PART}"
- continue
- fi
-
- if [ "${PART}" = "branches" ]
- then
- BRANCH=1
- RESULT="branch"
- continue
- fi
-
- if [ "${PART}" = "tags" ]
- then
- BRANCH=1
- RESULT="tag"
- continue
- fi
-
- if [ "${PART}" = "team" ]
- then
- TEAM=1
- continue
- fi
- done
-
- echo SVN-${RESULT##-}-r${REV}
elif [ -d ${1}/.git ]; then
- # If the first log commit messages indicates that this is checked into
- # subversion, we'll just use the SVN- form of the revision.
- MODIFIED=""
- SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
- if [ -z "$SVN_REV" ]; then
- VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v\([0-9]\)/\1/"`
- if [ $? -ne 0 ]; then
- if [ "`git ls-files -m | wc -l`" != "0" ]; then
- MODIFIED="M"
- fi
- # Some older versions of git do not support all the above
- # options.
- VERSION=GIT-`git rev-parse --short --verify HEAD`${MODIFIED}
- fi
- echo ${VERSION}
- else
- PARTS=`LANG=C git log --pretty=full | grep -F "git-svn-id:" | head -1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'`
- BRANCH=0
- TEAM=0
-
+ VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v\([0-9]\)/\1/"`
+ if [ $? -ne 0 ]; then
+ MODIFIED=""
if [ "`git ls-files -m | wc -l`" != "0" ]; then
MODIFIED="M"
fi
-
- if [ "${PARTS}" = "trunk" ]; then
- echo SVN-'trunk'-r${SVN_REV}${MODIFIED}
- exit 0
- fi
-
- for PART in $PARTS
- do
- if [ ${BRANCH} != 0 ]; then
- RESULT="${RESULT}-${PART}"
- break
- fi
-
- if [ ${TEAM} != 0 ]; then
- RESULT="${RESULT}-${PART}"
- continue
- fi
-
- if [ "${PART}" = "branches" ]; then
- BRANCH=1
- RESULT="branch"
- continue
- fi
-
- if [ "${PART}" = "tags" ]; then
- BRANCH=1
- RESULT="tag"
- continue
- fi
-
- if [ "${PART}" = "team" ]; then
- TEAM=1
- continue
- fi
- done
-
- echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED}
+ # Some older versions of git do not support all the above
+ # options.
+ VERSION=GIT-`git rev-parse --short --verify HEAD`${MODIFIED}
fi
+ echo ${VERSION}
else
# Use the directory information in the absence of any other version
# information
-----------------------------------------------------------------------
--
dahdi/linux.git
More information about the dahdi-commits
mailing list