diff options
| -rw-r--r-- | data/architectures/arm64.toml | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index ebf14ef4..4d8596c6 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -6,7 +6,7 @@ bootloaders = "grub-efi" [additional_repositories.salt] architecture = "arm64" - url = "https://packages.vyos.net/saltproject/debian/11/amd64/3005" + url = "https://packages.vyos.net/saltproject/debian/11/arm64/3005" distribution = "bullseye" [additional_repositories.zabbix] diff --git a/docker/Dockerfile b/docker/Dockerfile index 36992bd2..1b73ca66 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -109,7 +109,8 @@ RUN apt-get update && apt-get install -y \ live-build \ gdisk \ sbsigntool \ - dosfstools + dosfstools \ + kpartx # Packages for TPM test RUN apt-get update && apt-get install -y swtpm @@ -285,7 +286,6 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ # This is only supported on i386 and amd64 platforms RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ apt-get update && apt-get install -y \ - kpartx \ parted \ udev \ grub-pc \ diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index c79a365a..3275c5de 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -618,7 +618,7 @@ DOCUMENTATION_URL="{build_config['documentation_url']}" lb config noauto \ --no-color \ --apt-indices false \ - --apt-options "--yes -oAPT::Get::allow-downgrades=true" \ + --apt-options "--yes" \ --apt-recommends false \ --architecture "{{architecture}}" \ --archive-areas "{{debian_archive_areas}}" \ |