Skip to content

Commit 462821f

Browse files
committed
ci: fix mkosi REUSE and shell checks
1 parent 5b5d49e commit 462821f

13 files changed

Lines changed: 13 additions & 8 deletions

File tree

REUSE.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,14 @@ precedence = "override"
174174

175175
# Generated files
176176

177+
# Experimental Debian/mkosi guest OS backend. Some native configuration
178+
# formats (JSON, apt, kernel config and gitignore) cannot carry SPDX headers.
179+
[[annotations]]
180+
path = "os/mkosi/**"
181+
SPDX-FileCopyrightText = "© 2026 Phala Network <dstack@phala.network>"
182+
SPDX-License-Identifier = "Apache-2.0"
183+
precedence = "override"
184+
177185
[[annotations]]
178186
path = "dstack/kms/auth-eth/typechain-types/**"
179187
SPDX-FileCopyrightText = "NONE"

os/mkosi/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ build*/
22
repro*/
33
*.raw
44
*.raw.zst
5-

os/mkosi/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -euo pipefail
44
SELF=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
55
ROOT=$(cd "$SELF/../.." && pwd)
6+
# shellcheck source=/dev/null
67
source "$SELF/versions.env"
78
action=${1:-image}
89
BUILD_DIR=${2:-$SELF/build}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
Acquire::Check-Valid-Until "false";
22
APT::Install-Recommends "false";
33
APT::Install-Suggests "false";
4-

os/mkosi/mkosi.skeleton/etc/docker/daemon.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
"ip6tables": true,
44
"storage-driver": "overlay2"
55
}
6-
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
PasswordAuthentication no
22
KbdInteractiveAuthentication no
33
PermitRootLogin prohibit-password
4-

os/mkosi/mkosi.skeleton/etc/systemd/network/20-wired.network

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ Name=en* eth*
44
[Network]
55
DHCP=yes
66
IPv6AcceptRA=yes
7-

os/mkosi/mkosi.skeleton/etc/systemd/system/dstack-firstboot.service

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ RemainAfterExit=yes
99

1010
[Install]
1111
WantedBy=multi-user.target
12-

os/mkosi/scripts/build-kernel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -euo pipefail
44
ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)
55
MKOSI_DIR="$ROOT/os/mkosi"
6-
# shellcheck source=../versions.env
6+
# shellcheck source=/dev/null
77
source "$MKOSI_DIR/versions.env"
88
BUILD_DIR=${1:?build directory required}
99
STAGING=${2:?staging tree required}

os/mkosi/scripts/build-ovmf.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ sed -i -e 's/-flto/-fno-lto/g' -e 's/-DUSING_LTO//g' \
3030
sed -i 's/-Werror /-Werror -Wno-maybe-uninitialized -Wno-stringop-overflow /g' \
3131
"$src/BaseTools/Conf/tools_def.template"
3232
rm -f "$src/Conf/tools_def.txt"
33+
# shellcheck source=/dev/null
3334
(cd "$src" && set +u && source edksetup.sh BaseTools >/dev/null && \
3435
build -a X64 -t GCC5 -b RELEASE -n "${JOBS:-$(nproc)}" \
3536
-p OvmfPkg/IntelTdx/IntelTdxX64.dsc)

0 commit comments

Comments
 (0)