summaryrefslogtreecommitdiffstats
path: root/target/squashfs-lzma
diff options
context:
space:
mode:
Diffstat (limited to 'target/squashfs-lzma')
-rw-r--r--target/squashfs-lzma/Makefile6
-rw-r--r--target/squashfs-lzma/squashfslzmaroot.mk7
2 files changed, 8 insertions, 5 deletions
diff --git a/target/squashfs-lzma/Makefile b/target/squashfs-lzma/Makefile
index 8da08b390..2664ed7e2 100644
--- a/target/squashfs-lzma/Makefile
+++ b/target/squashfs-lzma/Makefile
@@ -1,16 +1,16 @@
include $(TOPDIR)/rules.mk
include ./squashfslzmaroot.mk
-TARGETS:=$(BIN_DIR)/openwrt-generic-squashfs.trx
+SQUASHFS_TARGETS:=$(BIN_DIR)/openwrt-generic-squashfs.trx
prepare: $(SQUASHFSLZMA_DIR)/.unpacked
compile: squashfslzma
-install: $(TARGETS)
+install: $(SQUASHFS_TARGETS)
clean: squashfslzmaroot-dirclean
$(BIN_DIR)/openwrt-generic-squashfs.trx:
@mkdir -p $(TARGET_DIR)/jffs
- $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le
+ PATH=$(TARGET_PATH) mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le
PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
$(LINUX_IMAGE) $(IMAGE).squashfslzma
diff --git a/target/squashfs-lzma/squashfslzmaroot.mk b/target/squashfs-lzma/squashfslzmaroot.mk
index ca493d778..11b2b76be 100644
--- a/target/squashfs-lzma/squashfslzmaroot.mk
+++ b/target/squashfs-lzma/squashfslzmaroot.mk
@@ -16,10 +16,13 @@ $(SQUASHFSLZMA_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE)
patch -d $(SQUASHFSLZMA_DIR) -p1 < squashfs2.0-tools-lzma.patch
touch $(SQUASHFSLZMA_DIR)/.unpacked
-$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs: $(SQUASHFSLZMA_DIR)/.unpacked
+$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked
$(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma
-squashfslzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs
+$(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma
+ cp $< $@
+
+squashfslzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma
squashfslzma-source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE)