File tree Expand file tree Collapse file tree 1 file changed +5
-6
lines changed Expand file tree Collapse file tree 1 file changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -1469,8 +1469,7 @@ git_patch() {
1469
1469
wget -q " https://raw.githubusercontent.com/InterLinked1/phreakscript/master/patches/$1 " -O /tmp/$1 --no-cache
1470
1470
git apply " /tmp/$1 "
1471
1471
if [ $? -ne 0 ]; then
1472
- echoerr " Failed to apply git patch... this should be reported..."
1473
- exit 2
1472
+ die " Failed to apply git patch $1 ... this should be reported..."
1474
1473
fi
1475
1474
rm " /tmp/$1 "
1476
1475
}
@@ -1517,10 +1516,12 @@ asterisk_pr() {
1517
1516
git_custom_patch () {
1518
1517
printf " Applying git patch: %s\n" " $1 "
1519
1518
wget -q " $1 " -O /tmp/tmp_git_patch.diff --no-cache
1519
+ if [ ! -f /tmp/tmp_git_patch.diff ]; then
1520
+ die " Failed to download patch $1 "
1521
+ fi
1520
1522
git apply " /tmp/tmp_git_patch.diff"
1521
1523
if [ $? -ne 0 ]; then
1522
- echoerr " Failed to apply git patch... this should be reported..."
1523
- exit 2
1524
+ die " Failed to apply git patch $1 ... this should be reported..."
1524
1525
fi
1525
1526
rm " /tmp/tmp_git_patch.diff"
1526
1527
}
@@ -1884,8 +1885,6 @@ install_dahdi() {
1884
1885
git_custom_patch " https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/64.diff" # PR 64: More struct device to const struct device
1885
1886
git_custom_patch " https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/66.diff" # PR 66: Add braces around empty if body
1886
1887
git_custom_patch " https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/69.diff" # PR 69: DEFINE_SEMAPHORE for RHEL
1887
-
1888
- # Not yet merged
1889
1888
git_custom_patch " https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/32.patch" # PR 32: xpp: Fix 32-bit builds
1890
1889
1891
1890
# Fix or skip compilation of the XPP driver for 32-bit
You can’t perform that action at this time.
0 commit comments