mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

fix image builder

Browse Source 
SVN-Revision: 2376
This commit is contained in:
Felix Fietkau 2005-11-07 17:18:34 +00:00
parent f313afc53b
commit f13242ef8f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openwrt/target/linux/image/jffs2.mk
View File

@ -19,13 +19,17 @@ $(KDIR)/root.jffs2-8MB: install-prepare
@rm -rf $(KDIR)/root/jffs @rm -rf $(KDIR)/root/jffs
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root $(MAKE_TRACE) $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root $(MAKE_TRACE)
jffs2-install: compile-targets $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile ifeq ($(IB),)
jffs2-install: compile-targets $(BOARD)-compile
endif
jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB
$(TRACE) target/linux/image/$(BOARD)/install $(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB" $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
$(TRACE) target/linux/image/$(BOARD)/install $(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB" $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB"
jffs2-install-ib: jffs2-install-ib: compile-targets
mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin

8
openwrt/target/linux/image/squashfs.mk
View File

@ -11,12 +11,16 @@ squashfs-clean:
$(KDIR)/root.squashfs: install-prepare $(KDIR)/root.squashfs: install-prepare
@mkdir -p $(KDIR)/root/jffs @mkdir -p $(KDIR)/root/jffs
$(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le $(MAKE_TRACE) $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le $(MAKE_TRACE)
ifeq ($(IB),)
squashfs-install: compile-targets $(BOARD)-compile
endif
squashfs-install: install-targets $(KDIR)/root.squashfs $(BOARD)-compile squashfs-install: $(KDIR)/root.squashfs
$(TRACE) target/linux/image/$(BOARD)/install $(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs" $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
squashfs-install-ib: squashfs-install-ib: compile-targets
mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
cp $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin cp $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin