diff options
| author | dd <91662885+dd010101@users.noreply.github.com> | 2024-05-28 07:02:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 07:02:15 +0200 |
| commit | ade6544ad96832a579550fa4ebac0169c298aea2 (patch) | |
| tree | a6652b4151de80929ba77e695e2a61ce705c2590 | |
| parent | 196e3e8b55b83710c867632131a4129971d1e5b7 (diff) | |
| parent | b809886538eaad66b8756be8f5e758584f88e6a6 (diff) | |
| download | vyos-build-ade6544ad96832a579550fa4ebac0169c298aea2.tar.gz vyos-build-ade6544ad96832a579550fa4ebac0169c298aea2.zip | |
Merge branch 'vyos:current' into current
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/arm64/configs/vyos_defconfig | 6 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index dd6b50a3..a9336665 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -153,7 +153,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#f8d6abdf -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#fc327ecd76 -y # Packages needed for libvyosconfig RUN apt-get update && apt-get install -y \ diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig index 019d0283..a0065740 100644 --- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig @@ -172,15 +172,15 @@ CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_KMEM=y # CONFIG_BLK_CGROUP is not set -# CONFIG_CGROUP_SCHED is not set +CONFIG_CGROUP_SCHED=y CONFIG_SCHED_MM_CID=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set # CONFIG_CGROUP_FREEZER is not set # CONFIG_CGROUP_HUGETLB is not set -# CONFIG_CPUSETS is not set +CONFIG_CPUSETS=y # CONFIG_CGROUP_DEVICE is not set -# CONFIG_CGROUP_CPUACCT is not set +CONFIG_CGROUP_CPUACCT=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_BPF=y # CONFIG_CGROUP_MISC is not set diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index 02af06ee..bf0f6cd3 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -192,15 +192,15 @@ CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_KMEM=y # CONFIG_BLK_CGROUP is not set -# CONFIG_CGROUP_SCHED is not set +CONFIG_CGROUP_SCHED=y CONFIG_SCHED_MM_CID=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set # CONFIG_CGROUP_FREEZER is not set # CONFIG_CGROUP_HUGETLB is not set -# CONFIG_CPUSETS is not set +CONFIG_CPUSETS=y # CONFIG_CGROUP_DEVICE is not set -# CONFIG_CGROUP_CPUACCT is not set +CONFIG_CGROUP_CPUACCT=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_BPF=y # CONFIG_CGROUP_MISC is not set |