projects / openwrt / staging / stintel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ath79: Add support for MOXA AWK-1137C
[openwrt/staging/stintel.git] / include / image-commands.mk
diff --git a/include/image-commands.mk b/include/image-commands.mk
index 402e3d71edb8d99e8eafdf97d0d730c5c69bc365..9220b8dec0069abef9c98b27b7d7ba04242d7c98 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -4,7 +4,7 @@ IMAGE_KERNEL = $(word 1,$^)
 IMAGE_ROOTFS = $(word 2,$^)
 
 define ModelNameLimit16
-$(shell expr substr "$(word 2, $(subst _, ,$(1)))" 1 16)
+$(shell printf %.16s "$(word 2, $(subst _, ,$(1)))")
 endef
 
 define rootfs_align
@@ -53,6 +53,7 @@ define Build/append-image-stage
        cp "$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1)" "$@.stripmeta"
        fwtool -s /dev/null -t "$@.stripmeta" || :
        fwtool -i /dev/null -t "$@.stripmeta" || :
+       mkdir -p "$(STAGING_DIR_IMAGE)"
        dd if="$@.stripmeta" of="$(STAGING_DIR_IMAGE)/$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-$(DEVICE_NAME)-$(1)"
        dd if="$@.stripmeta" >> "$@"
        rm "$@.stripmeta"
@@ -105,7 +106,7 @@ endef
 define Build/append-squashfs-fakeroot-be
        rm -rf $@.fakefs $@.fakesquashfs
        mkdir $@.fakefs
-       $(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
+       $(STAGING_DIR_HOST)/bin/mksquashfs3-lzma \
                $@.fakefs $@.fakesquashfs \
                -noappend -root-owned -be -nopad -b 65536 \
                $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
@@ -125,6 +126,13 @@ define Build/append-string
        echo -n $(1) >> $@
 endef
 
+define Build/append-md5sum-ascii-salted
+       cp $@ $@.salted
+       echo -ne $(1) >> $@.salted
+       $(STAGING_DIR_HOST)/bin/mkhash md5 $@.salted | head -c32 >> $@
+       rm $@.salted
+endef
+
 define Build/append-ubi
        sh $(TOPDIR)/scripts/ubinize-image.sh \
                $(if $(UBOOTENV_IN_UBI),--uboot-env) \
@@ -218,6 +226,11 @@ define Build/copy-file
        cat "$(1)" > "$@"
 endef
 
+define Build/edimax-header
+       $(STAGING_DIR_HOST)/bin/mkedimaximg -i $@ -o $@.new $(1)
+       @mv $@.new $@
+endef
+
 define Build/elecom-product-header
        $(eval product=$(word 1,$(1)))
        $(eval fw=$(if $(word 2,$(1)),$(word 2,$(1)),$@))
@@ -271,7 +284,9 @@ endef
 define Build/initrd_compression
        $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),.bzip2) \
        $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),.gzip) \
+       $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),.lz4) \
        $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA),.lzma) \
+       $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO),.lzo) \
        $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ),.xz) \
        $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD),.zstd)
 endef
@@ -279,9 +294,11 @@ endef
 define Build/fit
        $(TOPDIR)/scripts/mkits.sh \
                -D $(DEVICE_NAME) -o $@.its -k $@ \
-               -C $(word 1,$(1)) $(if $(word 2,$(1)),\
-               $(if $(DEVICE_DTS_OVERLAY),-d $(KERNEL_BUILD_DIR)/image-$$(basename $(word 2,$(1))),\
-                       -d $(word 2,$(1)))) \
+               -C $(word 1,$(1)) \
+               $(if $(word 2,$(1)),\
+                       $(if $(findstring 11,$(if $(DEVICE_DTS_OVERLAY),1)$(if $(findstring $(KERNEL_BUILD_DIR)/image-,$(word 2,$(1))),,1)), \
+                               -d $(KERNEL_BUILD_DIR)/image-$$(basename $(word 2,$(1))), \
+                               -d $(word 2,$(1)))) \
                $(if $(findstring with-rootfs,$(word 3,$(1))),-r $(IMAGE_ROOTFS)) \
                $(if $(findstring with-initrd,$(word 3,$(1))), \
                        $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE), \
