Merge pull request #680 from c-po/no-legacy

T6527: remove legacy packages

Makefile

@@ -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:

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

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"
     )
 

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"
     )
 

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()