summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2018-10-19 15:54:19 +0200
committerJonas Smedegaard <dr@jones.dk>2018-10-19 15:54:19 +0200
commit8751b3246c7a1cc6b367528290d5d49473d60002 (patch)
treef70ad4fff68638046d7edfaa8b4c7c4ba0582734
parentd750b50c6aba77720513d034c4014ded1e777454 (diff)
Shorten image paths. Add make targets images-di images-local.
-rw-r--r--Makefile16
1 files changed, 12 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c137b3c..aa8ced4 100644
--- a/Makefile
+++ b/Makefile
@@ -107,6 +107,11 @@ images-di = $(foreach suite,$(suites),\
$(foreach type,$(devicetypes-$(arch)),\
$(foreach node,plain $(nodes),\
images/$(suite)/$(arch)/d-i/$(node)/$(type).img.gz))))
+images-local = $(foreach suite,$(filter-out sid,$(suites)),\
+ $(foreach type,$(devicetypes-armhf),\
+ images/local/core-$(type)-$(suite)-$(shell git describe).img.gz)\
+ $(foreach type,$(devicetypes-arm64),\
+ images/local/core_$(type)-$(type)-buster-$(shell git describe).img.gz))
this-kernelbuild = $(shell readlink $(1) | grep -Po 'vmlinuz-\K.*')
@@ -176,9 +181,12 @@ $(if $(tools_missing),\
$(warning WARNING: Helper tools missing:\
$(tools_missing)))
-all: $(checksumfiles) $(images-di) $(info)
+all: $(checksumfiles) $(images-di) $(images-local) $(info)
sign: $(signfiles)
+images-di: $(images-di)
+images-local: $(images-local)
+
# TODO: drop sid → buster workaround when fixed in boxer
$(profiles-di): content/%/preseed.cfg: \
$(wildcard nodes/*.yml) skel/preseed.cfg.in skel/script.sh.in
@@ -234,14 +242,14 @@ clean::
define SUITE_ARCH_TYPE_NODE_template =
# Prepend firmware to (plain/preseed installer/bootstrapped) partition
-images/$(1)/$(2)/d-i/$(4)/$(3).img.gz: \
+images/d-i/$(4)-$(3)-$(1)-$(shell git describe).img.gz: \
$(call this-vendordir,$(1))/$(2)/firmware.$(di-firmware-$(2)-$(3)).img.gz \
$(call this-partdir,$(1))/$(2)/$(4)/partition.img.gz
mkdir -p $$(dir $$@)
zcat $$^ | $(GZIP) --rsyncable > $$@~
mv -f $$@~ $$@
@$(call this-warnings,$(1))
-images/$(1)/$(2)/local/$(4)/$(3).img.gz: \
+images/local/$(4)-$(3)-$(1)-$(shell git describe).img.gz: \
$(call this-partdir,$(1))/$(2)/$(4)/local/firmware.$(3).img \
partition/$(1)/$(2)/$(4)/$(3)/boot.img \
partition/$(1)/$(2)/$(4)/rootfs.img
@@ -567,5 +575,5 @@ clean::
distclean: clean
rm -rf vendor
-.PHONY: all sign clean distclean
+.PHONY: all sign clean distclean images-di images-local
.PRECIOUS: $(vendor-files)