File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed
Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -55,14 +55,18 @@ check-repro: ## Build same module twice and compare resulting images
5555 @rm -rf build.2
5656
5757 @rm -rf build/* mkosi.builddir/* mkosi.cache/* mkosi.packages/*
58- @sleep 5
58+ # hack: there's some race condition under lima that causes apt to fail while trying to
59+ # create a temp dir under apt cache
60+ @sleep 15
5961
6062 @echo "Building image # 1..."
6163 $(WRAPPER) mkosi --force -I $(IMAGE).conf
6264 @cp -r build build.1
6365
6466 @rm -rf build/* mkosi.builddir/* mkosi.cache/* mkosi.packages/*
65- @sleep 5
67+ # hack: there's some race condition under lima that causes apt to fail while trying to
68+ # create a temp dir under apt cache
69+ @sleep 15
6670
6771 @echo "Building image # 2..."
6872 $(WRAPPER) mkosi --force -I $(IMAGE).conf
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ debloat_paths=(
3939 " /nix"
4040)
4141
42- if [[ ! " $PROFILES " == * " devtools" * ]]; then
42+ if [[ ! " ${ PROFILES:- } " == * " devtools" * ]]; then
4343 debloat_paths+=(
4444 " /usr/share/bash-completion"
4545 )
You can’t perform that action at this time.
0 commit comments