Using pad-to instead of passing the optional padding to append-kernel or append-rootfs. It could be that the value of a variable is passed. In case the variable is empty no error is thrown. Furthermore the purpose of the extra parameter is hard to get without reading the code. Signed-off-by: Mathias Kresin <dev@kresin.me>
		
			
				
	
	
		
			175 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			175 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Makefile
		
	
	
	
	
	
# Build commands that can be called from Device/* templates
 | 
						|
 | 
						|
IMAGE_KERNEL = $(word 1,$^)
 | 
						|
IMAGE_ROOTFS = $(word 2,$^)
 | 
						|
 | 
						|
define Build/uImage
 | 
						|
	mkimage -A $(LINUX_KARCH) \
 | 
						|
		-O linux -T kernel \
 | 
						|
		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
 | 
						|
		-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ $@.new
 | 
						|
	@mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/netgear-chk
 | 
						|
	$(STAGING_DIR_HOST)/bin/mkchkimg \
 | 
						|
		-o $@.new \
 | 
						|
		-k $@ \
 | 
						|
		-b $(NETGEAR_BOARD_ID) \
 | 
						|
		-r $(NETGEAR_REGION)
 | 
						|
	mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/netgear-dni
 | 
						|
	$(STAGING_DIR_HOST)/bin/mkdniimg \
 | 
						|
		-B $(NETGEAR_BOARD_ID) -v LEDE.$(REVISION) \
 | 
						|
		$(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \
 | 
						|
		-r "$(1)" \
 | 
						|
		-i $@ -o $@.new
 | 
						|
	mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/tplink-safeloader
 | 
						|
       -$(STAGING_DIR_HOST)/bin/tplink-safeloader \
 | 
						|
		-B $(TPLINK_BOARD_NAME) \
 | 
						|
		-V $(REVISION) \
 | 
						|
		-k $(IMAGE_KERNEL) \
 | 
						|
		-r $@ \
 | 
						|
		-o $@.new \
 | 
						|
		-j \
 | 
						|
		$(wordlist 2,$(words $(1)),$(1)) \
 | 
						|
		$(if $(findstring sysupgrade,$(word 1,$(1))),-S) && mv $@.new $@ || rm -f $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/append-dtb
 | 
						|
	$(call Image/BuildDTB,$(if $(DEVICE_DTS_DIR),$(DEVICE_DTS_DIR),$(DTS_DIR))/$(DEVICE_DTS).dts,$@.dtb)
 | 
						|
	cat $@.dtb >> $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/install-dtb
 | 
						|
	$(foreach dts,$(DEVICE_DTS), \
 | 
						|
		$(CP) \
 | 
						|
			$(DTS_DIR)/$(dts).dtb \
 | 
						|
			$(BIN_DIR)/$(IMG_PREFIX)-$(dts).dtb; \
 | 
						|
	)
 | 
						|
endef
 | 
						|
 | 
						|
define Build/fit
 | 
						|
	$(TOPDIR)/scripts/mkits.sh \
 | 
						|
		-D $(DEVICE_NAME) -o $@.its -k $@ \
 | 
						|
		$(if $(word 2,$(1)),-d $(word 2,$(1))) -C $(word 1,$(1)) \
 | 
						|
		-a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
 | 
						|
		-A $(ARCH) -v $(LINUX_VERSION)
 | 
						|
	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new
 | 
						|
	@mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/lzma
 | 
						|
	$(call Build/lzma-no-dict,-lc1 -lp2 -pb2 $(1))
 | 
						|
endef
 | 
						|
 | 
						|
define Build/lzma-no-dict
 | 
						|
	$(STAGING_DIR_HOST)/bin/lzma e $@ $(1) $@.new
 | 
						|
	@mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/gzip
 | 
						|
	gzip -9n -c $@ $(1) > $@.new
 | 
						|
	@mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/jffs2
 | 
						|
	rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 && \
 | 
						|
		mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(1)) && \
 | 
						|
		cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(1) && \
 | 
						|
		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad \
 | 
						|
			$(if $(CONFIG_BIG_ENDIAN),--big-endian,--little-endian) \
 | 
						|
			--squash-uids -v -e $(patsubst %k,%KiB,$(BLOCKSIZE)) \
 | 
						|
			-o $@.new \
 | 
						|
			-d $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 \
 | 
						|
			2>&1 1>/dev/null | awk '/^.+$$$$/' && \
 | 
						|
		$(STAGING_DIR_HOST)/bin/padjffs2 $@.new -J $(patsubst %k,,$(BLOCKSIZE))
 | 
						|
	-rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/
 | 
						|
	@mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/kernel-bin
 | 
						|
	rm -f $@
 | 
						|
	cp $< $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/patch-cmdline
 | 
						|
	$(STAGING_DIR_HOST)/bin/patch-cmdline $@ '$(CMDLINE)'
 | 
						|
