diff options
| -rw-r--r-- | target/cramfs/cramfs.mk | 7 | ||||
| -rw-r--r-- | target/ext2/ext2root.mk | 7 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 2 | ||||
| -rw-r--r-- | target/squashfs/squashfsroot.mk | 4 |
4 files changed, 9 insertions, 11 deletions
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index 0f1204a25..43019c680 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -6,14 +6,13 @@ CRAMFS_DIR=$(BUILD_DIR)/cramfs-1.1 CRAMFS_SOURCE=cramfs-1.1.tar.gz CRAMFS_SITE=http://aleron.dl.sourceforge.net/sourceforge/cramfs -CRAMFS_PATCH=$(SOURCE_DIR)/cramfs.patch $(DL_DIR)/$(CRAMFS_SOURCE): $(WGET) -P $(DL_DIR) $(CRAMFS_SITE)/$(CRAMFS_SOURCE) -$(CRAMFS_DIR): $(DL_DIR)/$(CRAMFS_SOURCE) $(CRAMFS_PATCH) +$(CRAMFS_DIR): $(DL_DIR)/$(CRAMFS_SOURCE) zcat $(DL_DIR)/$(CRAMFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - cat $(CRAMFS_PATCH) | patch -p1 -d $(CRAMFS_DIR) + toolchain/patch-kernel.sh $(CRAMFS_DIR) target/cramfs/ cramfs*.patch $(CRAMFS_DIR)/mkcramfs: $(CRAMFS_DIR) $(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" -C $(CRAMFS_DIR); @@ -40,7 +39,7 @@ cramfsroot: cramfs -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info - $(CRAMFS_DIR)/mkcramfs -q -D $(SOURCE_DIR)/device_table.txt $(TARGET_DIR) $(IMAGE) + $(CRAMFS_DIR)/mkcramfs -q -D target/default/device_table.txt $(TARGET_DIR) $(IMAGE) cramfsroot-source: cramfs-source diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index ff2877145..67939ab7b 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -6,15 +6,14 @@ GENEXT2_DIR=$(BUILD_DIR)/genext2fs-1.3 GENEXT2_SOURCE=genext2fs_1.3.orig.tar.gz GENEXT2_SITE=http://ftp.debian.org/debian/pool/main/g/genext2fs -GENEXT2_PATCH=$(SOURCE_DIR)/genext2fs.patch $(DL_DIR)/$(GENEXT2_SOURCE): $(WGET) -P $(DL_DIR) $(GENEXT2_SITE)/$(GENEXT2_SOURCE) -$(GENEXT2_DIR): $(DL_DIR)/$(GENEXT2_SOURCE) $(GENEXT2_PATCH) +$(GENEXT2_DIR): $(DL_DIR)/$(GENEXT2_SOURCE) zcat $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf - mv $(GENEXT2_DIR).orig $(GENEXT2_DIR) - cat $(GENEXT2_PATCH) | patch -p1 -d $(GENEXT2_DIR) + toolchain/patch-kernel.sh $(GENEXT2_DIR) target/ext2/ genext2fs*.patch $(GENEXT2_DIR)/genext2fs: $(GENEXT2_DIR) $(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ @@ -43,7 +42,7 @@ ext2root: genext2fs #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true; -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; $(GENEXT2_DIR)/genext2fs -i $(GENEXT2_INODES) -b $(GENEXT2_SIZE) \ - -d $(TARGET_DIR) -q -D $(SOURCE_DIR)/device_table.txt $(IMAGE) + -d $(TARGET_DIR) -q -D target/default/device_table.txt $(IMAGE) ext2root-source: $(DL_DIR)/$(GENEXT2_SOURCE) diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index a8c6de68c..521c8dccb 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -34,7 +34,7 @@ jffs2root: mtd @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info $(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \ - -D $(SOURCE_DIR)/device_table.txt -d $(TARGET_DIR) \ + -D target/default/device_table.txt -d $(TARGET_DIR) \ -o $(IMAGE) jffs2root-source: $(DL_DIR)/$(MTD_SOURCE) diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index 523d5e2a9..b02fb48c1 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -12,7 +12,7 @@ $(DL_DIR)/$(SQUASHFS_SOURCE): $(SQUASHFS_DIR): $(DL_DIR)/$(SQUASHFS_SOURCE) #$(SQUASHFS_PATCH) zcat $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - $(SOURCE_DIR)/patch-kernel.sh $(SQUASHFS_DIR) $(SOURCE_DIR) squashfs.patch + toolchain/patch-kernel.sh $(SQUASHFS_DIR) target/squashfs/ squashfs.patch $(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR) $(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools; @@ -38,7 +38,7 @@ squashfsroot: squashfs -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info - #$(SQUASHFS_DIR)/squashfs-tools/mksquashfs -q -D $(SOURCE_DIR)/device_table.txt $(TARGET_DIR) $(IMAGE) + #$(SQUASHFS_DIR)/squashfs-tools/mksquashfs -q -D target/default/device_table.txt $(TARGET_DIR) $(IMAGE) $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE) -noappend -root-owned squashfsroot-source: squashfs-source |