diff --git a/patches-wlan-ap/openwrt/0015-target-change-name-nand-factory.img.patch b/patches-wlan-ap/openwrt/0015-target-change-name-nand-factory.img.patch new file mode 100644 index 0000000..02783ea --- /dev/null +++ b/patches-wlan-ap/openwrt/0015-target-change-name-nand-factory.img.patch @@ -0,0 +1,28 @@ +From f0cb3a04d08608cf17f26e9557292df740daa95e Mon Sep 17 00:00:00 2001 +From: "GL.iNet-Xinfa.Deng" +Date: Sat, 12 Feb 2022 14:41:56 +0800 +Subject: [PATCH] target: change name nand-factory.img + +--- + target/linux/ipq807x/image/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/target/linux/ipq807x/image/Makefile b/target/linux/ipq807x/image/Makefile +index 3a219e6..49c6cc5 100644 +--- a/target/linux/ipq807x/image/Makefile ++++ b/target/linux/ipq807x/image/Makefile +@@ -13,9 +13,9 @@ define Device/Default + ROOTFSNAME_IN_UBI := ubi_rootfs + BLOCKSIZE := 128k + PAGESIZE := 2048 +- IMAGES := sysupgrade.tar nand-factory.bin ++ IMAGES := sysupgrade.tar nand-factory.img + IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata +- IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand ++ IMAGE/nand-factory.img := append-ubi | qsdk-ipq-factory-nand + KERNEL_NAME := Image + KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb + KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb +-- +2.7.4 + diff --git a/patches-wlan-ap/openwrt/0016-target-use-gl-metadata.patch b/patches-wlan-ap/openwrt/0016-target-use-gl-metadata.patch new file mode 100644 index 0000000..00bd62a --- /dev/null +++ b/patches-wlan-ap/openwrt/0016-target-use-gl-metadata.patch @@ -0,0 +1,67 @@ +From 3f74fb618703eca0ec38eb406275f07ac7d1786d Mon Sep 17 00:00:00 2001 +From: "GL.iNet-Xinfa.Deng" +Date: Sat, 12 Feb 2022 14:10:41 +0800 +Subject: [PATCH] target: use gl metadata + +--- + include/image-commands.mk | 30 ++++++++++++++++++++++++++++++ + target/linux/ipq807x/image/ipq60xx.mk | 2 +- + 2 files changed, 31 insertions(+), 1 deletion(-) + +diff --git a/include/image-commands.mk b/include/image-commands.mk +index aa574d2..b29b868 100644 +--- a/include/image-commands.mk ++++ b/include/image-commands.mk +@@ -64,6 +64,36 @@ define Build/append-metadata + } + endef + ++metadata_gl_json = \ ++ '{ $(if $(IMAGE_METADATA),$(IMAGE_METADATA)$(comma)) \ ++ "metadata_version": "1.1", \ ++ "compat_version": "$(call json_quote,$(compat_version))", \ ++ $(if $(DEVICE_COMPAT_MESSAGE),"compat_message": "$(call json_quote,$(DEVICE_COMPAT_MESSAGE))"$(comma)) \ ++ $(if $(filter-out 1.0,$(compat_version)),"new_supported_devices": \ ++ [$(call metadata_devices,$(SUPPORTED_DEVICES))]$(comma) \ ++ "supported_devices": ["$(call json_quote,$(legacy_supported_message))"]$(comma)) \ ++ $(if $(filter 1.0,$(compat_version)),"supported_devices":[$(call metadata_devices,$(SUPPORTED_DEVICES))]$(comma)) \ ++ "version": { \ ++ "release": "$(shell cat $(TOPDIR)/release)", \ ++ "date": "$(shell TZ='Asia/Chongqing' date '+%Y%m%d%H%M%S')", \ ++ "dist": "$(call json_quote,$(VERSION_DIST))", \ ++ "version": "$(call json_quote,$(VERSION_NUMBER))", \ ++ "revision": "$(call json_quote,$(REVISION))", \ ++ "target": "$(call json_quote,$(TARGETID))", \ ++ "board": "$(call json_quote,$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)))" \ ++ }, \ ++ "upgrade_control":"$(shell python3 $(TOPDIR)/make_gl_metadata.py)", \ ++ "release_note":"$(shell sed ':a;N;s/\n/\\n/g;s/\r/\\r/g;ta' $(TOPDIR)/gl_release_note)" \ ++ }' ++ ++define Build/append-gl-metadata ++ $(if $(SUPPORTED_DEVICES),-echo $(call metadata_gl_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@) ++ [ ! -s "$(BUILD_KEY)" -o ! -s "$@" ] || { \ ++ usign -S -m "$@" -s "$(BUILD_KEY)" -x "$@.sig" ;\ ++ fwtool -S "$@.sig" "$@" ;\ ++ } ++endef ++ + define Build/append-rootfs + dd if=$(IMAGE_ROOTFS) >> $@ + endef +diff --git a/target/linux/ipq807x/image/ipq60xx.mk b/target/linux/ipq807x/image/ipq60xx.mk +index d95e393..5367b95 100644 +--- a/target/linux/ipq807x/image/ipq60xx.mk ++++ b/target/linux/ipq807x/image/ipq60xx.mk +@@ -6,7 +6,7 @@ define Device/cig_wf188 + DEVICE_DTS_CONFIG := config@cp03-c1 + SUPPORTED_DEVICES := cig,wf188 + IMAGES := sysupgrade.tar +- IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata ++ IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-gl-metadata + DEVICE_PACKAGES := ath11k-wifi-cig-wf188 uboot-env + endef + TARGET_DEVICES += cig_wf188 +-- +2.7.4 +