include: bin/ dir was not created

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

diff --git a/include/image.mk b/include/image.mk
index 2d6550841d82e9b3b4d7e1c783e3475a98d8c433..9e342e0a42a793d73264d6a7e4fe464fdbe591ce 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
@@ -263,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
 
@@ -303,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
 
@@ -318,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
@@ -336,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
 
@@ -379,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 \
@@ -569,11 +574,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