X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2b0be6bb82f0402e50c11bb72b41bd4ec9589a66..82dc56f60fd4977584a3666c2e4c15042f23b06d:/target/jffs2/jffs2root.mk?ds=sidebyside diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 9846d001f..6ed7a375c 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -4,15 +4,14 @@ # ############################################################# -include target/jffs2/blocksize.mk - MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig MTD_SOURCE=mtd_20050122.orig.tar.gz MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd -MKFS_JFFS2=$(shell which mkfs.jffs2 2>/dev/null || echo $(MTD_DIR)/util/mkfs.jffs2) +MTD_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338 +MKFS_JFFS2=$(MTD_DIR)/util/mkfs.jffs2 $(DL_DIR)/$(MTD_SOURCE): - $(WGET) -P $(DL_DIR) $(MTD_SITE)/$(MTD_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(MTD_SOURCE) $(MTD_MD5SUM) $(MTD_SITE) $(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) zcat $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) -xvf - @@ -21,7 +20,10 @@ $(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) $(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util -mtd: $(MKFS_JFFS2) +$(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 + cp $< $@ + +mtd: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2 ############################################################# @@ -30,13 +32,6 @@ mtd: $(MKFS_JFFS2) # ############################################################# -jffs2root: mtd - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(SSTRIP) 2>/dev/null || true; - @rm -rf $(TARGET_DIR)/usr/man - @rm -rf $(TARGET_DIR)/usr/info - $(MKFS_JFFS2) --pad --little-endian --squash -e $(JFFS2_BLOCK_SIZE) \ - -d $(TARGET_DIR) -o $(IMAGE).jffs2 - jffs2root-source: $(DL_DIR)/$(MTD_SOURCE) jffs2root-clean: @@ -44,8 +39,3 @@ jffs2root-clean: jffs2root-dirclean: rm -rf $(MTD_DIR) - -ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) -TARGETS+=jffs2root openwrt-image -ROOTFS=jffs2 -endif