Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install: Update patches to target 22.1.0. #54

Merged
merged 1 commit into from
Nov 25, 2024
+9 −100
Merged

install: Update patches to target 22.1.0. #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions patches/config_c_fix_template_inheritance_overrides.patch
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions patches/config_c_fix_template_writing.patch
View file
Open in desktop

This file was deleted.

15 changes: 9 additions & 6 deletions phreaknet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ SIP_CISCO=0
CHAN_SCCP=0
CHAN_DAHDI=0
DAHDI_OLD_DRIVERS=0
EMPULSE=1 # Automatically enable EMPULSE, cause why not?
DAHDI_WANPIPE=0 # wanpipe only needed for Sangoma cards
DEVMODE=0
TEST_SUITE=0
Expand Down Expand Up @@ -1907,6 +1908,10 @@ install_dahdi() {
if [ "$HEARPULSING" = "1" ]; then
git_patch "hearpulsing-dahlin.diff"
fi
if [ "$EMPULSE" = "1" ]; then
printf "Enabling EMPULSE for this build\n"
sed -i 's|/\* #define EMPULSE \*/|#define EMPULSE|g' include/dahdi/dahdi_config.h # Enable EMPULSE by default. Note that the * must be escaped for sed.
fi
else
echoerr "Skipping DAHDI Linux feature patches..."
fi
Expand Down Expand Up @@ -2309,13 +2314,11 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
printf "Applying patches applicable to %s -> %d (~%s)\n" "$AST_ALT_VER" "$AST_MM_VER" "$AST_MAJOR_VER"

## merged into master, not yet in a release version (use asterisk_pr_if, e.g. asterisk_pr_if 399 210100 200600 182100)
asterisk_pr_if 901 220100 210600 182600 # astfd compiler fix
asterisk_pr_if 903 220100 210600 182600 # voicemail pager email fix
asterisk_pr_if 917 220100 210600 182600 # FreeBSD compilation fixes
asterisk_pr_if 961 220200 210700 201200 182700 # config.c: fix template inheritance/overrides
asterisk_pr_if 994 220200 210700 201200 182700 # FGD regression fix

## Unmerged patches: remove once merged
git_patch "config_c_fix_template_inheritance_overrides.patch" # config.c: fix template inheritance/overrides
git_patch "config_c_fix_template_writing.patch" # config.c: fix template inheritance/overrides
## Unmerged patches: remove or switch to asterisk_pr_if once merged
asterisk_pr_unconditional 245 # config.c: fix template inheritance/overrides
asterisk_pr_unconditional 918 # config.c #tryinclude fixes
asterisk_pr_unconditional 971 # config.c fix issues w/ whitespace in comments

Expand Down
Loading