Commit e83529ad authored by Eric Andersen's avatar Eric Andersen
Browse files

mksquashfs is always rebuilt before generating rootfs image. The attached 

patch avoids this issue, by creating a .unpacked file in the squashfs directory
after the source tarball is unpacked, and making the mksquashfs target depend
on the .unpacked file.

http://bugs.busybox.net/view.php?id=234
parent a8a6587d

target/squashfs/squashfsroot.mk

+3 −2
Original line number Diff line number Diff line
@@ -10,11 +10,12 @@ SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/sq 
$(DL_DIR)/$(SQUASHFS_SOURCE):

	 $(WGET) -P $(DL_DIR) $(SQUASHFS_SITE)/$(SQUASHFS_SOURCE)



$(SQUASHFS_DIR): $(DL_DIR)/$(SQUASHFS_SOURCE) #$(SQUASHFS_PATCH)

$(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE) #$(SQUASHFS_PATCH)

	zcat $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf -

	toolchain/patch-kernel.sh $(SQUASHFS_DIR) target/squashfs/ squashfs.patch

	touch $(SQUASHFS_DIR)/.unpacked



$(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)

$(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked

	$(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools;



squashfs: $(SQUASHFS_DIR)/squashfs-tools/mksquashfs