Skip to content

Commit 8132edc

Browse files
committed
DAHDI: Fix compilation issues in DAHDI Linux.
* Compile and successfully build dahdi_dummy. * Build against Rocky Linux 9.6. * Fix compilation following commit asterisk/asterisk@43bf8a4
1 parent 9c8b559 commit 8132edc

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,9 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
kernel_branch: [
24-
'linux-4.14.y',
2524
'linux-4.19.y',
26-
'linux-5.4.y',
27-
'linux-5.10.y',
28-
'linux-5.15.y',
29-
'linux-5.17.y',
30-
'linux-5.18.y',
3125
'linux-5.19.y',
3226
'linux-6.1.y',
33-
'linux-6.5.y',
3427
'linux-6.8.y',
3528
'linux-6.9.y',
3629
'linux-6.10.y',
@@ -304,7 +297,19 @@ jobs:
304297
run: |
305298
./phreaknet.sh make
306299
GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
307-
rocky-9:
300+
rocky-96:
301+
runs-on: ubuntu-24.04
302+
name: Rocky Linux 9.6
303+
container: rockylinux:9
304+
steps:
305+
- uses: actions/checkout@v4
306+
- name: Build DAHDI and Asterisk
307+
run: |
308+
dnf install -y git tar
309+
./phreaknet.sh make
310+
cat /etc/rocky-release
311+
GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
312+
rocky-93:
308313
runs-on: ubuntu-24.04
309314
name: Rocky Linux 9.3
310315
container: rockylinux:9.3
@@ -314,7 +319,7 @@ jobs:
314319
run: |
315320
./phreaknet.sh make
316321
GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
317-
rocky-8:
322+
rocky-89:
318323
runs-on: ubuntu-24.04
319324
name: Rocky Linux 8.9
320325
container: rockylinux:8.9

phreaknet.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2084,6 +2084,8 @@ install_dahdi() {
20842084

20852085
if [ "$DAHDI_OLD_DRIVERS" = "1" ]; then
20862086
dahdi_unpurge $DAHDI_LIN_SRC_DIR # for some reason, this needs to be applied before the next branch patches
2087+
# Enable building dahdi_dummy, which is disabled by default
2088+
sed -i 's/#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY)/obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY)/g' drivers/dahdi/Kbuild
20872089
fi
20882090

20892091
# Merged in master, but not yet in a current release
@@ -2103,6 +2105,8 @@ install_dahdi() {
21032105
dahlin_apply_pr 79 # vpmadt032 binary blob
21042106
dahlin_apply_pr 92 # del_timer_sync wrapper
21052107
dahlin_apply_pr 96 # from_timer renamed to timer_container_of
2108+
dahlin_apply_pr 98 # hrtimer_init changed to hrtimer_setup
2109+
dahlin_apply_pr 99 # use module_init/module_exit instead of init_module/cleanup_module
21062110

21072111
KERN_VER_MM=$( uname -r | cut -d. -f1-2 )
21082112
OS_DIST_2=$( printf "$OS_DIST_INFO" | cut -d' ' -f1-2)

res/res_alarmsystem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1698,7 +1698,7 @@ static void *client_thread(void *arg)
16981698
/* Wait until the PBX is fully booted, similar to "core waitfullybooted"
16991699
* This is necessary because dialplan won't execute while the PBX is still booting,
17001700
* and events, including EVENT_ALARM_OKAY, can trigger user callbacks which execute dialplan. */
1701-
while (!ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
1701+
while (!ast_fully_booted) {
17021702
usleep(1000);
17031703
}
17041704

0 commit comments

Comments
 (0)