Skip to content

Commit 280af87

Browse files
committed
Makefile: Add required dependencies
Some of the targets rely on others but weren't actually listed: - init relies on containerization as it invokes cctl. - integration relies on init as it needs the rootfs with vminitd inside.
1 parent 21408d3 commit 280af87

File tree

6 files changed

+1
-11
lines changed

6 files changed

+1
-11
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ containerization:
5454
@codesign --force --sign - --timestamp=none --entitlements=signing/vz.entitlements bin/containerization-integration
5555

5656
.PHONY: init
57-
init: vminitd
57+
init: containerization vminitd
5858
@echo Creating init.ext4...
5959
@rm -f bin/init.rootfs.tar.gz bin/init.block
6060
@./bin/cctl rootfs create --vminitd vminitd/bin/vminitd --labels org.opencontainers.image.source=https://github.com/apple/containerization --vmexec vminitd/bin/vmexec bin/init.rootfs.tar.gz vminit:latest

vminitd/Sources/vmexec/ExecCommand.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
//===----------------------------------------------------------------------===//
1616

1717
import ArgumentParser
18-
import Containerization
19-
import ContainerizationError
2018
import ContainerizationOCI
21-
import ContainerizationOS
2219
import Foundation
2320
import LCShim
2421
import Logging

vminitd/Sources/vmexec/RunCommand.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
//===----------------------------------------------------------------------===//
1616

1717
import ArgumentParser
18-
import Containerization
19-
import ContainerizationError
2018
import ContainerizationOCI
21-
import ContainerizationOS
2219
import Foundation
2320
import LCShim
2421
import Logging

vminitd/Sources/vmexec/vmexec.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
/// and mount namespace.
2121

2222
import ArgumentParser
23-
import Containerization
2423
import ContainerizationError
2524
import ContainerizationOCI
26-
import ContainerizationOS
2725
import Foundation
2826
import LCShim
2927
import Logging

vminitd/Sources/vminitd/StandardIO.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// limitations under the License.
1515
//===----------------------------------------------------------------------===//
1616

17-
import Containerization
1817
import ContainerizationOS
1918
import Foundation
2019
import Logging

vminitd/Sources/vminitd/TerminalIO.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// limitations under the License.
1515
//===----------------------------------------------------------------------===//
1616

17-
import Containerization
1817
import ContainerizationOS
1918
import Foundation
2019
import Logging

0 commit comments

Comments
 (0)