summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-05-28 22:55:54 +0200
committerGitHub <noreply@github.com>2024-05-28 22:55:54 +0200
commit257496d6bf022c36bd13651b247921b2f22c6db6 (patch)
tree23697c617652d427667163aa40c0e82e5e5a8fcc
parent501f39293773fd522d7f42473ce02edadb6613d7 (diff)
parent5753b4b6247271ab92c6be26b812bd15d7a4a9a8 (diff)
downloadvyos-build-257496d6bf022c36bd13651b247921b2f22c6db6.tar.gz
vyos-build-257496d6bf022c36bd13651b247921b2f22c6db6.zip
Merge pull request #646 from dmbaturin/T6414-generic-flavor-name
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