From d0f611787c94090697587c02e1b5c2f3d45b0b0a Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Oct 2005 00:06:20 +0000 Subject: large build system cleanup. added some stuff to control the verbosity level, but not complete, yet. git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2221 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/image/Makefile | 5 +++++ target/linux/image/jffs2.mk | 4 +++- target/linux/image/squashfs.mk | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'target/linux/image') diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile index 1e3e22f15..1dd48c752 100644 --- a/target/linux/image/Makefile +++ b/target/linux/image/Makefile @@ -17,10 +17,15 @@ endif prepare: compile: install: + +$(BOARD)-compile: + @$(TRACE) target/linux/image/$(BOARD)/prepare $(MAKE) -C $(BOARD) prepare + @$(TRACE) target/linux/image/$(BOARD)/compile $(MAKE) -C $(BOARD) compile install-ib: + @$(TRACE) target/linux/image/$(BOARD)/install-ib -$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk index 2a169ab32..ab8cfbef3 100644 --- a/target/linux/image/jffs2.mk +++ b/target/linux/image/jffs2.mk @@ -19,8 +19,10 @@ $(KDIR)/root.jffs2-8MB: install-prepare @rm -rf $(KDIR)/root/jffs $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root -jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB +jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile + $(TRACE) target/linux/image/$(BOARD)/install $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB" + $(TRACE) target/linux/image/$(BOARD)/install $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB" jffs2-install-ib: diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk index 3811567a0..00411c05e 100644 --- a/target/linux/image/squashfs.mk +++ b/target/linux/image/squashfs.mk @@ -12,7 +12,8 @@ $(KDIR)/root.squashfs: install-prepare @mkdir -p $(KDIR)/root/jffs $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le -squashfs-install: $(KDIR)/root.squashfs +squashfs-install: $(KDIR)/root.squashfs $(BOARD)-compile + $(TRACE) target/linux/image/$(BOARD)/install $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs" squashfs-install-ib: -- cgit v1.2.3