rules.mk: Fix dist target output names

I didn't notice that when I previously re-worked the make setup that I
changed the names away from what boots expects. Boots expect gnu style
arch names where docker use go names (x86_64 vs amd64 and aarch64 vs
arm64). I ended up coming across a way to sort of do a staticly defined
look up table in make using something called "Constructed Macro Names",
see http://make.mad-scientist.net/constructed-macro-names/ for details. So
now we can use make to do the cp instead of in shell.

I also reworked the deploy target so it pushes multiple files instead of one
tarball as thats how boots and sandbox use them, this way we avoid needing
to post-process the deployed artifacts. But this is disabled at the moment
as pushing to the s3 bucket is failing due to issue with creds. Once we get
creds fixed up this can be re-enabled.

Signed-off-by: Manuel Mendez <github@i.m.mmlb.dev>

Author: mmlb

Makefile

@@ -22,16 +22,10 @@ help: ## Print this help
 include rules.mk
 include lint.mk
 
-all: containers images ## Build release mode boot files and container images for all supported architectures
-
-dev: image-dbg-$(ARCH) ## Build debug mode boot files and container images for currently running architecture
-
-images: ## Build release mode boot files for all supported architectures
-
+all: dist dbg-dist ## Build release mode boot files and container images for all supported architectures
 containers: hook-bootkit hook-docker ## Build container images
-
 debug: ## Build debug mode boot files and container images for all supported architectures
-
+dev: dbg-image-$(ARCH) ## Build debug mode boot files and container images for currently running architecture
+images: ## Build release mode boot files for all supported architectures
 push: push-hook-bootkit push-hook-docker ## Push container images to registry
-
 run: run-$(ARCH) ## Boot system using qemu

rules.mk

@@ -23,10 +23,13 @@ ARCH = arm64
 endif
 
 arches := amd64 arm64
-modes := rel dbg
+DOCKER_2_HW_amd64 := x86_64
+DOCKER_2_HW_arm64 := aarch64
 
+dist-files :=
 hook-bootkit-deps := $(wildcard hook-bootkit/*)
 hook-docker-deps := $(wildcard hook-docker/*)
+modes := rel dbg
 
 define foreach_mode_arch_rules =
 # mode := $(1)
@@ -49,17 +52,22 @@ out/$T/$(1)/$(2)/hook.yaml: $$(LINUXKIT_CONFIG)
 	if [[ $(1) == dbg ]]; then
 	    sed -i '/^\s*#dbg/ s|#dbg||' $$@
 	fi
+
+out/$T/$(1)/hook_$(DOCKER_2_HW_$(2)).tar.gz: out/$T/$(1)/initramfs-$(DOCKER_2_HW_$(2)) out/$T/$(1)/vmlinuz-$(DOCKER_2_HW_$(2))
+out/$T/$(1)/initramfs-$(DOCKER_2_HW_$(2)): out/$T/$(1)/$(2)/initrd.img
+out/$T/$(1)/vmlinuz-$(DOCKER_2_HW_$(2)): out/$T/$(1)/$(2)/kernel
+dist-files += out/$T/$(1)/initramfs-$(DOCKER_2_HW_$(2)) out/$T/$(1)/vmlinuz-$(DOCKER_2_HW_$(2))
 endef
 $(foreach m,$(modes),$(foreach a,$(arches),$(eval $(call foreach_mode_arch_rules,$m,$a))))
 
 define foreach_arch_rules =
 # arch := $(1)
 
-debug: out/$T/dbg/$(1)/hook.tar
+debug: dbg-image-$(1)
+dbg-image-$(1): out/$T/dbg/$(1)/hook.tar
+dist: out/$T/rel/hook_$(DOCKER_2_HW_$(1)).tar.gz
 images: out/$T/rel/$(1)/hook.tar
-image-dbg-$(1): out/$T/dbg/$(1)/hook.tar
 
-out/$T/rel/hook.tar: out/$T/rel/$(1)/initrd.img out/$T/rel/$(1)/kernel
 hook-bootkit: out/$T/hook-bootkit-$(1)
 hook-docker: out/$T/hook-docker-$(1)
 
@@ -77,6 +85,15 @@ run-$(1):
 endef
 $(foreach a,$(arches),$(eval $(call foreach_arch_rules,$a)))
 
+define foreach_mode_rules =
+# mode := $(1)
+
+out/$T/$(1)/hook_%.tar.gz:
+	tar -C $$(@D) -cvf- $$(^F) | pigz > $$@
+
+endef
+$(foreach m,$(modes),$(eval $(call foreach_mode_rules,$m)))
+
 push-hook-bootkit: $(hook-bootkit-deps)
 push-hook-docker: $(hook-docker-deps)
 push-hook-bootkit push-hook-docker: platforms=$(addprefix linux/,$(arches))
@@ -87,21 +104,17 @@ push-hook-bootkit push-hook-docker:
 	docker buildx build --platform $$platforms --push -t $(ORG)/$(container):$T $(container)
 
 .PHONY: dist
-dist: out/$T/rel/hook-$T.tar.gz ## Build tarball for distribution
-out/$T/rel/hook-$T.tar.gz: out/$T/rel/hook.tar
-	pigz < $< > $@
-
-out/$T/rel/hook.tar:
-	rm -rf out/$T/rel/dist
-	mkdir -p out/$T/rel/dist
-	for a in $(arches); do
-		cp out/$T/rel/$$a/initrd.img out/$T/rel/dist/initramfs-$$a
-		cp out/$T/rel/$$a/kernel out/$T/rel/dist/vmlinuz-$$a
-	done
-	cd out/$T/rel/dist && tar -cvf ../$(@F) ./*
+dist: ## Build tarballs for distribution
+$(dist-files):
+	cp $< $@
 
+.PHONY: dbg-dist
+dbg-dist: out/$T/dbg/hook_$(DOCKER_2_HW_$(ARCH)).tar.gz ## Build debug enabled tarball
+
+.PHONY: deploy
 deploy: dist ## Push tarball to S3
-ifeq ($(shell git rev-parse --abbrev-ref HEAD),main)
-	s3cmd sync ./out/hook-$T.tar.gz s3://s.gianarb.it/hook/$T.tar.gz
-	s3cmd cp s3://s.gianarb.it/hook/hook-$T.tar.gz s3://s.gianarb.it/hook/hook-main.tar.gz
-endif
+	exit 1
+	for f in out/$T/rel/hook_*.tar.gz; do
+	    s3cmd sync $$f s3://s.gianarb.it/hook/$T/
+	    s3cmd cp s3://s.gianarb.it/hook/$T/$$(basename $$f) s3://s.gianarb.it/hook/latest/
+	done