diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-05-29 10:46:37 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-05-29 10:46:37 +0200 |
| commit | 4e1cbb2fc29a4050c27fd4c19d287a13b28b3259 (patch) | |
| tree | 233986b42e974a6a9154d493e38809f974dc8892 | |
| parent | ade6544ad96832a579550fa4ebac0169c298aea2 (diff) | |
| parent | 257496d6bf022c36bd13651b247921b2f22c6db6 (diff) | |
| download | vyos-build-4e1cbb2fc29a4050c27fd4c19d287a13b28b3259.tar.gz vyos-build-4e1cbb2fc29a4050c27fd4c19d287a13b28b3259.zip | |
Merge branch vyos:current into current
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | data/build-flavors/generic.toml (renamed from data/build-flavors/iso.toml) | 0 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/arm64/configs/vyos_defconfig | 1 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 1 |
5 files changed, 4 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 85399230..87e02ccc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,7 +101,7 @@ pipeline { --build-by "${params.BUILD_BY}" \ --debian-mirror http://deb.debian.org/debian/ \ --build-type release \ - --version "${VYOS_VERSION}" ${CUSTOM_PACKAGES} iso + --version "${VYOS_VERSION}" ${CUSTOM_PACKAGES} generic """ if (fileExists('build/live-image-amd64.hybrid.iso') == false) { @@ -5,7 +5,7 @@ build_dir := build .PHONY: all all: @echo "Make what specifically?" - @echo "The most common target is 'iso'" + @echo "The most common target is 'generic'" %: ./build-vyos-image $* diff --git a/data/build-flavors/iso.toml b/data/build-flavors/generic.toml index 9bf7044d..9bf7044d 100644 --- a/data/build-flavors/iso.toml +++ b/data/build-flavors/generic.toml diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig index a0065740..11abca82 100644 --- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig @@ -173,6 +173,7 @@ CONFIG_MEMCG=y CONFIG_MEMCG_KMEM=y # CONFIG_BLK_CGROUP is not set CONFIG_CGROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y CONFIG_SCHED_MM_CID=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index bf0f6cd3..fbf0c88d 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -193,6 +193,7 @@ CONFIG_MEMCG=y CONFIG_MEMCG_KMEM=y # CONFIG_BLK_CGROUP is not set CONFIG_CGROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y CONFIG_SCHED_MM_CID=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set |