aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/image
diff options
context:
space:
mode:
authorJoseph C. Lehner <joseph.c.lehner@gmail.com>2017-01-27 16:10:40 +0100
committerMathias Kresin <dev@kresin.me>2017-02-04 13:46:48 +0100
commit7d00cfe9bb693e376ac9d035e13f8ce8a5ff572c (patch)
tree347422bb10d73b805370743dc023bafd5e155457 /target/linux/apm821xx/image
parentc1eae7a7b8c272bca1a9ab489b1ceb6434021121 (diff)
downloadupstream-7d00cfe9bb693e376ac9d035e13f8ce8a5ff572c.tar.gz
upstream-7d00cfe9bb693e376ac9d035e13f8ce8a5ff572c.tar.bz2
upstream-7d00cfe9bb693e376ac9d035e13f8ce8a5ff572c.zip
build: centralize fakeroot code
This patch moves the fakeroot code required by some devices to `image-commands.mk`. Create the fakeroot on the fly by using the undocumented -s (skip copy) parameter of mkimage. Signed-off-by: Joseph C. Lehner <joseph.c.lehner@gmail.com> [remove unused NETGEAR_KERNEL_MAGIC, remove workarounds to have a dummy rootfs for mkimage] Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/apm821xx/image')
-rw-r--r--target/linux/apm821xx/image/Makefile20
1 files changed, 2 insertions, 18 deletions
diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index 0ded83dd99..a11e989705 100644
--- a/target/linux/apm821xx/image/Makefile
+++ b/target/linux/apm821xx/image/Makefile
@@ -129,23 +129,6 @@ define Build/create-uImage-dtb
@mv $@.new $@
endef
-define Build/append-fakerootfs
- rm -rf $@.fakerootsquashfs $@.fakefs
-
- # append a fake/empty rootfs to fool netgear's uboot
- # CHECK_DNI_FIRMWARE_ROOTFS_INTEGRITY in do_chk_dniimg()
- dd if=/dev/zero of=$@.fakerd bs=16 count=1 conv=sync
-
- -$(STAGING_DIR_HOST)/bin/mkimage \
- -A $(LINUX_KARCH) -O linux -T filesystem -C none \
- -a 0x00000000 -e 0x00000000 \
- -n '$(DEVICE_PROFILE) fakerootfs' \
- -d $@.fakerd $@.fakefs
-
- cat $@.fakefs >> $@
- rm -rf $@.fakerootsquashfs $@.fakefs
-endef
-
define Build/wndr4700-specialImage
rm -rf $@.fakerd $@.new
@@ -192,7 +175,8 @@ define Device/WNDR4700
IMAGE_SIZE := 24960k
IMAGES := factory.img sysupgrade.tar kernel.dtb
KERNEL_SIZE := 1920k
- KERNEL := dtb | kernel-bin | lzma | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | append-fakerootfs
+ KERNEL := dtb | kernel-bin | lzma | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | \
+ append-uImage-fakeroot-hdr
KERNEL_INITRAMFS := kernel-bin | gzip | dtb | wndr4700-specialImage gzip
IMAGE/factory.img := create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \
netgear-dni | check-size $$$$(IMAGE_SIZE)