Commit 2a014a65 authored by Jonas Smedegaard's avatar Jonas Smedegaard

Store images below content.

parent 0a6bb4ca
......@@ -132,13 +132,13 @@ vendor-files = $(foreach suite,$(suites),\
images-di = $(foreach suite,$(suites),\
$(foreach arch,$(archs-di),\
$(foreach device,$(devices-$(arch)),\
images/d-i/plain-$(device)-$(suite)$(imgsuffix).img.gz)))
content/plain/plain-$(device)-$(suite)$(imgsuffix).img.gz)))
images-local = $(foreach suite,$(filter-out sid,$(suites)),\
$(foreach arch,$(if $(fakeroot),$(host-arch),$(archs)),\
$(foreach device,$(devices-$(arch)),\
$(if $(filter $(device),$(devices-nonfree)),\
images/local-nonfree/nonfree_$(device)-$(device)-$(suite)$(imgsuffix).img.gz) \
images/local/core_$(device)-$(device)-$(suite)$(imgsuffix).img.gz)))
content/nonfree/nonfree-$(device)-$(suite)$(imgsuffix).img.gz) \
content/core/core-$(device)-$(suite)$(imgsuffix).img.gz)))
this-kernelbuild = $(shell readlink $(1) | grep -Po 'vmlinuz-\K.*')
......@@ -291,7 +291,7 @@ clean::
define SUITE_ARCH_DEVICE_VARIANT_template =
# Prepend firmware to (plain/preseed installer/bootstrapped) partition
images/d-i/$(4)-$(3)-$(1)$(imgsuffix).img.gz: \
content/plain/$(4)-$(3)-$(1)$(imgsuffix).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 $$@)
......@@ -300,7 +300,7 @@ images/d-i/$(4)-$(3)-$(1)$(imgsuffix).img.gz: \
@$(call this-warnings,$(1))
ifneq ($(firstword $(subst _,$() ,$(4))),plain)
images/local$(if $(filter nonfree%,$(4)),-nonfree)/$(4)-$(3)-$(1)$(imgsuffix).img.gz: \
content/$(firstword $(subst _,$() ,$(4)))/$(firstword $(subst _,$() ,$(4)))-$(3)-$(1)$(imgsuffix).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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment