mirror of
https://github.com/apple/container.git
synced 2026-10-13 17:49:16 +00:00
Show memory, cpusets in /proc/cgroups. (#642)
- Helps with JDK 11 workloads. - Adds CONFIG_LOCALVERSION to kernel build.
This commit is contained in:
1 parent
35f97f225d
commit
f2dda5d9b5
3 files changed
+5
-1
No files matched your search
@@ -15,6 +15,7 @@
|
||||
KSOURCE ?= https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.5.tar.xz
|
||||
KIMAGE ?= kernel-build:0.1
|
||||
CURDIR := $(shell pwd)
|
||||
GIT_VERSION := $(shell git -C $(CURDIR) rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
|
||||
|
||||
.DEFAULT_GOAL := all
|
||||
|
||||
@@ -36,6 +37,7 @@ endif
|
||||
--rm \
|
||||
--memory 16g \
|
||||
-v ${CURDIR}:/kernel \
|
||||
--env LOCALVERSION=-cz-${GIT_VERSION} \
|
||||
--cwd /kernel \
|
||||
${KIMAGE} \
|
||||
/bin/bash -c "./build.sh"
|
||||
+1
-1
@@ -22,6 +22,6 @@ cp /kernel/config-arm64 /kbuild/.config
|
||||
(
|
||||
cd /kbuild
|
||||
make olddefconfig && \
|
||||
make -j$((`nproc`-1)) && \
|
||||
make -j$((`nproc`-1)) LOCALVERSION="${LOCALVERSION}" && \
|
||||
cp arch/arm64/boot/Image /kernel/vmlinux
|
||||
)
|
||||
@@ -160,6 +160,7 @@ CONFIG_CGROUPS=y
|
||||
CONFIG_PAGE_COUNTER=y
|
||||
# CONFIG_CGROUP_FAVOR_DYNMODS is not set
|
||||
CONFIG_MEMCG=y
|
||||
CONFIG_MEMCG_V1=y
|
||||
CONFIG_MEMCG_KMEM=y
|
||||
CONFIG_BLK_CGROUP=y
|
||||
CONFIG_CGROUP_WRITEBACK=y
|
||||
@@ -172,6 +173,7 @@ CONFIG_CGROUP_PIDS=y
|
||||
CONFIG_CGROUP_FREEZER=y
|
||||
CONFIG_CGROUP_HUGETLB=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_CPUSETS_V1=y
|
||||
CONFIG_PROC_PID_CPUSET=y
|
||||
CONFIG_CGROUP_DEVICE=y
|
||||
CONFIG_CGROUP_CPUACCT=y
|
||||
|
||||
Reference in new issue
Block a user