static: remove target_platform and switch to xx

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

Makefile

@@ -54,6 +54,10 @@ src/github.com/docker/scan-cli-plugin:
 	git init $@
 	git -C $@ remote add origin "$(DOCKER_SCAN_REPO)"
 
+src/github.com/tonistiigi/xx:
+	$(call title,Init $(XX_REPO))
+	git init $@
+	git -C $@ remote add origin "$(XX_REPO)"
 
 .PHONY: checkout-cli
 checkout-cli: src/github.com/docker/cli
@@ -83,6 +87,11 @@ checkout-scan-cli-plugin: src/github.com/docker/scan-cli-plugin
 .PHONY: checkout
 checkout: checkout-cli checkout-docker checkout-buildx checkout-compose checkout-scan-cli-plugin ## checkout source at the given reference(s)
 
+.PHONY: checkout-xx
+checkout-xx: src/github.com/tonistiigi/xx
+	$(call title,Checkout $(XX_REPO)#$(XX_REF))
+	./scripts/checkout.sh src/github.com/tonistiigi/xx "$(XX_REF)"
+
 .PHONY: clean
 clean: clean-src ## remove build artifacts
 	$(MAKE) -C rpm clean
@@ -101,9 +110,8 @@ centos-% fedora-% rhel-%: checkout ## build rpm packages for the specified distr
 debian-% raspbian-% ubuntu-%: checkout ## build deb packages for the specified distro
 	$(MAKE) -C deb $@
 
-
 .PHONY: static
-static: checkout ## build static package
+static: checkout checkout-xx ## build static package
 	$(MAKE) -C static build
 
 .PHONY: verify

common.mk

@@ -43,6 +43,10 @@ DOCKER_SCAN_REF    ?= v0.17.0
 DOCKER_COMPOSE_REF ?= v2.6.1
 DOCKER_BUILDX_REF  ?= v0.8.2
 
+# XX is used as cross-compilation helper for static bundles
+XX_REPO ?= https://github.com/tonistiigi/xx.git
+XX_REF  ?= v1.1.1
+
 # Use "stage" to install dependencies from download-stage.docker.com during the
 # verify step. Leave empty or use any other value to install from download.docker.com
 VERIFY_PACKAGE_REPO ?= staging

scripts/target-platform

@@ -5,6 +5,7 @@ ENGINE_DIR=$(realpath $(CURDIR)/../src/github.com/docker/docker)
 BUILDX_DIR=$(realpath $(CURDIR)/../src/github.com/docker/buildx)
 COMPOSE_DIR=$(realpath $(CURDIR)/../src/github.com/docker/compose)
 SCAN_DIR=$(realpath $(CURDIR)/../src/github.com/docker/scan-cli-plugin)
+XX_DIR=$(realpath $(CURDIR)/../src/github.com/tonistiigi/xx)
 
 STATIC_VERSION=$(shell ./gen-static-ver $(CLI_DIR) $(VERSION))
 HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
@@ -15,6 +16,7 @@ export ENGINE_DIR
 export BUILDX_DIR
 export COMPOSE_DIR
 export SCAN_DIR
+export XX_DIR
 
 export STATIC_VERSION