summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2024-05-28 17:45:45 +0100
committerDaniil Baturin <daniil@baturin.org>2024-05-28 19:33:29 +0100
commit5753b4b6247271ab92c6be26b812bd15d7a4a9a8 (patch)
tree2f4fc33f73979ef5cb46e40f191402d36f342a9c
parentb809886538eaad66b8756be8f5e758584f88e6a6 (diff)
downloadvyos-build-5753b4b6247271ab92c6be26b812bd15d7a4a9a8.tar.gz
vyos-build-5753b4b6247271ab92c6be26b812bd15d7a4a9a8.zip
build: T6414: rename the "iso" flavor to "generic"
-rw-r--r--Jenkinsfile2
-rw-r--r--Makefile2
-rw-r--r--data/build-flavors/generic.toml (renamed from data/build-flavors/iso.toml)0
3 files changed, 2 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) {
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/iso.toml b/data/build-flavors/generic.toml
index 9bf7044d..9bf7044d 100644
--- a/data/build-flavors/iso.toml
+++ b/data/build-flavors/generic.toml