Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

T1416: T861: T3664: T3664: T2640: various cleanup commits #751

Merged
merged 7 commits into from
Sep 5, 2024
Merged

T1416: T861: T3664: T3664: T2640: various cleanup commits #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d50707b
T1416: remove deprecated default-union-grub-entry
c-po Sep 4, 2024
388efd9
Makefile: T861: add possibility to pass CLI options to check-qemu-ins…
c-po Sep 4, 2024
3e9cda2
Docker: T861: fix warnings about latest ENV key=value syntax
c-po Sep 4, 2024
f539219
telegraf: T3664: remove package dependency
c-po Sep 4, 2024
3170bca
build: T3664: remove unused psutil dependency
c-po Sep 4, 2024
d851548
Makefile: T2640: fix PHONY typo
c-po Sep 4, 2024
6867177
T4974: remove package openvpn-dco as it has a proper dependency via v…
c-po Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,28 @@ test-no-interfaces: checkiso
.PHONY: testc
.ONESHELL:
testc: checkiso
scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso
scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))

.PHONY: testraid
.ONESHELL:
testraid: checkiso
scripts/check-qemu-install --debug --configd --raid --configtest build/live-image-amd64.hybrid.iso
scripts/check-qemu-install --debug --configd --raid --configtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))

.PHONY: testtpm
.ONESHELL:
testtpm: checkiso
scripts/check-qemu-install --debug --tpmtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))

.PHONY: qemu-live
.ONESHELL:
qemu-live: checkiso
scripts/check-qemu-install --qemu-cmd build/live-image-amd64.hybrid.iso
scripts/check-qemu-install --qemu-cmd --uefi build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))

.PHONE: oci
.PHONY: oci
.ONESHELL:
oci: checkiso
scripts/iso-to-oci build/live-image-amd64.hybrid.iso

.PHONY: testtpm
.ONESHELL:
testtpm: checkiso
scripts/check-qemu-install --debug --tpmtest build/live-image-amd64.hybrid.iso

.PHONY: clean
.ONESHELL:
clean:
Expand Down
2 changes: 0 additions & 2 deletions data/architectures/amd64.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@ packages = [
"vyos-intel-ixgbevf",
"mlnx-ofed-kernel-modules",
"mlnx-tools",
"openvpn-dco",
"telegraf"
]
4 changes: 3 additions & 1 deletion data/architectures/arm64.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ additional_repositories = [
kernel_flavor = "arm64-vyos"

# Packages included in ARM64 images by default
packages = ["grub-efi-arm64", "openvpn-dco"]
packages = [
"grub-efi-arm64",
]
bootloaders = "grub-efi"
20 changes: 0 additions & 20 deletions data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ LABEL authors="VyOS Maintainers <[email protected]>" \
org.opencontainers.image.title="vyos-build" \
org.opencontainers.image.description="Container to build VyOS ISO" \
org.opencontainers.image.base.name="docker.io/debian/debian:bookworm"
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN /bin/echo -e 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommends

Expand All @@ -60,9 +60,9 @@ RUN apt-get update && apt-get install -y \
locales

RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
ENV LANG en_US.utf8
ENV LANG=en_US.utf8

ENV OCAML_VERSION 4.14.2
ENV OCAML_VERSION=4.14.2

# Base packaged needed to build packages and their package dependencies
RUN apt-get update && apt-get install -y \
Expand Down
3 changes: 1 addition & 2 deletions scripts/image-build/build-vyos-image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@ try:
import tomli
import jinja2
import git
import psutil
except ModuleNotFoundError as e:
print(f"E: Cannot load required library {e}")
print("E: Please make sure the following Python3 modules are installed: tomli jinja2 git psutil")
print("E: Please make sure the following Python3 modules are installed: tomli jinja2 git")
sys.exit(1)

# Import local defaults
Expand Down
Loading