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:
@@ -0,0 +1,71 @@
|
||||
// swift-tools-version: 6.3
|
||||
//===----------------------------------------------------------------------===//
|
||||
// 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.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||
|
||||
import Foundation
|
||||
import PackageDescription
|
||||
|
||||
let gitCommit = ProcessInfo.processInfo.environment["GIT_COMMIT"] ?? "unspecified"
|
||||
let gitTag = ProcessInfo.processInfo.environment["GIT_TAG"] ?? ""
|
||||
let buildTime = ProcessInfo.processInfo.environment["BUILD_TIME"] ?? "unspecified"
|
||||
|
||||
let package = Package(
|
||||
name: "swift-vminitd",
|
||||
platforms: [.macOS("15")],
|
||||
products: [
|
||||
.executable(name: "vminitd", targets: ["vminitd"]),
|
||||
.executable(name: "vmexec", targets: ["vmexec"]),
|
||||
],
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.7.0"),
|
||||
.package(url: "https://github.com/apple/swift-log.git", from: "1.10.1"),
|
||||
.package(url: "https://github.com/apple/swift-system.git", from: "1.6.4"),
|
||||
.package(name: "containerization", path: "../"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "CVersion",
|
||||
cSettings: [
|
||||
.define("GIT_COMMIT", to: "\"\(gitCommit)\""),
|
||||
.define("GIT_TAG", to: "\"\(gitTag)\""),
|
||||
.define("BUILD_TIME", to: "\"\(buildTime)\""),
|
||||
]
|
||||
),
|
||||
.executableTarget(
|
||||
name: "vminitd",
|
||||
dependencies: [
|
||||
.product(name: "ArgumentParser", package: "swift-argument-parser"),
|
||||
.product(name: "ContainerizationOS", package: "containerization"),
|
||||
.product(name: "Logging", package: "swift-log"),
|
||||
.product(name: "VminitdCore", package: "containerization"),
|
||||
"CVersion",
|
||||
]
|
||||
),
|
||||
.executableTarget(
|
||||
name: "vmexec",
|
||||
dependencies: [
|
||||
.product(name: "Logging", package: "swift-log"),
|
||||
.product(name: "ArgumentParser", package: "swift-argument-parser"),
|
||||
.product(name: "SystemPackage", package: "swift-system"),
|
||||
.product(name: "Containerization", package: "containerization"),
|
||||
.product(name: "ContainerizationOS", package: "containerization"),
|
||||
.product(name: "VminitdCore", package: "containerization"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
Reference in New Issue
Block a user