From 15a818282ef5d385ad9a0102668042f874d0900e Mon Sep 17 00:00:00 2001 From: weishu Date: Sat, 16 Mar 2024 20:35:35 +0800 Subject: [PATCH] try fix --- .github/workflows/avd-kernel.yml | 1 - kernel/Makefile | 6 +++--- kernel/selinux/Makefile | 16 ---------------- 3 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 kernel/selinux/Makefile diff --git a/.github/workflows/avd-kernel.yml b/.github/workflows/avd-kernel.yml index a3e47d00abdf..f581b4cc59a8 100644 --- a/.github/workflows/avd-kernel.yml +++ b/.github/workflows/avd-kernel.yml @@ -52,7 +52,6 @@ jobs: - uses: actions/checkout@v4 with: path: KernelSU - ref: e3998c07440f1f033360cb7a55b421aef7409046 fetch-depth: 0 - name: Setup need_upload diff --git a/kernel/Makefile b/kernel/Makefile index 021840a2efe9..a598a659c42b 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -13,8 +13,6 @@ kernelsu-objs += kernel_compat.o kernelsu-objs += selinux/selinux.o kernelsu-objs += selinux/sepolicy.o kernelsu-objs += selinux/rules.o -ccflags-y += -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include -ccflags-y += -I$(objtree)/security/selinux -include $(srctree)/include/uapi/asm-generic/errno.h ifndef KSU_MODULE obj-y += kernelsu.o @@ -63,4 +61,6 @@ ccflags-y += -DEXPECTED_SIZE=$(KSU_EXPECTED_SIZE) ccflags-y += -DEXPECTED_HASH=\"$(KSU_EXPECTED_HASH)\" ccflags-y += -Wno-implicit-function-declaration -Wno-strict-prototypes -Wno-int-conversion -Wno-gcc-compat -ccflags-y += -Wno-declaration-after-statement -Wno-unused-function \ No newline at end of file +ccflags-y += -Wno-declaration-after-statement -Wno-unused-function +ccflags-y += -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include +ccflags-y += -I$(objtree)/security/selinux -include $(srctree)/include/uapi/asm-generic/errno.h \ No newline at end of file diff --git a/kernel/selinux/Makefile b/kernel/selinux/Makefile deleted file mode 100644 index 870750be2ed6..000000000000 --- a/kernel/selinux/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -obj-y += selinux.o -obj-y += sepolicy.o -obj-y += rules.o - -ifeq ($(shell grep -q " current_sid(void)" $(srctree)/security/selinux/include/objsec.h; echo $$?),0) -ccflags-y += -DKSU_COMPAT_HAS_CURRENT_SID -endif - -ifeq ($(shell grep -q "struct selinux_state " $(srctree)/security/selinux/include/security.h; echo $$?),0) -ccflags-y += -DKSU_COMPAT_HAS_SELINUX_STATE -endif - -ccflags-y += -Wno-implicit-function-declaration -Wno-strict-prototypes -Wno-int-conversion -ccflags-y += -Wno-declaration-after-statement -Wno-unused-function -ccflags-y += -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include -ccflags-y += -I$(objtree)/security/selinux -include $(srctree)/include/uapi/asm-generic/errno.h