diff options
| author | dd <91662885+dd010101@users.noreply.github.com> | 2024-05-28 07:02:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 07:02:05 +0200 |
| commit | af3fc898d9ca2414ee14ec0dcaf3d25ee09d1cb8 (patch) | |
| tree | 980a236b40fdd7203a90785e6b0e66d8840f2e36 | |
| parent | d741d57b4beeaf63f94a4b3590ebc7c2db6dd0f1 (diff) | |
| parent | 1f7bb741aab73072e03d72d1fead0e2294c43845 (diff) | |
| download | vyos-build-af3fc898d9ca2414ee14ec0dcaf3d25ee09d1cb8.tar.gz vyos-build-af3fc898d9ca2414ee14ec0dcaf3d25ee09d1cb8.zip | |
Merge branch 'vyos:sagitta' into sagitta
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -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, 8 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 0f36cc45..f700fd20 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 \ 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 |