From e92a7ed51949d7cd6703b9f22d3929858264c119 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Mon, 27 May 2024 07:28:40 +0200 Subject: T6404: update vyos1x-config commit reference (cherry picked from commit ab06c1a41a0fd0d7024e2014a46946a3e5db172f) --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b7b152e7..48aec028 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y \ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen ENV LANG en_US.utf8 -ENV OCAML_VERSION 4.12.0 +ENV OCAML_VERSION 4.14.2 # Base packaged needed to build packages and their package dependencies RUN apt-get update && apt-get install -y \ @@ -150,7 +150,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#8c65eb12 -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#b7f104781 -y # Packages needed for libvyosconfig RUN apt-get update && apt-get install -y \ -- cgit v1.2.3 From a6b290b135ab80978cfd9ec219b857fdefeba193 Mon Sep 17 00:00:00 2001 From: Nicolas Vollmar Date: Mon, 27 May 2024 13:22:51 +0200 Subject: Kernel: T6406: enables CONFIG_CGROUP_CPUACCT (cherry picked from commit b809886538eaad66b8756be8f5e758584f88e6a6) --- packages/linux-kernel/arch/arm64/configs/vyos_defconfig | 6 +++--- packages/linux-kernel/arch/x86/configs/vyos_defconfig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 -- cgit v1.2.3