diff options
Diffstat (limited to 'target/linux/image')
-rw-r--r-- | target/linux/image/Makefile | 16 | ||||
-rw-r--r-- | target/linux/image/aruba/Makefile | 4 | ||||
-rw-r--r-- | target/linux/image/au1000/Makefile | 4 | ||||
-rw-r--r-- | target/linux/image/brcm/Makefile | 4 | ||||
-rw-r--r-- | target/linux/image/jffs2.mk | 8 | ||||
-rw-r--r-- | target/linux/image/jffs2/Makefile | 2 | ||||
-rw-r--r-- | target/linux/image/squashfs.mk | 6 | ||||
-rw-r--r-- | target/linux/image/squashfs/Makefile | 2 | ||||
-rw-r--r-- | target/linux/image/tgz.mk | 2 | ||||
-rw-r--r-- | target/linux/image/x86/Makefile | 7 | ||||
-rw-r--r-- | target/linux/image/xscale/Makefile | 8 |
11 files changed, 25 insertions, 38 deletions
diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile index 3b8234339..a5141cb54 100644 --- a/target/linux/image/Makefile +++ b/target/linux/image/Makefile @@ -14,25 +14,23 @@ ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) include ./tgz.mk endif -prepare: +prepare: FORCE $(MAKE) prepare-targets -compile: +compile: FORCE $(MAKE) compile-targets -install: +install: FORCE $(MAKE) install-targets -.PHONY: prepare compile install - -$(BOARD)-compile: +$(BOARD)-compile: FORCE $(MAKE) -C $(BOARD) prepare $(MAKE) -C $(BOARD) compile -install-ib: +install-ib: FORCE -$(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)/ -install-prepare: +install-prepare: FORCE find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644 find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755 find $(BUILD_DIR)/root -type d | xargs chmod 0755 @@ -40,5 +38,5 @@ install-prepare: chmod 0777 $(BUILD_DIR)/root/tmp rebuild: clean prepare compile install -clean: +clean: FORCE $(MAKE) clean-targets diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile index 0ddde2026..7ca076acc 100644 --- a/target/linux/image/aruba/Makefile +++ b/target/linux/image/aruba/Makefile @@ -12,10 +12,10 @@ LOADER_MAKEOPTS= \ KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) -lzma-loader-clean: +lzma-loader-clean: FORCE $(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean -lzma-loader-prepare: +lzma-loader-prepare: FORCE $(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) prepare lzma-loader-compile: $(KDIR)/vmlinux.lzma lzma-loader-prepare diff --git a/target/linux/image/au1000/Makefile b/target/linux/image/au1000/Makefile index c7158ca76..2c9b1c05d 100644 --- a/target/linux/image/au1000/Makefile +++ b/target/linux/image/au1000/Makefile @@ -12,10 +12,10 @@ LOADER_MAKEOPTS= \ KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) -lzma-loader-clean: +lzma-loader-clean: FORCE $(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean -lzma-loader-prepare: +lzma-loader-prepare: FORCE $(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) prepare lzma-loader-compile: $(KDIR)/vmlinux.lzma lzma-loader-prepare diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile index 0fe3ceeac..7e328470a 100644 --- a/target/linux/image/brcm/Makefile +++ b/target/linux/image/brcm/Makefile @@ -2,10 +2,10 @@ include $(TOPDIR)/rules.mk KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) -lzma-loader-clean: +lzma-loader-clean: FORCE $(MAKE) -C lzma-loader clean -lzma-loader-prepare: +lzma-loader-prepare: FORCE $(MAKE) -C lzma-loader prepare lzma-loader-compile: lzma-loader-prepare diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk index 44d892415..c1d07a22b 100644 --- a/target/linux/image/jffs2.mk +++ b/target/linux/image/jffs2.mk @@ -6,13 +6,13 @@ endif #JFFS2OPTS += -Xlzo -msize -Xlzari -jffs2-prepare: +jffs2-prepare: FORCE $(MAKE) -C jffs2 prepare jffs2-compile: prepare-targets $(MAKE) -C jffs2 compile -jffs2-clean: +jffs2-clean: FORCE $(MAKE) -C jffs2 clean rm -f $(KDIR)/root.jffs2* @@ -28,11 +28,11 @@ ifeq ($(IB),) jffs2-install: compile-targets $(BOARD)-compile endif -jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB +jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB FORCE $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB" $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB" -jffs2-install-ib: compile-targets +jffs2-install-ib: compile-targets FORCE mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin $(CP) $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin diff --git a/target/linux/image/jffs2/Makefile b/target/linux/image/jffs2/Makefile index 071bacdd4..0273d52fd 100644 --- a/target/linux/image/jffs2/Makefile +++ b/target/linux/image/jffs2/Makefile @@ -24,6 +24,6 @@ source: $(DL_DIR)/$(MTD_SOURCE) prepare: $(MTD_DIR)/.unpacked compile: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2 install: -clean: +clean: FORCE rm -rf $(MTD_DIR) diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk index abe21563e..184330cfe 100644 --- a/target/linux/image/squashfs.mk +++ b/target/linux/image/squashfs.mk @@ -4,13 +4,13 @@ else endian := be endif -squashfs-prepare: +squashfs-prepare: FORCE $(MAKE) -C squashfs prepare squashfs-compile: prepare-targets $(MAKE) -C squashfs compile -squashfs-clean: +squashfs-clean: FORCE $(MAKE) -C squashfs clean rm -f $(KDIR)/root.squashfs @@ -22,7 +22,7 @@ ifeq ($(IB),) squashfs-install: compile-targets $(BOARD)-compile endif -squashfs-install: $(KDIR)/root.squashfs +squashfs-install: $(KDIR)/root.squashfs FORCE $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs" squashfs-install-ib: compile-targets diff --git a/target/linux/image/squashfs/Makefile b/target/linux/image/squashfs/Makefile index b5a51f8a3..a2b367187 100644 --- a/target/linux/image/squashfs/Makefile +++ b/target/linux/image/squashfs/Makefile @@ -23,5 +23,5 @@ source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) prepare: $(SQUASHFSLZMA_DIR)/.unpacked compile: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma install: -clean: +clean: FORCE rm -rf $(SQUASHFSLZMA_DIR) diff --git a/target/linux/image/tgz.mk b/target/linux/image/tgz.mk index 4ea84ebd4..506ab891a 100644 --- a/target/linux/image/tgz.mk +++ b/target/linux/image/tgz.mk @@ -1,4 +1,4 @@ -$(KDIR)/root.tar.gz: +$(KDIR)/root.tar.gz: FORCE tar -zcf $@ --owner=root --group=root -C $(BUILD_DIR)/root/ . ifeq ($(BOARD),x86) diff --git a/target/linux/image/x86/Makefile b/target/linux/image/x86/Makefile index 5820d022b..8035d722f 100644 --- a/target/linux/image/x86/Makefile +++ b/target/linux/image/x86/Makefile @@ -4,33 +4,28 @@ KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifeq ($(FS),jffs2-8MB) - $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img: $(KDIR)/root.$(FS) $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img - endif ifeq ($(FS),tgz) - $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz: $(KDIR)/root.tar.gz $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz - endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/bzImage $(CP) $^ $@ - clean: prepare: compile: install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz -install-ib: +install-ib: FORCE mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) $(CP) $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/image/xscale/Makefile b/target/linux/image/xscale/Makefile index 04a89f9b1..cc47c25ab 100644 --- a/target/linux/image/xscale/Makefile +++ b/target/linux/image/xscale/Makefile @@ -2,35 +2,29 @@ include $(TOPDIR)/rules.mk KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) - ifeq ($(FS),jffs2-8MB) - $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img: $(KDIR)/root.$(FS) $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img - endif ifeq ($(FS),tgz) - $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz: $(KDIR)/root.tar.gz $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz - endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/vmlinux $(CP) $^ $@ - clean: prepare: compile: install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz -install-ib: +install-ib: FORCE mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) $(CP) $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ |