Merge pull request #667 from c-po/T6507-drop-vyos-world

T6507: remove references to vyos-world package
vyos · Jun 27, 2024 · 057db80 · 057db80
2 parents b90a73b + 6e0f62a
commit 057db80
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 123 deletions.
diff --git a/data/live-build-config/package-lists/vyos-base.list.chroot b/data/live-build-config/package-lists/vyos-base.list.chroot
@@ -1,6 +1,11 @@
 debconf
 gpgv
 gnupg
-vyos-world
+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
@@ -23,7 +23,14 @@ echo "Configuring APT repositories"
 prepare_apt
 
 # Get list of VyOS packages
-vyos_packages=(`apt-cache -i depends vyos-world | awk '/Depends:/ { printf("%s ", $2) }'`)
+vyos_packages=(
+    "vyatta-cfg-system"
+    "vyatta-bash"
+    "vyatta-op"
+    "vyatta-cfg"
+    "vyatta-wanloadbalance"
+    "vyos-1x"
+    )
 
 # Do not analyze packages, which we do not need in Docker
 vyos_packages_filter=(

diff --git a/docker-vyos/vyos_install_stage_02.sh b/docker-vyos/vyos_install_stage_02.sh
@@ -23,7 +23,14 @@ echo "Configuring APT repositories"
 prepare_apt
 
 # Get list of VyOS packages
-vyos_packages=(`apt-cache -i depends vyos-world | awk '/Depends:/ { printf("%s ", $2) }'`)
+vyos_packages=(
+    "vyatta-cfg-system"
+    "vyatta-bash"
+    "vyatta-op"
+    "vyatta-cfg"
+    "vyatta-wanloadbalance"
+    "vyos-1x"
+    )
 
 # Do not analyze packages, which we do not need in Docker
 vyos_packages_filter=(

diff --git a/scripts/list-build-dependencies b/scripts/list-build-dependencies