Vendor apple/containerization with a VM-extensions forwarding patch
Switch the containerization dependency from the github URL to a vendored copy (third_party/containerization, upstream commit 6b7b42ca) referenced by path, so we can carry a small local patch that upstream lacks: LinuxContainer.Configuration gains a `vmExtensions` field forwarded into VMConfiguration.extensions. Upstream already supports VMConfiguration.extensions + the VZInstanceExtension hook, but LinuxContainer — our only entry point — never forwarded them, so there was no way to attach a device (e.g. a memory balloon) to a container's VM. Tests/, docs/, examples/, images/ and the corresponding test targets are trimmed for footprint (we never build the dependency's tests). See PATCHES.md for the full diff vs. upstream and the re-vendoring procedure. Also adds the ContainerizationExtras product to NucleicCore (AddressAllocator, named in the configureVZ signature). Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
Nucleic
@@ -0,0 +1,104 @@
|
||||
# Copyright © 2025-2026 Apple Inc. and the Containerization project authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
BUILD_CONFIGURATION ?= debug
|
||||
WARNINGS_AS_ERRORS ?= true
|
||||
export GIT_COMMIT := $(shell git rev-parse HEAD)
|
||||
export GIT_TAG := $(shell git describe --tags --exact-match 2>/dev/null || echo "")
|
||||
export BUILD_TIME := $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
|
||||
SWIFT_WARNING_CONFIG := $(if $(filter-out false,$(WARNINGS_AS_ERRORS)),-Xswiftc -warnings-as-errors)
|
||||
UNAME_M := $(shell uname -m)
|
||||
ifeq ($(UNAME_M),arm64)
|
||||
MUSL_ARCH := aarch64
|
||||
else ifeq ($(UNAME_M),aarch64)
|
||||
MUSL_ARCH := aarch64
|
||||
else
|
||||
MUSL_ARCH := x86_64
|
||||
endif
|
||||
|
||||
LIBC ?= musl
|
||||
ifeq ($(LIBC),musl)
|
||||
SWIFT_SDK_FLAGS := --swift-sdk $(MUSL_ARCH)-swift-linux-musl
|
||||
endif
|
||||
|
||||
SWIFT_CONFIGURATION := $(SWIFT_SDK_FLAGS) $(SWIFT_WARNING_CONFIG) -Xlinker -s --disable-automatic-resolution
|
||||
|
||||
SWIFT_VERSION := 6.3.0
|
||||
SWIFT_SDK_URL := https://download.swift.org/swift-6.3-release/static-sdk/swift-6.3-RELEASE/swift-6.3-RELEASE_static-linux-0.1.0.artifactbundle.tar.gz
|
||||
SWIFT_SDK_CHECKSUM := d2078b69bdeb5c31202c10e9d8a11d6f66f82938b51a4b75f032ccb35c4c286c
|
||||
SWIFT_SDK_PATH := /tmp/$(notdir $(SWIFT_SDK_URL))
|
||||
|
||||
SYSTEM_TYPE := $(shell uname -s)
|
||||
ifeq ($(SYSTEM_TYPE),Darwin)
|
||||
SWIFTLY_URL := https://download.swift.org/swiftly/darwin/swiftly.pkg
|
||||
SWIFTLY_FILENAME := $(notdir $(SWIFTLY_URL))
|
||||
SWIFTLY_BIN_DIR ?= ~/.swiftly/bin
|
||||
SWIFT := $(SWIFTLY_BIN_DIR)/swift
|
||||
else
|
||||
SWIFT ?= swift
|
||||
endif
|
||||
BUILD_BIN_DIR := $(shell $(SWIFT) build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --show-bin-path)
|
||||
|
||||
ifeq ($(SYSTEM_TYPE),Darwin)
|
||||
MACOS_VERSION := $(shell sw_vers -productVersion)
|
||||
MACOS_MAJOR := $(shell echo $(MACOS_VERSION) | cut -d. -f1)
|
||||
MACOS_RELEASE_TYPE := $(shell sw_vers | grep ReleaseType)
|
||||
endif
|
||||
|
||||
.DEFAULT_GOAL := all
|
||||
|
||||
.PHONY: all
|
||||
all:
|
||||
@echo Building vminitd and vmexec...
|
||||
@mkdir -p ./bin/
|
||||
@rm -f ./bin/vminitd
|
||||
@rm -f ./bin/vmexec
|
||||
@$(SWIFT) --version
|
||||
@$(SWIFT) build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION)
|
||||
@install "$(BUILD_BIN_DIR)/vminitd" ./bin/
|
||||
@install "$(BUILD_BIN_DIR)/vmexec" ./bin/
|
||||
|
||||
.PHONY: cross-prep
|
||||
cross-prep: swift linux-sdk
|
||||
|
||||
.PHONY: swiftly
|
||||
swiftly:
|
||||
@if ! command -v ${SWIFTLY_BIN_DIR}/swiftly > /dev/null 2>&1; then \
|
||||
echo "Installing Swiftly..."; \
|
||||
curl -o /var/tmp/$(SWIFTLY_FILENAME) $(SWIFTLY_URL) && \
|
||||
installer -pkg /var/tmp/$(SWIFTLY_FILENAME) -target CurrentUserHomeDirectory && \
|
||||
${SWIFTLY_BIN_DIR}/swiftly init --quiet-shell-followup --skip-install && \
|
||||
. ~/.swiftly/env.sh && \
|
||||
hash -r && \
|
||||
rm /var/tmp/$(SWIFTLY_FILENAME); \
|
||||
fi
|
||||
|
||||
.PHONY: swift
|
||||
swift: swiftly
|
||||
@echo Installing Swift $(SWIFT_VERSION)...
|
||||
@${SWIFTLY_BIN_DIR}/swiftly install $(SWIFT_VERSION)
|
||||
|
||||
.PHONY: linux-sdk
|
||||
linux-sdk:
|
||||
@echo Installing Static Linux SDK...
|
||||
@curl -L -o $(SWIFT_SDK_PATH) $(SWIFT_SDK_URL)
|
||||
-@$(SWIFT) sdk install $(SWIFT_SDK_PATH) --checksum $(SWIFT_SDK_CHECKSUM)
|
||||
@rm $(SWIFT_SDK_PATH)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
@echo Cleaning the vminitd build files...
|
||||
@rm -f ./bin/vminitd
|
||||
@rm -f ./bin/vmexec
|
||||
@rm -rf .build
|
||||
Reference in New Issue
Block a user