X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fimage.mk;h=bc383e6ba81c783518fe4bb24308e8942b90e64d;hb=466eeac7488d8ffc8d841f69cf23b13fc2b4b3ec;hp=68686176dfedbaf2b5946fe42a948672f6837eb0;hpb=3661927e267ead59a4125573e25e8de4b624b190;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/include/image.mk b/include/image.mk
index 68686176df..bc383e6ba8 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -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 \