aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Warning <moritzwarning@web.de>2021-01-09 00:02:57 +0100
committerBaptiste Jonglez <git@bitsofnetworks.org>2021-05-26 23:36:40 +0200
commit4419c3dcd3fbaa7b51239c90784af03af2c2c911 (patch)
tree8ba2924a53c7f518fe77cf67e8b18cc82801d540
parentbab7a1120cd5dfa3569ac80baa47cb9c5317dd07 (diff)
downloadupstream-4419c3dcd3fbaa7b51239c90784af03af2c2c911.tar.gz
upstream-4419c3dcd3fbaa7b51239c90784af03af2c2c911.tar.bz2
upstream-4419c3dcd3fbaa7b51239c90784af03af2c2c911.zip
build/json: generate json file for initramfs
The initramfs images are missing from the profiles.json files. Signed-off-by: Moritz Warning <moritzwarning@web.de> [fix code by exporting device variables] Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit d3140d05296461deddaaa8ca2ce4a4a97a320eff)
-rw-r--r--include/image.mk35
1 files changed, 34 insertions, 1 deletions
diff --git a/include/image.mk b/include/image.mk
index 2530108211..e602f2f4e9 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -472,7 +472,8 @@ endef
ifndef IB
define Device/Build/initramfs
$(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
- $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE))
+ $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)) \
+ $$(if $$(CONFIG_JSON_OVERVIEW_IMAGE_INFO), $(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,)
$(KDIR)/$$(KERNEL_INITRAMFS_NAME):: image_prepare
$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
@@ -481,6 +482,38 @@ define Device/Build/initramfs
$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
@rm -f $$@
$$(call concat_cmd,$$(KERNEL_INITRAMFS))
+
+ $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,$(1))
+
+ $(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json: $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
+ @mkdir -p $$(shell dirname $$@)
+ DEVICE_ID="$(1)" \
+ BIN_DIR="$(BIN_DIR)" \
+ SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
+ IMAGE_NAME="$$(notdir $$^)" \
+ IMAGE_TYPE="kernel" \
+ IMAGE_FILESYSTEM="initramfs" \
+ IMAGE_PREFIX="$$(IMAGE_PREFIX)" \
+ DEVICE_VENDOR="$$(DEVICE_VENDOR)" \
+ DEVICE_MODEL="$$(DEVICE_MODEL)" \
+ DEVICE_VARIANT="$$(DEVICE_VARIANT)" \
+ DEVICE_ALT0_VENDOR="$$(DEVICE_ALT0_VENDOR)" \
+ DEVICE_ALT0_MODEL="$$(DEVICE_ALT0_MODEL)" \
+ DEVICE_ALT0_VARIANT="$$(DEVICE_ALT0_VARIANT)" \
+ DEVICE_ALT1_VENDOR="$$(DEVICE_ALT1_VENDOR)" \
+ DEVICE_ALT1_MODEL="$$(DEVICE_ALT1_MODEL)" \
+ DEVICE_ALT1_VARIANT="$$(DEVICE_ALT1_VARIANT)" \
+ DEVICE_ALT2_VENDOR="$$(DEVICE_ALT2_VENDOR)" \
+ DEVICE_ALT2_MODEL="$$(DEVICE_ALT2_MODEL)" \
+ DEVICE_ALT2_VARIANT="$$(DEVICE_ALT2_VARIANT)" \
+ DEVICE_TITLE="$$(DEVICE_TITLE)" \
+ DEVICE_PACKAGES="$$(DEVICE_PACKAGES)" \
+ TARGET="$(BOARD)" \
+ SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
+ VERSION_NUMBER="$(VERSION_NUMBER)" \
+ VERSION_CODE="$(VERSION_CODE)" \
+ SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
+ $(TOPDIR)/scripts/json_add_image_info.py $$@
endef
endif