build: centralize fakeroot code

[openwrt/staging/mkresin.git] / target / linux / ipq806x / image / Makefile

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index 33dc31d41edab3d6d78230f82b6bba9678dba65e..b00e19758644850e80ccfda635980020f05f2023 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -9,12 +9,6 @@ KERNEL_LOADADDR := 0x42208000
 
 define Image/Prepare
        $(CP) $(LINUX_DIR)/vmlinux $(KDIR)/$(IMG_PREFIX)-vmlinux.elf
-       mkimage -A arm -O linux -T filesystem -C none \
-               -a $(KERNEL_LOADADDR) -e $(KERNEL_LOADADDR) \
-               -n 'ARM OpenWrt fakeroot' \
-               -s $(KDIR_TMP)/root.dummy-uImage.tmp
-       echo -ne '\xff' > $(KDIR_TMP)/root.dummy
-       cat $(KDIR_TMP)/root.dummy $(KDIR_TMP)/root.dummy-uImage.tmp > $(KDIR)/root.dummy
 endef
 
 define Image/BuildKernel
@@ -64,7 +58,8 @@ define Device/DniImage
        FILESYSTEMS := squashfs
        KERNEL_SUFFIX := -uImage
        KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none
-       KERNEL = kernel-bin | append-dtb | pad-to $$$$(($$(KERNEL_SIZE)-2*64-1)) | uImage none | append-file $(KDIR)/root.dummy
+       KERNEL = kernel-bin | append-dtb | uImage none | pad-offset $$(KERNEL_SIZE) 64 | \
+               append-uImage-fakeroot-hdr
        KERNEL_NAME := zImage
        NETGEAR_BOARD_ID :=
        NETGEAR_HW_ID :=
@@ -161,7 +156,7 @@ define Device/EA8500
        BLOCKSIZE := 128k
        KERNEL_SIZE := 3072k
        FILESYSTEMS := squashfs
-       KERNEL = kernel-bin | append-dtb | uImage none | append-file $(KDIR)/root.dummy
+       KERNEL = kernel-bin | append-dtb | uImage none | append-uImage-fakeroot-hdr
        PROFILES += $$(DEVICE_NAME)
        BOARD_NAME := ea8500
        UBINIZE_OPTS := -E 5