Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bob-l1.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Include=bob-common/mkosi.conf
Include=bob-l1/mkosi.conf

[Config]
Profiles=azure
Profiles=azure,gcp

[Distribution]
Mirror=https://snapshot.debian.org/archive/debian/20251113T083151Z/
Expand Down
2 changes: 1 addition & 1 deletion bob-l1/kernel.config
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ CONFIG_NET_SCHED=y
CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
CONFIG_CRYPTO_USER_API_RNG=y
CONFIG_CRYPTO_USER_API_AEAD=y
CONFIG_CRYPTO_USER_API_AEAD=y
4 changes: 1 addition & 3 deletions bob-l1/mkosi.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
[Build]
Environment=LIGHTHOUSE_BINARY KERNEL_CONFIG_SNIPPETS=bob-l1/kernel.config KERNEL_VERSION=6.13.12
Environment=LIGHTHOUSE_BINARY KERNEL_CONFIG_SNIPPETS=kernel/snippets/ubuntu.config,bob-l1/kernel.config KERNEL_VERSION=6.13.12
WithNetwork=true

[Content]
ExtraTrees=bob-l1/mkosi.extra
PostInstallationScripts=bob-l1/mkosi.postinst
BuildScripts=bob-l1/mkosi.build

Packages=openntpd

BuildPackages=build-essential
git
gcc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[Unit]
After=azure-complete-provisioning.service
Requires=azure-complete-provisioning.service
Wants=azure-complete-provisioning.service
3 changes: 1 addition & 2 deletions bob-l1/mkosi.postinst
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ install -m 755 services/bin/lighthouse-init "$BUILDROOT/usr/bin/"
# Enable services
mkdir -p "$BUILDROOT/etc/systemd/system/minimal.target.wants"
for service in \
lighthouse.service \
openntpd.service
lighthouse.service
do
mkosi-chroot systemctl enable "$service"
ln -sf "/etc/systemd/system/$service" "$BUILDROOT/etc/systemd/system/minimal.target.wants/"
Expand Down
6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
src = pkgs.fetchFromGitHub {
owner = "flashbots";
repo = "dstack-mr-gcp";
rev = "3d718ab28599ea0c05e65d0f742fdee9fc17a5c7";
sha256 = "sha256-KFo9wcQuG98Hi4mlMr5VS6D6/STW7jzZ9y1DyqsI820=";
rev = "ee95d36c8f18d159f6ada31474555e4a253b3897";
sha256 = "sha256-vAYN4zFXHSxd86KP+Toqh1ZDa4+KGLNsQoOuTr45pGg=";
};
vendorHash = "sha256-MxOQSXLAbWC1SOCPzPrNcU20WElbe7eUVdCLTutSYM8=";
vendorHash = "sha256-glOyRTrIF/zP78XGV+v58a1Bec6C3Fvc5c8G3PglzPM=";
};
mkosi = system: let
pkgsForSystem = import nixpkgs {inherit system;};
Expand Down
15 changes: 13 additions & 2 deletions kernel/mkosi.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,20 @@ if [[ -n "${KERNEL_CONFIG_SNIPPETS:-}" ]]; then
IFS=',' read -ra snippets <<< "$KERNEL_CONFIG_SNIPPETS"
for snippet in "${snippets[@]}"; do
snippet_file="$SRCDIR/$snippet"
[[ -f "$snippet_file" ]] && cat "$snippet_file" >> "$config_file"
if [[ -f "$snippet_file" ]]; then
cat "$snippet_file" >> "$config_file" || true
fi
done
fi
for snippets_var in "${!KERNEL_CONFIG_SNIPPETS_@}"; do
IFS=',' read -ra snippets <<< "${!snippets_var}"
for snippet in "${snippets[@]}"; do
snippet_file="$SRCDIR/$snippet"
if [[ -f "$snippet_file" ]]; then
cat "$snippet_file" >> "$config_file" || true
fi
done
done

# Calculate cache key and paths
config_hash=$(sha256sum "$config_file" | cut -d' ' -f1 | cut -c1-12)
Expand All @@ -37,7 +48,7 @@ else
# Build kernel
cd "$build_dir"
cp "$config_file" .config
export KBUILD_BUILD_TIMESTAMP="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%s)})"
export KBUILD_BUILD_TIMESTAMP="$(date -u -d @$(git log -1 --pretty=%ct))"
export KBUILD_BUILD_USER="mkosi" KBUILD_BUILD_HOST="mkosi-builder"

mkosi-chroot --chdir "/build/kernel-${KERNEL_VERSION}" make olddefconfig
Expand Down
Loading