From b87c72425712419e7d8daf6fa8a0773eef26772b Mon Sep 17 00:00:00 2001 From: mozillazg Date: Fri, 7 Feb 2025 10:37:46 +0000 Subject: [PATCH] fix ci --- .../workflows/{overlayfs.patch => almalinux.patch} | 13 +++++++++++++ .github/workflows/kernel-x86_64-rhel.config | 3 +++ .github/workflows/test.yml | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) rename .github/workflows/{overlayfs.patch => almalinux.patch} (54%) diff --git a/.github/workflows/overlayfs.patch b/.github/workflows/almalinux.patch similarity index 54% rename from .github/workflows/overlayfs.patch rename to .github/workflows/almalinux.patch index 735d2b79..55acf4a6 100644 --- a/.github/workflows/overlayfs.patch +++ b/.github/workflows/almalinux.patch @@ -1,3 +1,16 @@ +diff --git a/fs/9p/Makefile b/fs/9p/Makefile +index e7800a5c7..2e638ead4 100644 +--- a/fs/9p/Makefile ++++ b/fs/9p/Makefile +@@ -1,6 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + obj-$(CONFIG_9P_FS) := 9p.o + ++ccflags-y += -Wno-incompatible-pointer-types ++ + 9p-objs := \ + vfs_super.o \ + vfs_inode.o \ diff --git a/fs/overlayfs/Makefile b/fs/overlayfs/Makefile index 408d8f5e0..3fecd2e4c 100644 --- a/fs/overlayfs/Makefile diff --git a/.github/workflows/kernel-x86_64-rhel.config b/.github/workflows/kernel-x86_64-rhel.config index 105d268c..b31a1fd2 100644 --- a/.github/workflows/kernel-x86_64-rhel.config +++ b/.github/workflows/kernel-x86_64-rhel.config @@ -6864,3 +6864,6 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # KBUILD_CFLAGS += -Wno-array-bounds +CONFIG_9P_FS=n +CONFIG_NET_9P=n +CONFIG_9P_FS_POSIX_ACL=n diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f85a535..a98130df 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,7 +57,7 @@ jobs: cd kernel-5.14.0 tar xf linux-5.14.0-427.42.1.el9_4.tar.xz cd linux-5.14.0-427.42.1.el9_4 - patch -p1 < /home/runner/work/ptcpdump/ptcpdump/.github/workflows/overlayfs.patch + patch -p1 < /home/runner/work/ptcpdump/ptcpdump/.github/workflows/almalinux.patch vng -v -b --config /home/runner/work/ptcpdump/ptcpdump/.github/workflows/kernel-x86_64-rhel.config vng --net user --ssh --rwdir=/host=/tmp