summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2018-10-20 15:51:21 +0200
committerJonas Smedegaard <dr@jones.dk>2018-10-20 15:51:21 +0200
commitfb2c3272f1f60b4c3a67631cbc833ea62e3e857d (patch)
treecb772923db0b55ff179e3873476b168045b1c3fb
parent8751b3246c7a1cc6b367528290d5d49473d60002 (diff)
Differentiate nonfree targets.
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index aa8ced4..6d766d7 100644
--- a/Makefile
+++ b/Makefile
@@ -109,9 +109,9 @@ images-di = $(foreach suite,$(suites),\
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)\
+ images/local$(nonfree:%=-nonfree)/core-$(type)-$(suite)-$(shell git describe).img.gz)\
$(foreach type,$(devicetypes-arm64),\
- images/local/core_$(type)-$(type)-buster-$(shell git describe).img.gz))
+ images/local$(nonfree:%=-nonfree)/core_$(type)-$(type)-buster-$(shell git describe).img.gz))
this-kernelbuild = $(shell readlink $(1) | grep -Po 'vmlinuz-\K.*')
@@ -249,7 +249,7 @@ images/d-i/$(4)-$(3)-$(1)-$(shell git describe).img.gz: \
zcat $$^ | $(GZIP) --rsyncable > $$@~
mv -f $$@~ $$@
@$(call this-warnings,$(1))
-images/local/$(4)-$(3)-$(1)-$(shell git describe).img.gz: \
+images/local$(nonfree:%=-nonfree)/$(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