diff --git a/patches-21.02.2/0001-ath79-add-support-for-gl-xe300.patch b/patches-21.02.2/0001-ath79-add-support-for-gl-xe300.patch index 2c56b1e..50755c7 100644 --- a/patches-21.02.2/0001-ath79-add-support-for-gl-xe300.patch +++ b/patches-21.02.2/0001-ath79-add-support-for-gl-xe300.patch @@ -37,7 +37,7 @@ index 4d54a14ba4..6908f5b5c1 100644 + "metadata_version": "1.0", \ + "supported_devices":[$(call metadata_devices,$(1))], \ + "version": { \ -+ "release": "$(shell sed ':a;N;s/\n/\\\\n/g;s/\r/\\\\r/g;ta' $(TOPDIR)/gl_release_note | sed "s/'/\\\047/g")", \ ++ "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))", \ diff --git a/patches-21.02.2/0017-ipq40xx-add-modem-support-and-compatible-with-a1300_update_dts.patch b/patches-21.02.2/0017-ipq40xx-add-modem-support-and-compatible-with-a1300_update_dts.patch index 919400d..1fd67d1 100644 --- a/patches-21.02.2/0017-ipq40xx-add-modem-support-and-compatible-with-a1300_update_dts.patch +++ b/patches-21.02.2/0017-ipq40xx-add-modem-support-and-compatible-with-a1300_update_dts.patch @@ -57,11 +57,11 @@ index 6908f5b5c1..5c416dfc28 100644 "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)" \ ++ "release_note":"$(shell sed ':a;N;s/\n/\\\\n/g;s/\r/\\\\r/g;ta' $(TOPDIR)/gl_release_note | sed "s/'/\\\047/g")" \ }' define Build/append-gl-metadata - $(if $(SUPPORTED_DEVICES),-echo $(call metadata_gl_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@) + $(if $(SUPPORTED_DEVICES),-echo -e $(call metadata_gl_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@) - [ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" -o ! -s "$@" ] || { \ - cp "$(BUILD_KEY).ucert" "$@.ucert" ;\ + [ ! -s "$(BUILD_KEY)" -o ! -s "$@" ] || { \