From 550eb3072252597f0340499703bec0d7c6243882 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 29 Jun 2013 08:41:03 +0000 Subject: [PATCH 1/1] ramips: unbreak initramfs generation Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37080 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/image/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 49394692f0..499f105acd 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -74,15 +74,15 @@ define MkImageSysupgrade/squashfs endef define PatchKernelLzmaDtb - cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(1) + cp $(KDIR)/vmlinux$(3) $(KDIR)/vmlinux-$(1)$(3) $(LINUX_DIR)/scripts/dtc/dtc -O dtb -o $(KDIR)/$(2).dtb ../dts/$(2).dts - $(STAGING_DIR_HOST)/bin/patch-dtb $(KDIR)/vmlinux-$(1) $(KDIR)/$(2).dtb - $(call CompressLzma,$(KDIR)/vmlinux-$(1),$(KDIR)/vmlinux-$(1).bin.lzma) + $(STAGING_DIR_HOST)/bin/patch-dtb $(KDIR)/vmlinux-$(1)$(3) $(KDIR)/$(2).dtb + $(call CompressLzma,$(KDIR)/vmlinux-$(1)$(3),$(KDIR)/vmlinux-$(1)$(3).bin.lzma) endef define MkImageLzmaDtb - $(call PatchKernelLzmaDtb,$(1),$(2)) - $(call MkImage,lzma,$(KDIR)/vmlinux-$(1).bin.lzma,$(KDIR)/vmlinux-$(1).uImage,$(3)) + $(call PatchKernelLzmaDtb,$(1),$(2),$(4)) + $(call MkImage,lzma,$(KDIR)/vmlinux-$(1)$(4).bin.lzma,$(KDIR)/vmlinux-$(1)$(4).uImage,$(3)) endef define BuildFirmware/OF @@ -91,8 +91,8 @@ define BuildFirmware/OF endef define BuildFirmware/OF/initramfs - $(call MkImageLzmaDtb,$(2),$(3),$(4)) - $(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin + $(call MkImageLzmaDtb,$(2),$(3),$(4),-initramfs) + $(CP) $(KDIR)/vmlinux-$(2)-initramfs.uImage $(call imgname,$(1),$(2))-uImage.bin endef -- 2.11.0