move target/linux/package/switch to package/, fix a bug in the ipkg dependency handling

[openwrt.git] / target / linux / image / Makefile

diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile
index 7c65b6e..ce807b3 100644 (file)
--- a/target/linux/image/Makefile
+++ b/target/linux/image/Makefile
@@ -2,45 +2,43 @@ include $(TOPDIR)/rules.mk
 
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
-ifeq ($(BR2_TARGET_ROOTFS_JFFS2),y)
+ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y)
 include ./jffs2.mk
 endif
 
-ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_LZMA),y)
+ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS_LZMA),y)
 include ./squashfs.mk
 endif
 
-ifeq ($(BR2_TARGET_ROOTFS_TGZ),y)
+ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
 include ./tgz.mk
 endif
 
 prepare:
-       $(MAKE) prepare-targets $(MAKE_TRACE)
+       $(MAKE) prepare-targets
 compile:
-       $(MAKE) compile-targets $(MAKE_TRACE)
+       $(MAKE) compile-targets
 install:
-       $(MAKE) install-targets $(MAKE_TRACE)
+       $(MAKE) install-targets
 
 .PHONY: 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)/      
+       $(CP) $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/   
 
 install-prepare:
        find $(KDIR)/root -type f -not -perm +0100 | xargs chmod 0644
        find $(KDIR)/root -type f -perm +0100 | xargs chmod 0755
        find $(KDIR)/root -type d | xargs chmod 0755
+       mkdir -p $(KDIR)/root/tmp
        chmod 0777 $(KDIR)/root/tmp
 
 rebuild: clean prepare compile install
 clean:
-       $(MAKE) clean-targets $(MAKE_TRACE)
+       $(MAKE) clean-targets