Skip to content

Makefile: Revert recent reworking #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crosbymichael merged 2 commits into from
Jun 26, 2025
Merged

Makefile: Revert recent reworking #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21408d3
Revert "Provides explicit makefile targets for files (#167)"
dcantah Jun 26, 2025
280af87
Makefile: Add required dependencies
dcantah Jun 26, 2025
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
38 changes: 14 additions & 24 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,39 +40,33 @@ release: BUILD_CONFIGURATION = release
release: all

.PHONY: containerization
containerization: bin/cctl bin/containerization-integration

.PHONY: swift-build
swift-build:
containerization:
@echo Building containerization binaries...
@mkdir -p bin
@$(SWIFT) build -c $(BUILD_CONFIGURATION)

$(BUILD_BIN_DIR)/cctl $(BUILD_BIN_DIR)/containerization-integration:
@"$(MAKE)" swift-build
@echo Copying containerization binaries...
@install $(BUILD_BIN_DIR)/cctl ./bin/
@install $(BUILD_BIN_DIR)/containerization-integration ./bin/

bin/%: $(BUILD_BIN_DIR)/%
@mkdir -p bin/
@install $< bin/
@codesign --force --sign - --timestamp=none --entitlements=signing/vz.entitlements $@
@echo Signing containerization binaries...
@codesign --force --sign - --timestamp=none --entitlements=signing/vz.entitlements bin/cctl
@codesign --force --sign - --timestamp=none --entitlements=signing/vz.entitlements bin/containerization-integration

init := bin/init.rootfs.tar.gz
.PHONY: init
init: $(init)

$(init): vminitd/bin/vminitd vminitd/bin/vmexec bin/cctl
init: containerization vminitd
@echo Creating init.ext4...
@rm -f $(init) bin/init.block
@./bin/cctl rootfs create --vminitd vminitd/bin/vminitd --labels org.opencontainers.image.source=https://github.com/apple/containerization --vmexec vminitd/bin/vmexec $(init) vminit:latest
@rm -f bin/init.rootfs.tar.gz bin/init.block
@./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

.PHONY: cross-prep
cross-prep:
@"$(MAKE)" -C vminitd cross-prep

.PHONY: vminitd
vminitd: vminitd/bin/vminitd vminitd/bin/vmexec

vminitd/bin/%:
@"$(MAKE)" -C vminitd BUILD_CONFIGURATION=$(BUILD_CONFIGURATION) bin/$*
vminitd:
@mkdir -p ./bin
@"$(MAKE)" -C vminitd BUILD_CONFIGURATION=$(BUILD_CONFIGURATION)

.PHONY: update-libarchive-source
update-libarchive-source:
Expand All @@ -94,10 +88,6 @@ ifeq (,$(wildcard bin/vmlinux))
@echo No bin/vmlinux kernel found. See fetch-default-kernel target.
@exit 1
endif
@"$(MAKE)" integration-kernel-checked

.PHONY: integration-kernel-checked
integration-kernel-checked: $(init) bin/containerization-integration
@echo Running the integration tests...
@./bin/containerization-integration --bootlog ./bin/boot.log

Expand Down
18 changes: 6 additions & 12 deletions vminitd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,14 @@ MACOS_RELEASE_TYPE := $(shell sw_vers | grep ReleaseType)
.DEFAULT_GOAL := all

.PHONY: all
all: bin/vminitd bin/vmexec

.PHONY: swift-build
swift-build:
all:
@echo Building vminitd and vmexec...
@mkdir -p ./bin/
@rm -f ./bin/vminitd
@rm -f ./bin/vmexec
@swift build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION)

$(VMINITD_BIN_PATH)/vminitd $(VMINITD_BIN_PATH)/vmexec:
@$(MAKE) swift-build

bin/%: $(VMINITD_BIN_PATH)/%
@mkdir -p bin/
@rm -f $@
@install $< bin/
@install $(VMINITD_BIN_PATH)/vminitd ./bin/vminitd
@install $(VMINITD_BIN_PATH)/vmexec ./bin/vmexec

.PHONY: cross-prep
cross-prep: linux-sdk macos-sdk
Expand Down
3 changes: 0 additions & 3 deletions vminitd/Sources/vmexec/ExecCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
//===----------------------------------------------------------------------===//

import ArgumentParser
import Containerization
import ContainerizationError
import ContainerizationOCI
import ContainerizationOS
import Foundation
import LCShim
import Logging
Expand Down
3 changes: 0 additions & 3 deletions vminitd/Sources/vmexec/RunCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
//===----------------------------------------------------------------------===//

import ArgumentParser
import Containerization
import ContainerizationError
import ContainerizationOCI
import ContainerizationOS
import Foundation
import LCShim
import Logging
Expand Down
2 changes: 0 additions & 2 deletions vminitd/Sources/vmexec/vmexec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@
/// and mount namespace.

import ArgumentParser
import Containerization
import ContainerizationError
import ContainerizationOCI
import ContainerizationOS
import Foundation
import LCShim
import Logging
Expand Down
1 change: 0 additions & 1 deletion vminitd/Sources/vminitd/StandardIO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
// limitations under the License.
//===----------------------------------------------------------------------===//

import Containerization
import ContainerizationOS
import Foundation
import Logging
Expand Down
1 change: 0 additions & 1 deletion vminitd/Sources/vminitd/TerminalIO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
// limitations under the License.
//===----------------------------------------------------------------------===//

import Containerization
import ContainerizationOS
import Foundation
import Logging
Expand Down