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

CI: Fix kernel-next build. #53

Closed
wants to merge 1 commit into from
Closed

CI: Fix kernel-next build. #53

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
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,10 @@ jobs:
run: |
cd /usr/src
git clone --depth 1 git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
mv linux-next linux
- name: Build kernel
run: |
cd /usr/src/linux-next
cd /usr/src/linux
make -j$(nproc) kernelversion
make -j$(nproc) x86_64_defconfig
make -j$(nproc) modules_prepare
Expand All @@ -122,7 +123,7 @@ jobs:
- name: Build DAHDI
run: |
./phreaknet.sh make
KSRC=/usr/src/linux-next phreaknet dahdi --drivers
KSRC=/usr/src/linux phreaknet dahdi --drivers
ubuntu-latest:
runs-on: ubuntu-24.04
name: Ubuntu 24.04
Expand Down
13 changes: 13 additions & 0 deletions patches/vpmadt032.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
index d9d26da..b8b63ed 100644
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -138,7 +138,7 @@ ifneq ($(DAHDI_ARCH),)
ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),)
$(shell touch $(KBUILD_EXTMOD)/vpmadt032_loader/.vpmadt032_$(DAHDI_ARCH).o.cmd)
VPMADT032_LOADER_PRESENT=yes
- dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
+ #dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o
endif
endif
8 changes: 7 additions & 1 deletion phreaknet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ install_prereq() {
# wget should already be installed at this point, so it's not included here
PREREQ_PACKAGES=""
RHEL_MAJOR_VERSION_8=0
printf "Installing prerequisites for %s..." "$OS_DIST_INFO"
printf "Installing prerequisites for %s...\n" "$OS_DIST_INFO"
# Even if we are just installing DAHDI (without Asterisk), $CHAN_DAHDI should be set to 1 at this point.
# libnewt-dev is needed for newt, which dahdi_tool requires. If it's not available, it won't get built.
# dwarves is needed for pahole, which DAHDI Linux install needs for BTF generation
Expand Down Expand Up @@ -1879,6 +1879,8 @@ install_dahdi() {
git_custom_patch "https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/66.diff" # PR 66: Add braces around empty if body
git_custom_patch "https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/69.diff" # PR 69: DEFINE_SEMAPHORE for RHEL

git_custom_patch "https://raw.githubusercontent.com/InterLinked1/phreakscript/kernel-next/patches/vpmadt032.diff"

KERN_VER_MM=$( uname -r | cut -d. -f1-2 )
OS_DIST_2=$( printf "$OS_DIST_INFO" | cut -d' ' -f1-2)
if [ "$KERN_VER_MM" = "4.18" ] && [ "$OS_DIST_2" = "Rocky Linux" ]; then
Expand Down Expand Up @@ -1946,6 +1948,10 @@ install_dahdi() {
# if KSRC/KVERS env vars are set, they will automatically propagate to children
$AST_MAKE -j$(nproc) $DAHDI_CFLAGS
if [ $? -ne 0 ]; then
if [ "$KSRC" != "" ]; then
# With debug, and not parallelized
$AST_MAKE -n $DAHDI_CFLAGS
fi
die "DAHDI Linux compilation failed, aborting install"
fi
$AST_MAKE install $DAHDI_CFLAGS
Expand Down
Loading