X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=include%2Fimage.mk;h=53919052e9f0bcf777bb140746df51c2e4cf3655;hb=e27a482635312ebe930bee83cfc5c1ee90091597;hp=729929f9da1ca91bc5a997af813d8c680ee7e9f6;hpb=419f131304feb32ae974888594c3086f71a7c719;p=openwrt.git

diff --git a/include/image.mk b/include/image.mk
index 729929f9da..53919052e9 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -67,9 +67,13 @@ define add_jffs2_mark
 	echo -ne '\xde\xad\xc0\xde' >> $(1)
 endef
 
-# pad to 4k, 8k, 64k, 128k 256k and add jffs2 end-of-filesystem mark
+define toupper
+$(shell echo $(1) | tr '[:lower:]' '[:upper:]')
+endef
+
+# pad to 4k, 8k, 16k, 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
+	$(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 16 64 128 256
 endef
 
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
@@ -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
@@ -126,6 +130,19 @@ ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
 endif
 
 ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
+    define Image/mkfs/ubifs/generate
+	$(CP) ./ubinize$(1).cfg $(KDIR)
+	( cd $(KDIR); \
+		$(STAGING_DIR_HOST)/bin/ubinize \
+		$(if $($(PROFILE)_UBI_OPTS), \
+			$(shell echo $($(PROFILE)_UBI_OPTS)), \
+			$(shell echo $(UBI_OPTS)) \
+		) \
+		-o $(KDIR)/root$(1).ubi \
+		ubinize$(1).cfg \
+	)
+    endef
+
     define Image/mkfs/ubifs
 
         ifneq ($($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),)
@@ -138,23 +155,16 @@ 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)
         endif
 	$(call Image/Build,ubifs)
 
         ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),)
-		$(CP) ./ubinize.cfg $(KDIR)
-		( cd $(KDIR); \
-		$(STAGING_DIR_HOST)/bin/ubinize \
-			$(if $($(PROFILE)_UBI_OPTS), \
-				$(shell echo $($(PROFILE)_UBI_OPTS)), \
-				$(shell echo $(UBI_OPTS)) \
-			) \
-			-o $(KDIR)/root.ubi \
-			ubinize.cfg \
-		)
+		$(call Image/mkfs/ubifs/generate,)
+		$(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay))
         endif
 	$(call Image/Build,ubi)
     endef