endef
 | 
						|
 | 
						|
define Build/append-kernel
 | 
						|
	dd if=$(IMAGE_KERNEL) >> $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/append-rootfs
 | 
						|
	dd if=$(IMAGE_ROOTFS) >> $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/append-ubi
 | 
						|
	sh $(TOPDIR)/scripts/ubinize-image.sh \
 | 
						|
		$(if $(UBOOTENV_IN_UBI),--uboot-env) \
 | 
						|
		$(if $(KERNEL_IN_UBI),--kernel $(IMAGE_KERNEL)) \
 | 
						|
		$(foreach part,$(UBINIZE_PARTS),--part $(part)) \
 | 
						|
		$(IMAGE_ROOTFS) \
 | 
						|
		$@.tmp \
 | 
						|
		-p $(BLOCKSIZE:%k=%KiB) -m $(PAGESIZE) \
 | 
						|
		$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \
 | 
						|
		$(if $(VID_HDR_OFFSET),-O $(VID_HDR_OFFSET)) \
 | 
						|
		$(UBINIZE_OPTS)
 | 
						|
	cat $@.tmp >> $@
 | 
						|
	rm $@.tmp
 | 
						|
endef
 | 
						|
 | 
						|
define Build/pad-to
 | 
						|
	dd if=$@ of=$@.new bs=$(1) conv=sync
 | 
						|
	mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/pad-extra
 | 
						|
	dd if=/dev/zero bs=$(1) count=1 >> $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/pad-rootfs
 | 
						|
	$(STAGING_DIR_HOST)/bin/padjffs2 $@ $(1) \
 | 
						|
		$(if $(BLOCKSIZE),$(BLOCKSIZE:%k=%),4 8 16 64 128 256)
 | 
						|
endef
 | 
						|
 | 
						|
define Build/pad-offset
 | 
						|
	let \
 | 
						|
		size="$$(stat -c%s $@)" \
 | 
						|
		pad="$(subst k,* 1024,$(word 1, $(1)))" \
 | 
						|
		offset="$(subst k,* 1024,$(word 2, $(1)))" \
 | 
						|
		pad="(pad - ((size + offset) % pad)) % pad" \
 | 
						|
		newsize='size + pad'; \
 | 
						|
		dd if=$@ of=$@.new bs=$$newsize count=1 conv=sync
 | 
						|
	mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/check-size
 | 
						|
	@[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $@)" ] || { \
 | 
						|
		echo "WARNING: Image file $@ is too big" >&2; \
 | 
						|
		rm -f $@; \
 | 
						|
	}
 | 
						|
endef
 | 
						|
 | 
						|
define Build/combined-image
 | 
						|
	-sh $(TOPDIR)/scripts/combined-image.sh \
 | 
						|
		"$(IMAGE_KERNEL)" \
 | 
						|
		"$@" \
 | 
						|
		"$@.new"
 | 
						|
	@mv $@.new $@
 | 
						|
endef
 | 
						|
 | 
						|
define Build/sysupgrade-tar
 | 
						|
	sh $(TOPDIR)/scripts/sysupgrade-tar.sh \
 | 
						|
		--board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
 | 
						|
		--kernel $(call param_get_default,kernel,$(1),$(IMAGE_KERNEL)) \
 | 
						|
		--rootfs $(call param_get_default,rootfs,$(1),$(IMAGE_ROOTFS)) \
 | 
						|
		$@
 | 
						|
endef
 |