really fix tgz images

SVN-Revision: 8065

diff --git a/include/image.mk b/include/image.mk
index c56e7cf193618b6b5b7cd82b2cde7a111e6f6a16..5fc87efa1d951e8d0127feb7fff688ca45bf918c 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -57,7 +57,6 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
   ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
     define Image/mkfs/tgz
                $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
   ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
     define Image/mkfs/tgz
                $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .

-               $(call Image/Build,tgz)

     endef
   endif
 else
     endef
   endif
 else

diff --git a/target/linux/adm5120-2.6/image/Makefile b/target/linux/adm5120-2.6/image/Makefile
index b9ae44ecb41cb1307be0fe90ac7d3e25993cdaa5..829ddef3da830f4ed2faba9d7c8de1419c3472d0 100644 (file)
--- a/target/linux/adm5120-2.6/image/Makefile
+++ b/target/linux/adm5120-2.6/image/Makefile
@@ -121,10 +121,13 @@ endif
 endif
 endif
 endif
 endif
 endif
 endif

-ifeq ($(1),tgz)
+endef
+
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+  define Image/BuildKernel

        $(call Image/Build/RouterBoard)
        $(call Image/Build/RouterBoard)

+  endef

 endif
 endif

-endef

 
 define Image/Build/LZMAKernel
        $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
 
 define Image/Build/LZMAKernel
        $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \