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

build: T3664: add support for building non-ISO flavors #550

Merged
merged 11 commits into from
Apr 20, 2024
Merged

build: T3664: add support for building non-ISO flavors #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7d2c84f
build: T3664: add vyos-1x as a submodule
dmbaturin Apr 7, 2024
a896176
build: T3664: add support for building non-ISO flavors
dmbaturin Apr 7, 2024
7fa66c7
Account for the working dir below the root in git invocation
jestabro Apr 10, 2024
c072689
build: T3664: filter out non-TOML files from the build flavor dir
dmbaturin Apr 13, 2024
72c7c7f
build: T3664: add a sanity check for image_format
dmbaturin Apr 13, 2024
ed7bcbd
fix path to versions file
jestabro Apr 10, 2024
c535510
docker: T3664: add dependencies for raw disk building
dmbaturin Apr 15, 2024
2928865
build: T3664: add a parameterized make rule for build targets
dmbaturin Apr 15, 2024
867567e
build: T3664: initialize git vyos-1x submodule before imports
jestabro Apr 15, 2024
008bb50
build: T3664: correct the parameterized make rule
dmbaturin Apr 15, 2024
abb5b51
build: T3664: move sudo out of the make target
dmbaturin Apr 16, 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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "vyos-1x"]
path = vyos-1x
c-po marked this conversation as resolved.
Show resolved Hide resolved
url = https://github.com/vyos/vyos-1x
8 changes: 2 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@ all:
@echo "Make what specifically?"
@echo "The most common target is 'iso'"

.PHONY: iso
.ONESHELL:
iso: clean
set -o pipefail
@./build-vyos-image iso
exit 0
%:
VYOS_TEMPLATE_DIR=`pwd`/vyos-1x/data/templates/ ./build-vyos-image $*

.PHONY: checkiso
.ONESHELL:
Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ RUN apt-get update && apt-get install -y \
python3-tomli \
yq \
debootstrap \
live-build
live-build \
gdisk \
dosfstools

# Packages for TPM test
RUN apt-get update && apt-get install -y swtpm
Expand Down
Loading
Loading