vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: vyos:db23b29ceb56a19873f00426f15f67503361de36
Branches Tags
vyos:current
vyos:cla
vyos:c-po-patch-1
vyos:sagitta
vyos:circinus
vyos:main
vyos:ga-test
vyos:equuleus
vyos:crux
vyos:1.3.8
vyos:1.4.0
vyos:1.3.7
vyos:1.4.0-epa2
vyos:1.4.0-epa1
vyos:1.3.6
vyos:1.4.0-rc3
vyos:1.3.5
vyos:1.3.4
vyos:1.3.3
vyos:1.3.3-epa1
vyos:1.2.9-S1
vyos:1.3.2
vyos:1.3.1
vyos:vyos/1.2.6
vyos:VyOS_1.2-2019Q4
vyos:vyos/1.2.4
...
compare: vyos:58a30bd14abea0f8532b34cdcdc7e7dccb7aa76e
Branches Tags
vyos:current
vyos:cla
vyos:c-po-patch-1
vyos:sagitta
vyos:circinus
vyos:main
vyos:ga-test
vyos:equuleus
vyos:crux
vyos:1.3.8
vyos:1.4.0
vyos:1.3.7
vyos:1.4.0-epa2
vyos:1.4.0-epa1
vyos:1.3.6
vyos:1.4.0-rc3
vyos:1.3.5
vyos:1.3.4
vyos:1.3.3
vyos:1.3.3-epa1
vyos:1.2.9-S1
vyos:1.3.2
vyos:1.3.1
vyos:vyos/1.2.6
vyos:VyOS_1.2-2019Q4
vyos:vyos/1.2.4

6 Commits
db23b29ceb ... 58a30bd14a

Author SHA1 Message Date
Christian Breunig
58a30bd14a
Merge pull request #953 from dmbaturin/T7399-no-apt-downgrade 
build: T7399: remove the APT option to allow downgrades
 2025-04-28 21:30:06 +02:00
Christian Breunig
a2979842a7
Merge pull request #956 from tjjh89017/T7407 
T7407: fix the incorrect url for arm64 salt pkgs
 2025-04-28 21:29:25 +02:00
Christian Breunig
a4318d2228
Merge pull request #954 from tjjh89017/arm64 
T7405: add missing dependency kpartx for all archs
 2025-04-28 21:28:37 +02:00
Date Huang
82a40e68c7 T7407: fix the incorrect url for arm64 salt pkgs 
Signed-off-by: Date Huang <tjjh89017@hotmail.com>
 2025-04-28 21:45:44 +08:00
Date Huang
b894227750 T7405: add missing dependency kpartx for all archs 
Signed-off-by: Date Huang <tjjh89017@hotmail.com>
 2025-04-27 14:39:20 +08:00
Daniil Baturin
1f400a4b01 build: T7399: remove the APT option to allow downgrades 
It doesn't appear necessary anymore, if it ever was
 2025-04-25 19:45:03 +01:00
3 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
data/architectures/arm64.toml
View File

@ -6,7 +6,7 @@ bootloaders = "grub-efi"
[additional_repositories.salt] [additional_repositories.salt]
architecture = "arm64" architecture = "arm64"
url = "https://packages.vyos.net/saltproject/debian/11/amd64/3005" url = "https://packages.vyos.net/saltproject/debian/11/arm64/3005"
distribution = "bullseye" distribution = "bullseye"
[additional_repositories.zabbix] [additional_repositories.zabbix]

4
docker/Dockerfile
View File

@ -109,7 +109,8 @@ RUN apt-get update && apt-get install -y \
live-build \ live-build \
gdisk \ gdisk \
sbsigntool \ sbsigntool \
dosfstools dosfstools \
kpartx
# Packages for TPM test # Packages for TPM test
RUN apt-get update && apt-get install -y swtpm 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 # This is only supported on i386 and amd64 platforms
RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
apt-get update && apt-get install -y \ apt-get update && apt-get install -y \
kpartx \
parted \ parted \
udev \ udev \
grub-pc \ grub-pc \

2
scripts/image-build/build-vyos-image
View File

@ -618,7 +618,7 @@ DOCUMENTATION_URL="{build_config['documentation_url']}"
lb config noauto \ lb config noauto \
--no-color \ --no-color \
--apt-indices false \ --apt-indices false \
--apt-options "--yes -oAPT::Get::allow-downgrades=true" \ --apt-options "--yes" \
--apt-recommends false \ --apt-recommends false \
--architecture "{{architecture}}" \ --architecture "{{architecture}}" \
--archive-areas "{{debian_archive_areas}}" \ --archive-areas "{{debian_archive_areas}}" \