Author: kaloz Date: 2014-12-26 14:33:22 +0100 (Fri, 26 Dec 2014) New Revision: 43778
Modified: trunk/include/image.mk trunk/target/linux/mvebu/image/Makefile Log: The ubinized filesystems should be used for generating the final images, so store them in KDIR instead. Signed-off-by: Imre Kaloz <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2014-12-26 12:36:38 UTC (rev 43777) +++ trunk/include/image.mk 2014-12-26 13:33:22 UTC (rev 43778) @@ -154,7 +154,7 @@ define Image/Build/UbinizeImage sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \ "$(KDIR)/root.$(3)" \ - "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \ + "$(KDIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \ $(4) endef Modified: trunk/target/linux/mvebu/image/Makefile =================================================================== --- trunk/target/linux/mvebu/image/Makefile 2014-12-26 12:36:38 UTC (rev 43777) +++ trunk/target/linux/mvebu/image/Makefile 2014-12-26 13:33:22 UTC (rev 43778) @@ -46,7 +46,7 @@ $(foreach dtb,$(TARGET_DTBS),$(call Image/Build/UbinizeImage,$(dtb),,squashfs,$(UBI_OPTS));) ( \ dd if=$(KDIR)/uImage-armada-xp-mamba bs=3072k conv=sync; \ - dd if=$(BIN_DIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-ubinized.bin \ + dd if=$(KDIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-ubinized.bin \ bs=2048 conv=sync; \ ) > $(BIN_DIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-factory.img endef _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
