Skip to content

Commit

Permalink
Docker patch
Browse files Browse the repository at this point in the history
  • Loading branch information
5kind committed Nov 29, 2023
1 parent 9f28b8a commit 8a0b47e
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 133 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
backup/
6 changes: 3 additions & 3 deletions config.env
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ LXC_DOCKER=true
ENABLE_NETHUNTER=true

# 是否打入LXC-DOCKER补丁(需自行修改patches/Android-Container与工作流)
CONTAINER_PATCH=false
CONTAINER_PATCH=true

# 是否打入Makefile补丁(修改的配置被替换时启用,需自行配置patches/Makefile.patch)
MAKEFILE_PATCH=true
Expand All @@ -71,7 +71,7 @@ ANDROID_PARANOID_NETWORK_OFF=true

# 开启 KernelSU flags
ENABLE_KERNELSU=true
KERNELSU_TAG=main
KERNELSU_TAG=

# 额外配置 Configuration
DISABLE-LTO=false
Expand All @@ -95,4 +95,4 @@ NEED_DTBO=false

# 构建内核直链接Build boot images
BUILD_BOOT_IMG=true
SOURCE_BOOT_IMAGE=https://github.com/5kind/LXC-DOCKER-KernelSU_Action/releases/download/V12.5.6.0/boot.img
SOURCE_BOOT_IMAGE=https://github.com/5kind/LXC-DOCKER-KernelSU_Action/releases/download/files/boot.img
13 changes: 0 additions & 13 deletions patches/Android-Container/cgroup-v1.patch

This file was deleted.

108 changes: 0 additions & 108 deletions patches/Android-Container/cpuset.patch

This file was deleted.

4 changes: 3 additions & 1 deletion scripts/check-kernel-config/LXC-DOCKER-OPEN-CONFIG.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ CONFIG_NET_SCHED
CONFIG_NET_CLS_CGROUP
CONFIG_CGROUP_NET_PRIO
CONFIG_FAIR_GROUP_SCHED
CONFIG_!SCHED_WALT
CONFIG_SCHED_WALT
CONFIG_RT_GROUP_SCHED
CONFIG_IP_NF_TARGET_REDIRECT
CONFIG_IP_VS_NFCT
Expand Down Expand Up @@ -143,6 +143,8 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM
CONFIG_CFS_BANDWIDTH
"

CONFIGS_BACKUP="
"
CONFIGS_OFF="
"
CONFIGS_EQ="
Expand Down
11 changes: 3 additions & 8 deletions scripts/customize.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
CONFIG_FILE=$1
# scripts/config --file $CONFIG_FILE --enable CONFIG_REFCOUNT_FULL
# scripts/config --file $CONFIG_FILE --enable CONFIG_IP_VS_PROTO_RR
# scripts/config --file $CONFIG_FILE --enable CONFIG_CFS_BANDWIDTH
# scripts/config --file $CONFIG_FILE --enable CONFIG_AUFS_FS
# scripts/config --file $CONFIG_FILE --enable CONFIG_DEVPTS_MULTIPLE_INSTANCES
# scripts/config --file $CONFIG_FILE --enable CONFIG_BINFMT_MISC
# scripts/config --file $CONFIG_FILE --set-str CONFIG_LOCALVERSION "-Marisa"
$GITHUB_WORKSPACE/scripts/check-kernel-config/customize.sh $CONFIG_FILE -w
scripts/config --file $CONFIG_FILE --enable CONFIG_BINFMT_MISC
scripts/config --file $CONFIG_FILE --set-str CONFIG_LOCALVERSION "-Marisa"
# $GITHUB_WORKSPACE/scripts/check-kernel-config/customize.sh $CONFIG_FILE -w

0 comments on commit 8a0b47e

Please sign in to comment.