diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index 8eac9219..a1c81e17 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -29,7 +29,7 @@ on: upload_lkm: required: true type: boolean - default: false + default: true description: "Whether to upload lkm" jobs: check-build-lkm: diff --git a/kernel/kpm/super_access.c b/kernel/kpm/super_access.c index 8f2791ca..718f0113 100644 --- a/kernel/kpm/super_access.c +++ b/kernel/kpm/super_access.c @@ -68,18 +68,9 @@ struct DynamicStructInfo { #include - -#define KERNEL_VERSION_6_6 KERNEL_VERSION(6, 6, 0) - #define KERNEL_VERSION_6_1 KERNEL_VERSION(6, 1, 0) - #define KERNEL_VERSION_5_15 KERNEL_VERSION(5, 15, 0) -#define KERNEL_VERSION_5_10 KERNEL_VERSION(5, 10, 0) - -#define KERNEL_VERSION_4_14 KERNEL_VERSION(4, 14, 0) - - #include <../fs/mount.h> #include @@ -121,9 +112,6 @@ DYNAMIC_STRUCT_BEGIN(kprobe) DEFINE_MEMBER(kprobe, post_handler) #if LINUX_VERSION_CODE < KERNEL_VERSION_5_15 DEFINE_MEMBER(kprobe, fault_handler) -#endif -#if LINUX_VERSION_CODE < KERNEL_VERSION_5_10 - DEFINE_MEMBER(kprobe, break_handler) #endif DEFINE_MEMBER(kprobe, flags) DYNAMIC_STRUCT_END(kprobe) @@ -266,5 +254,4 @@ int sukisu_super_container_of( } return -1; } -EXPORT_SYMBOL(sukisu_super_container_of); - +EXPORT_SYMBOL(sukisu_super_container_of); \ No newline at end of file diff --git a/manager/app/src/main/java/zako/zako/zako/ui/screen/MoreSettings.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/MoreSettings.kt index 8734bc55..71556a31 100644 --- a/manager/app/src/main/java/zako/zako/zako/ui/screen/MoreSettings.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/MoreSettings.kt @@ -360,7 +360,7 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) { ) { ListItem( leadingContent = { Icon(Icons.Default.Palette, null) }, - headlineContent = { Text("主题颜色") }, + headlineContent = { Text(stringResource(R.string.theme_color)) }, supportingContent = { val currentThemeName = when (ThemeConfig.currentTheme) { is ThemeColors.Default -> stringResource(R.string.color_default) diff --git a/manager/app/src/main/res/values-zh-rCN/strings.xml b/manager/app/src/main/res/values-zh-rCN/strings.xml index 246e8314..951c4a53 100644 --- a/manager/app/src/main/res/values-zh-rCN/strings.xml +++ b/manager/app/src/main/res/values-zh-rCN/strings.xml @@ -258,4 +258,5 @@ 确认卸载 删除 取消 + 主题颜色 diff --git a/manager/app/src/main/res/values/strings.xml b/manager/app/src/main/res/values/strings.xml index d17859e7..97919be6 100644 --- a/manager/app/src/main/res/values/strings.xml +++ b/manager/app/src/main/res/values/strings.xml @@ -262,4 +262,5 @@ Confirm uninstallation removing abolish + Theme Color