diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-05-28 09:17:29 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-05-28 09:17:29 +0000 |
| commit | 1c4a2a55f76e481a2d1bc005405b9ce856d58939 (patch) | |
| tree | 80dfa6ecb493ee8cb9ca1436f1b37ee89f320a55 /target/jffs2 | |
| parent | fdd5681c06468a606180f04c2533c8ba213a37f6 (diff) | |
| download | upstream-1c4a2a55f76e481a2d1bc005405b9ce856d58939.tar.gz upstream-1c4a2a55f76e481a2d1bc005405b9ce856d58939.tar.bz2 upstream-1c4a2a55f76e481a2d1bc005405b9ce856d58939.zip | |
move package/linux into target/linux, use wbx' new kernel code. support building images with more than one kernel, split kernel module parts off of packages that use their own kernel modules (fuse, shfs, openswan). some cleanup in the image building process in target/. image builder is disabled for now, needs some fixing.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1085 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/jffs2')
| -rw-r--r-- | target/jffs2/Makefile | 54 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 41 |
2 files changed, 39 insertions, 56 deletions
diff --git a/target/jffs2/Makefile b/target/jffs2/Makefile index 5925a9e123..40acb10327 100644 --- a/target/jffs2/Makefile +++ b/target/jffs2/Makefile @@ -1,23 +1,47 @@ include $(TOPDIR)/rules.mk -include ./jffs2root.mk - -JFFS2_TARGETS:= $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx -JFFS2OPTS := --pad --little-endian --squash -d $(TARGET_DIR) +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 +MTD_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338 +MKFS_JFFS2=$(MTD_DIR)/util/mkfs.jffs2 +JFFS2OPTS := --pad --little-endian --squash #JFFS2OPTS += -Xlzo -msize -Xlzari -prepare: $(MTD_DIR)/.unpacked -compile: mtd -install: compile $(JFFS2_TARGETS) -clean: jffs2root-dirclean +$(DL_DIR)/$(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 - + touch $(MTD_DIR)/.unpacked + +$(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked + $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util + +$(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 + cp $< $@ -$(BIN_DIR)/openwrt-generic-jffs2-4MB.trx: - $(MKFS_JFFS2) $(JFFS2OPTS) -e 0x10000 -o $(IMAGE)-4MB.jffs2 +define jffs2-4MB_template + @rm -rf $(1)/root/jffs + $(MKFS_JFFS2) $(JFFS2OPTS) -e 0x10000 -o $(1)/root.jffs2-4MB -d $(1)/root PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \ - $(LINUX_IMAGE) -a 0x10000 $(IMAGE)-4MB.jffs2 + $(1)/kernel-image -a 0x10000 $(1)/root.jffs2-4MB +endef -$(BIN_DIR)/openwrt-generic-jffs2-8MB.trx: - $(MKFS_JFFS2) $(JFFS2OPTS) -e 0x20000 -o $(IMAGE)-8MB.jffs2 +define jffs2-8MB_template + @rm -rf $(1)/root/jffs + $(MKFS_JFFS2) $(JFFS2OPTS) -e 0x20000 -o $(1)/root.jffs2-8MB -d $(1)/root PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \ - $(LINUX_IMAGE) -a 0x20000 $(IMAGE)-8MB.jffs2 - + $(1)/kernel-image -a 0x10000 $(1)/root.jffs2-8MB +endef + +FILESYSTEMS:=jffs2-4MB jffs2-8MB +include ../image.mk + +source: $(DL_DIR)/$(MTD_SOURCE) +prepare: $(MTD_DIR)/.unpacked +compile: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2 +install: +clean: + rm -rf $(MTD_DIR) + diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk deleted file mode 100644 index 6ed7a375c6..0000000000 --- a/target/jffs2/jffs2root.mk +++ /dev/null @@ -1,41 +0,0 @@ -############################################################# -# -# mtd provides us with mkfs.jffs2, to target JFFS2 filesystems -# -############################################################# - -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 -MTD_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338 -MKFS_JFFS2=$(MTD_DIR)/util/mkfs.jffs2 - -$(DL_DIR)/$(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 - - touch $(MTD_DIR)/.unpacked - -$(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked - $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util - -$(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 - cp $< $@ - -mtd: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2 - - -############################################################# -# -# Build the jffs2 root filesystem image -# -############################################################# - -jffs2root-source: $(DL_DIR)/$(MTD_SOURCE) - -jffs2root-clean: - -$(MAKE) -C $(MTD_DIR) clean - -jffs2root-dirclean: - rm -rf $(MTD_DIR) |