diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-07-03 18:16:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-03 18:16:32 +0100 |
| commit | 05e3f87975a3fd2d894496ecc408c806657261c3 (patch) | |
| tree | 7302b69c3f2e7bcdbcc62304e32b2e8f01d36800 | |
| parent | eb4882ad79361782e7e0b40a31d9c02b73a6fa1c (diff) | |
| parent | dfe2abc58b5ad458985e4f0acdc3f23cabc1eaa7 (diff) | |
| download | vyos-build-05e3f87975a3fd2d894496ecc408c806657261c3.tar.gz vyos-build-05e3f87975a3fd2d894496ecc408c806657261c3.zip | |
Merge pull request #684 from vyos/mergify/bp/circinus/pr-680
T6527: remove legacy packages (backport #680)
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | data/live-build-config/package-lists/vyos-base.list.chroot | 5 | ||||
| -rw-r--r-- | docker-vyos/vyos_install_stage_01.sh | 5 | ||||
| -rw-r--r-- | docker-vyos/vyos_install_stage_02.sh | 5 | ||||
| -rw-r--r-- | vars/isCustomBuild.groovy | 2 |
5 files changed, 3 insertions, 23 deletions
@@ -21,17 +21,12 @@ checkiso: .PHONY: test .ONESHELL: test: checkiso - scripts/check-qemu-install --debug --match="$(MATCH)" --uefi build/live-image-amd64.hybrid.iso + scripts/check-qemu-install --debug --configd --match="$(MATCH)" --uefi build/live-image-amd64.hybrid.iso .PHONY: test-no-interfaces .ONESHELL: test-no-interfaces: checkiso - scripts/check-qemu-install --debug --match="$(MATCH)" --no-interfaces build/live-image-amd64.hybrid.iso - -.PHONY: testd -.ONESHELL: -testd: checkiso - scripts/check-qemu-install --debug --configd build/live-image-amd64.hybrid.iso + scripts/check-qemu-install --debug --configd --match="$(MATCH)" --uefi --no-interfaces build/live-image-amd64.hybrid.iso .PHONY: testc .ONESHELL: diff --git a/data/live-build-config/package-lists/vyos-base.list.chroot b/data/live-build-config/package-lists/vyos-base.list.chroot index c2129318..4ccc7f76 100644 --- a/data/live-build-config/package-lists/vyos-base.list.chroot +++ b/data/live-build-config/package-lists/vyos-base.list.chroot @@ -1,11 +1,6 @@ debconf gpgv gnupg -vyatta-cfg-system -vyatta-bash -vyatta-op -vyatta-cfg -vyatta-wanloadbalance vyos-1x vyos-user-utils zstd diff --git a/docker-vyos/vyos_install_stage_01.sh b/docker-vyos/vyos_install_stage_01.sh index 10f1210e..42e8d1c8 100644 --- a/docker-vyos/vyos_install_stage_01.sh +++ b/docker-vyos/vyos_install_stage_01.sh @@ -24,11 +24,6 @@ prepare_apt # Get list of VyOS packages vyos_packages=( - "vyatta-cfg-system" - "vyatta-bash" - "vyatta-op" - "vyatta-cfg" - "vyatta-wanloadbalance" "vyos-1x" ) diff --git a/docker-vyos/vyos_install_stage_02.sh b/docker-vyos/vyos_install_stage_02.sh index 0e3384c4..58a62a8d 100644 --- a/docker-vyos/vyos_install_stage_02.sh +++ b/docker-vyos/vyos_install_stage_02.sh @@ -24,11 +24,6 @@ prepare_apt # Get list of VyOS packages vyos_packages=( - "vyatta-cfg-system" - "vyatta-bash" - "vyatta-op" - "vyatta-cfg" - "vyatta-wanloadbalance" "vyos-1x" ) diff --git a/vars/isCustomBuild.groovy b/vars/isCustomBuild.groovy index c5e5fab7..c60ed883 100644 --- a/vars/isCustomBuild.groovy +++ b/vars/isCustomBuild.groovy @@ -17,7 +17,7 @@ def call() { // Returns true if this is a custom build launched on any project fork. // Returns false if this is build from git@github.com:vyos/<reponame>. - // <reponame> can be e.g. vyos-1x.git or vyatta-op.git + // <reponame> can be e.g. vyos-1x.git // GitHub organisation base URL def gitURI = 'git@github.com:vyos/' + getGitRepoName() def httpURI = 'https://github.com/vyos/' + getGitRepoName() |