From 707c073f7ce5edab02d71f36c38f44bb39d8d6fa Mon Sep 17 00:00:00 2001
From: Nicolas Vollmar <nvollmar@gmail.com>
Date: Mon, 27 May 2024 16:32:28 +0200
Subject: T6406: enables CONFIG_CFS_BANDWIDTH for cpu cgroup limits

---
 packages/linux-kernel/arch/arm64/configs/vyos_defconfig | 1 +
 packages/linux-kernel/arch/x86/configs/vyos_defconfig   | 1 +
 2 files changed, 2 insertions(+)

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
-- 
cgit v1.2.3


From 5753b4b6247271ab92c6be26b812bd15d7a4a9a8 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Tue, 28 May 2024 17:45:45 +0100
Subject: build: T6414: rename the "iso" flavor to "generic"

---
 Jenkinsfile                     |  2 +-
 Makefile                        |  2 +-
 data/build-flavors/generic.toml | 14 ++++++++++++++
 data/build-flavors/iso.toml     | 14 --------------
 4 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 data/build-flavors/generic.toml
 delete mode 100644 data/build-flavors/iso.toml

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) {
diff --git a/Makefile b/Makefile
index 55e32a00..15c3abc3 100644
--- a/Makefile
+++ b/Makefile
@@ -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/generic.toml b/data/build-flavors/generic.toml
new file mode 100644
index 00000000..9bf7044d
--- /dev/null
+++ b/data/build-flavors/generic.toml
@@ -0,0 +1,14 @@
+# Generic (aka "universal") ISO image
+
+image_format = "iso"
+
+# Include these packages in the image regardless of the architecture
+packages = [
+  # QEMU and Xen guest tools exist for multiple architectures
+  "qemu-guest-agent",
+  "vyos-xe-guest-utilities",
+]
+
+[architectures.amd64]
+  # Hyper-V and VMware guest tools are x86-only
+  packages = ["hyperv-daemons", "vyos-1x-vmware"]
diff --git a/data/build-flavors/iso.toml b/data/build-flavors/iso.toml
deleted file mode 100644
index 9bf7044d..00000000
--- a/data/build-flavors/iso.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generic (aka "universal") ISO image
-
-image_format = "iso"
-
-# Include these packages in the image regardless of the architecture
-packages = [
-  # QEMU and Xen guest tools exist for multiple architectures
-  "qemu-guest-agent",
-  "vyos-xe-guest-utilities",
-]
-
-[architectures.amd64]
-  # Hyper-V and VMware guest tools are x86-only
-  packages = ["hyperv-daemons", "vyos-1x-vmware"]
-- 
cgit v1.2.3