Skip to content

Commit

Permalink
T6507: remove references to vyos-world package
Browse files Browse the repository at this point in the history
As we got rid of most of the old vyatta packages we can now also discontinue
vyos-world. It only served the purpose of keeping the package list during ISO
build small.
  • Loading branch information
c-po committed Jun 22, 2024
1 parent 65333b4 commit 056fa73
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 10 deletions.
7 changes: 6 additions & 1 deletion data/live-build-config/package-lists/vyos-base.list.chroot
Original file line number Diff line number Diff line change
@@ -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
9 changes: 8 additions & 1 deletion docker-vyos/vyos_install_stage_01.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
9 changes: 8 additions & 1 deletion docker-vyos/vyos_install_stage_02.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
8 changes: 1 addition & 7 deletions scripts/list-build-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,7 @@ echo ""

GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)

# First we need to get vyos-world so we know all individual packages for VyOS
curl -L https://github.com/vyos/vyos-world/raw/$GIT_BRANCH/debian/control \
--output /tmp/vyos-world.control --retry 100 --retry-delay 1 --silent

VYOS_PACKAGES=$(get_runtime_depends /tmp/vyos-world.control)
rm -f /tmp/vyos-world.control
for pkg in $VYOS_PACKAGES
for pkg in vyatta-cfg-system vyatta-bash vyatta-op vyatta-cfg vyatta-wanloadbalance vyos-1x
do
# Check if repo exists
res=$(curl -o /dev/null --silent -Iw '%{http_code}' https://github.com/vyos/$pkg)
Expand Down

0 comments on commit 056fa73

Please sign in to comment.