Skip to content

Commit 1af5862

Browse files
committed
CI: Fix kernel-next build.
1 parent fc1dddd commit 1af5862

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,10 @@ jobs:
109109
run: |
110110
cd /usr/src
111111
git clone --depth 1 git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
112+
mv linux-next linux
112113
- name: Build kernel
113114
run: |
114-
cd /usr/src/linux-next
115+
cd /usr/src/linux
115116
make -j$(nproc) kernelversion
116117
make -j$(nproc) x86_64_defconfig
117118
make -j$(nproc) modules_prepare
@@ -122,7 +123,7 @@ jobs:
122123
- name: Build DAHDI
123124
run: |
124125
./phreaknet.sh make
125-
KSRC=/usr/src/linux-next phreaknet dahdi --drivers
126+
KSRC=/usr/src/linux phreaknet dahdi --drivers
126127
ubuntu-latest:
127128
runs-on: ubuntu-24.04
128129
name: Ubuntu 24.04

patches/vpmadt032.diff

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
2+
index d9d26da..b8b63ed 100644
3+
--- a/drivers/dahdi/Kbuild
4+
+++ b/drivers/dahdi/Kbuild
5+
@@ -138,7 +138,7 @@ ifneq ($(DAHDI_ARCH),)
6+
ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),)
7+
$(shell touch $(KBUILD_EXTMOD)/vpmadt032_loader/.vpmadt032_$(DAHDI_ARCH).o.cmd)
8+
VPMADT032_LOADER_PRESENT=yes
9+
- dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
10+
+ #dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
11+
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o
12+
endif
13+
endif

phreaknet.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ install_prereq() {
910910
# wget should already be installed at this point, so it's not included here
911911
PREREQ_PACKAGES=""
912912
RHEL_MAJOR_VERSION_8=0
913-
printf "Installing prerequisites for %s..." "$OS_DIST_INFO"
913+
printf "Installing prerequisites for %s...\n" "$OS_DIST_INFO"
914914
# Even if we are just installing DAHDI (without Asterisk), $CHAN_DAHDI should be set to 1 at this point.
915915
# libnewt-dev is needed for newt, which dahdi_tool requires. If it's not available, it won't get built.
916916
# dwarves is needed for pahole, which DAHDI Linux install needs for BTF generation
@@ -1879,6 +1879,8 @@ install_dahdi() {
18791879
git_custom_patch "https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/66.diff" # PR 66: Add braces around empty if body
18801880
git_custom_patch "https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/69.diff" # PR 69: DEFINE_SEMAPHORE for RHEL
18811881

1882+
git_custom_patch "https://raw.githubusercontent.com/InterLinked1/phreakscript/kernel-next/patches/vpmadt032.diff"
1883+
18821884
KERN_VER_MM=$( uname -r | cut -d. -f1-2 )
18831885
OS_DIST_2=$( printf "$OS_DIST_INFO" | cut -d' ' -f1-2)
18841886
if [ "$KERN_VER_MM" = "4.18" ] && [ "$OS_DIST_2" = "Rocky Linux" ]; then
@@ -1946,6 +1948,10 @@ install_dahdi() {
19461948
# if KSRC/KVERS env vars are set, they will automatically propagate to children
19471949
$AST_MAKE -j$(nproc) $DAHDI_CFLAGS
19481950
if [ $? -ne 0 ]; then
1951+
if [ "$KSRC" != "" ]; then
1952+
# With debug, and not parallelized
1953+
$AST_MAKE -n $DAHDI_CFLAGS
1954+
fi
19491955
die "DAHDI Linux compilation failed, aborting install"
19501956
fi
19511957
$AST_MAKE install $DAHDI_CFLAGS

0 commit comments

Comments
 (0)