make uci firewall backwards compatible to the old firewall.user

[openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index d7e4ccd..6eef6ba 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -1,4 +1,4 @@
-# 
+#

 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.


@@ -10,6 +10,7 @@ include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 

+.NOTPARALLEL:

 override MAKEFLAGS=
 override MAKE:=$(SUBMAKE)
 KDIR=$(KERNEL_BUILD_DIR)
 override MAKEFLAGS=
 override MAKE:=$(SUBMAKE)
 KDIR=$(KERNEL_BUILD_DIR)


@@ -61,18 +62,18 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 
   ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
     define Image/mkfs/tgz
 
   ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
     define Image/mkfs/tgz

-               $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(TARGET_DIR)/ .
+               $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-rootfs.tgz --owner=root --group=root -C $(TARGET_DIR)/ .

     endef
   endif
 
   ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y)
     define Image/mkfs/cpiogz
     endef
   endif
 
   ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y)
     define Image/mkfs/cpiogz

-               ( cd $(BUILD_DIR)/root; find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.cpio.gz )
+               ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/openwrt-$(BOARD)-rootfs.cpio.gz )

     endef
   endif
 else
   define Image/BuildKernel
     endef
   endif
 else
   define Image/BuildKernel

-       cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.elf
+       cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.elf

        $(call Image/Build/Initramfs)
   endef
 endif
        $(call Image/Build/Initramfs)
   endef
 endif


@@ -88,9 +89,9 @@ ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
 endif
 
 ifeq ($(CONFIG_TARGET_ROOTFS_ISO),y)
 endif
 
 ifeq ($(CONFIG_TARGET_ROOTFS_ISO),y)

-  define Image/mkfs/iso 
-               $(call Image/Build,iso) 
-  endef 
+  define Image/mkfs/iso
+               $(call Image/Build,iso)
+  endef

 endif
 
 
 endif
 
 


@@ -137,7 +138,7 @@ else
        $(call Image/mkfs/ext2)
        $(call Image/mkfs/iso)
 endif
        $(call Image/mkfs/ext2)
        $(call Image/mkfs/iso)
 endif

-       
+

 ifneq ($(IB),1)
   clean: clean-targets
        $(call Build/Clean)
 ifneq ($(IB),1)
   clean: clean-targets
        $(call Build/Clean)