Skip to content

Commit db15369

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

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-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

phreaknet.sh

Lines changed: 4 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
@@ -1946,6 +1946,9 @@ install_dahdi() {
19461946
# if KSRC/KVERS env vars are set, they will automatically propagate to children
19471947
$AST_MAKE -j$(nproc) $DAHDI_CFLAGS
19481948
if [ $? -ne 0 ]; then
1949+
if [ "$KSRC" != "" ]; then
1950+
$AST_MAKE -n -j$(nproc) $DAHDI_CFLAGS
1951+
fi
19491952
die "DAHDI Linux compilation failed, aborting install"
19501953
fi
19511954
$AST_MAKE install $DAHDI_CFLAGS

0 commit comments

Comments
 (0)