target/sdk: strip host binaries before packing

[openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index c7da060..bc7e7db 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -67,6 +67,10 @@ define add_jffs2_mark
        echo -ne '\xde\xad\xc0\xde' >> $(1)
 endef
 
+define toupper
+$(shell echo $(1) | tr '[:lower:]' '[:upper:]')
+endef
+
 # pad to 4k, 8k, 64k, 128k 256k and add jffs2 end-of-filesystem mark
 define prepare_generic_squashfs
        $(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 64 128 256
@@ -82,9 +86,9 @@ else
   endef
 endif
 
-define Image/BuildKernel/MkuImageARM
-       mkimage -A arm -O linux -T kernel -a $(1) -C none -e $(1) \
-               -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(2) $(3)
+define Image/BuildKernel/MkuImage
+       mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
+               -n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5)
 endef
 
 define Image/BuildKernel/MkFIT
@@ -138,7 +142,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
                        $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \
                        $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \
                        $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \
-                       --jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE) \
+                       $(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \
                        --squash-uids \
                        -o $(KDIR)/root.ubifs \
                        -d $(TARGET_DIR)