@@ -289,7 +306,8 @@ define Build/fit
                -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
                $(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \
                $(if $(DEVICE_DTS_DELIMITER),-l $(DEVICE_DTS_DELIMITER)) \
-               $(if $(DEVICE_DTS_OVERLAY),$(foreach dtso,$(DEVICE_DTS_OVERLAY), -O $(dtso):$(KERNEL_BUILD_DIR)/image-$(dtso).dtb)) \
+               $(if $(DEVICE_DTS_LOADADDR),-s $(DEVICE_DTS_LOADADDR)) \
+               $(if $(DEVICE_DTS_OVERLAY),$(foreach dtso,$(DEVICE_DTS_OVERLAY), -O $(dtso):$(KERNEL_BUILD_DIR)/image-$(dtso).dtbo)) \
                -c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \
                -A $(LINUX_KARCH) -v $(LINUX_VERSION)
        PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(findstring external,$(word 3,$(1))),\
@@ -297,11 +315,25 @@ define Build/fit
        @mv $@.new $@
 endef
 
+define Build/libdeflate-gzip
+       $(STAGING_DIR_HOST)/bin/libdeflate-gzip -f -12 -c $@ $(1) > $@.new
+       @mv $@.new $@
+endef
+
 define Build/gzip
-       gzip -f -9n -c $@ $(1) > $@.new
+       $(STAGING_DIR_HOST)/bin/gzip -f -9n -c $@ $(1) > $@.new
        @mv $@.new $@
 endef
 
+define Build/gzip-filename
+       @mkdir -p $@.tmp
+       @cp $@ $@.tmp/$(word 1,$(1))
+       $(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $@.tmp/$(word 1,$(1)) $(word 2,$(1)))
+       $(STAGING_DIR_HOST)/bin/gzip -f -9 -N -c $@.tmp/$(word 1,$(1)) $(word 2,$(1)) > $@.new
+       @mv $@.new $@
+       @rm -rf $@.tmp
+endef
+
 define Build/install-dtb
        $(call locked, \
                $(foreach dts,$(DEVICE_DTS), \
@@ -367,6 +399,15 @@ define Build/lzma-no-dict
        @mv $@.new $@
 endef
 
+define Build/moxa-encode-fw
+       $(TOPDIR)/scripts/moxa-encode-fw.py \
+               --input $@ \
+               --output $@ \
+               --magic $(MOXA_MAGIC) \
+               --hwid $(MOXA_HWID) \
+               --buildid 00000000
+endef
+
 define Build/netgear-chk
        $(STAGING_DIR_HOST)/bin/mkchkimg \
                -o $@.new \
@@ -378,7 +419,7 @@ endef
 
 define Build/netgear-dni
        $(STAGING_DIR_HOST)/bin/mkdniimg \
-               -B $(NETGEAR_BOARD_ID) -v $(VERSION_DIST).$(firstword $(subst -, ,$(REVISION))) \
+               -B $(NETGEAR_BOARD_ID) -v $(shell cat $(VERSION_DIST)| sed -e 's/[[:space:]]/-/g').$(firstword $(subst -, ,$(REVISION))) \
                $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \
                -r "$(1)" \
                -i $@ -o $@.new
@@ -391,7 +432,7 @@ define Build/netgear-encrypted-factory
                --output-file $@ \
                --model $(NETGEAR_ENC_MODEL) \
                --region $(NETGEAR_ENC_REGION) \
-               --version V1.0.0.0.$(VERSION_DIST).$(firstword $(subst -, ,$(REVISION))) \
+               --version V1.0.0.0.$(shell cat $(VERSION_DIST)| sed -e 's/[[:space:]]/-/g').$(firstword $(subst -, ,$(REVISION))) \
                --encryption-block-size 0x20000 \
                --openssl-bin "$(STAGING_DIR_HOST)/bin/openssl" \
                --key 6865392d342b4d212964363d6d7e7765312c7132613364316e26322a5a5e2538 \
@@ -549,6 +590,7 @@ define Build/tplink-v2-image
 endef
 
 define Build/uImage
+       $(if $(UIMAGE_TIME),SOURCE_DATE_EPOCH="$(UIMAGE_TIME)") \
        mkimage \
                -A $(LINUX_KARCH) \
                -O linux \
Staging tree of Stijn Tintel