image.mk: prepare for defining device profile data in the Device section

[openwrt/openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index be1b6f4d2776475aa119dc723a638af170bd5247..47a47c096c00c70663591f73b60aa16218731f17 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -120,7 +120,7 @@ endef
 
 define Image/BuildKernel/MkuImage
        mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
-               -n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5)
+               -n '$(call toupper,$(ARCH)) LEDE Linux-$(LINUX_VERSION)' -d $(4) $(5)
 endef
 
 define Image/BuildKernel/MkFIT
@@ -187,7 +187,8 @@ ifneq ($(CONFIG_NAND_SUPPORT),)
        [ -z "$(3)" ] || $(CP) "$(3)" "$(KDIR_TMP)/sysupgrade-$(1)/kernel"
        (cd "$(KDIR_TMP)"; $(TAR) cvf \
                "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1) \
-                       $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)")
+                       $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
+       )
    endef
 
 # $(1) board name
@@ -262,7 +263,7 @@ define Image/mkfs/ext4
                -i $(CONFIG_TARGET_EXT4_MAXINODE) \
                -m $(CONFIG_TARGET_EXT4_RESERVED_PCT) \
                $(if $(CONFIG_TARGET_EXT4_JOURNAL),,-J) \
-               $(if $(SOURCE_DATE_EPOCH),-t $(SOURCE_DATE_EPOCH)) \
+               $(if $(SOURCE_DATE_EPOCH),-T $(SOURCE_DATE_EPOCH)) \
                $(KDIR)/root.ext4 $(TARGET_DIR)/
 endef
 
@@ -302,7 +303,7 @@ define Build/uImage
        mkimage -A $(LINUX_KARCH) \
                -O linux -T kernel \
                -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-               -n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new
+               -n '$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new
        @mv $@.new $@
 endef
 
@@ -317,7 +318,7 @@ endef
 
 define Build/netgear-dni
        $(STAGING_DIR_HOST)/bin/mkdniimg \
-               -B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \
+               -B $(NETGEAR_BOARD_ID) -v LEDE.$(REVISION) \
                $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \
                -r "$(1)" \
                -i $@ -o $@.new
@@ -335,7 +336,11 @@ define Build/fit
 endef
 
 define Build/lzma
-       $(STAGING_DIR_HOST)/bin/lzma e $@ -lc1 -lp2 -pb2 $(1) $@.new
+       $(call Build/lzma-no-dict,-lc1 -lp2 -pb2 $(1))
+endef
+
+define Build/lzma-no-dict
+       $(STAGING_DIR_HOST)/bin/lzma e $@ $(1) $@.new
        @mv $@.new $@
 endef
 
@@ -378,6 +383,7 @@ endef
 
 define Build/append-ubi
        sh $(TOPDIR)/scripts/ubinize-image.sh \
+               $(if $(UBOOTENV_IN_UBI),--uboot-env) \
                $(if $(KERNEL_IN_UBI),--kernel $(word 1,$^)) \
                $(word 2,$^) \
                $@.tmp \
@@ -433,6 +439,9 @@ endef
 define Device/Init
   PROFILES := $(PROFILE)
   DEVICE_NAME := $(1)
+  DEVICE_TITLE :=
+  DEVICE_PACKAGES :=
+  DEVICE_DESCRIPTION = Build firmware images for $$(DEVICE_TITLE)
   KERNEL:=
   KERNEL_INITRAMFS = $$(KERNEL)
   KERNEL_SIZE:=
@@ -542,17 +551,37 @@ define Device/Build
       $$(call Device/Build/image,$$(fs),$$(image),$(1)))))
 endef
 
+define Device/DumpInfo
+Target-Profile: DEVICE_$(1)
+Target-Profile-Name: $(DEVICE_TITLE)
+Target-Profile-Packages: $(DEVICE_PACKAGES)
+Target-Profile-Description:
+$(DEVICE_DESCRIPTION)
+@@
+
+endef
+
+define Device/Dump
+$$(eval $$(if $$(DEVICE_TITLE),$$(info $$(call Device/DumpInfo,$(1)))))
+endef
+
 define Device
   $(call Device/Init,$(1))
   $(call Device/Default,$(1))
   $(call Device/Check,$(1))
   $(call Device/$(1),$(1))
-  $(call Device/Build,$(1))
+  $(call Device/$(if $(DUMP),Dump,Build),$(1))
 
 endef
 
 define BuildImage
 
+  ifneq ($(DUMP),)
+    all: dumpinfo
+    dumpinfo: FORCE
+       @true
+  endif
+
   download:
   prepare:
   compile:
@@ -568,11 +597,11 @@ define BuildImage
                $(call Build/Clean)
 
     image_prepare: compile
-               mkdir -p $(KDIR)/tmp
+               mkdir -p $(BIN_DIR) $(KDIR)/tmp
                $(call Image/Prepare)
   else
     image_prepare:
-               mkdir -p $(KDIR)/tmp
+               mkdir -p $(BIN_DIR) $(KDIR)/tmp
   endif
 
   mkfs_prepare: image_prepare