diff --git a/patches-21.02.2/0018-Fix-the-compilation-error-caused-by-the-long-road.patch b/patches-21.02.2/0018-Fix-the-compilation-error-caused-by-the-long-road.patch
new file mode 100644
index 0000000..42db333
--- /dev/null
+++ b/patches-21.02.2/0018-Fix-the-compilation-error-caused-by-the-long-road.patch
@@ -0,0 +1,83 @@
+From a6b5e5be3b2ee3b69eb9c72a4d80b027add791de Mon Sep 17 00:00:00 2001
+From: ywp19980804 <weiping.yang@gl-inet.com>
+Date: Mon, 15 Aug 2022 05:46:43 -0400
+Subject: [PATCH] Fix the compilation error caused by the long road
+
+---
+ ...-buildsys-shorten-abi-deb-file-names.patch | 64 +++++++++++++++++++
+ 1 file changed, 64 insertions(+)
+ create mode 100644 package/libs/uclibc++/patches/006-buildsys-shorten-abi-deb-file-names.patch
+
+diff --git a/package/libs/uclibc++/patches/006-buildsys-shorten-abi-deb-file-names.patch b/package/libs/uclibc++/patches/006-buildsys-shorten-abi-deb-file-names.patch
+new file mode 100644
+index 0000000000..5a4327fc2f
+--- /dev/null
++++ b/package/libs/uclibc++/patches/006-buildsys-shorten-abi-deb-file-names.patch
+@@ -0,0 +1,64 @@
++Index: uClibc++-0.2.5/Rules.mak
++===================================================================
++--- uClibc++-0.2.5.orig/Rules.mak
+++++ uClibc++-0.2.5/Rules.mak
++@@ -50,6 +50,7 @@ RM      = rm -f
++ TAR     = tar
++ SED     = sed
++ AWK     = awk
+++MD5SUM  = md5sum
++ 
++ ARFLAGS:= cr
++ 
++@@ -247,6 +248,7 @@ endif
++ 
++ list-archive-members = $(if $(1),$(shell $(AR) t $(1)))
++ variablify = $(strip $(subst /,_,$(subst :,_,$(subst ;,_,$(subst |,_,$(subst >,_,$(subst <,_,$(1))))))))
+++print-hash = $(strip $(if $(1),$(shell printf "%s" "$(1)" | $(MD5SUM) | $(SED) 's/[^0-9a-zA-Z]//g')))
++ 
++ GEN_LIBS:= -lc
++ ifneq ($(LIBGCC_DIR),$(UCLIBCXX_RUNTIME_LIBDIR))
++Index: uClibc++-0.2.5/src/abi/libgcc_eh/Makefile.in
++===================================================================
++--- uClibc++-0.2.5.orig/src/abi/libgcc_eh/Makefile.in
+++++ uClibc++-0.2.5/src/abi/libgcc_eh/Makefile.in
++@@ -4,7 +4,7 @@ OBJS = $(call list-archive-members,$(LIB
++ libgcc_eh-$(IMPORT_LIBGCC_EH) := $(OBJS)
++ 
++ LIBGCC_EH_VAR := $(call variablify,$(LIBGCC_EH))
++-LIBGCC_EH_DEP := $(LIBGCC_EH_OUT).$(LIBGCC_EH_VAR).dep
+++LIBGCC_EH_DEP := $(LIBGCC_EH_OUT).$(call print-hash,$(LIBGCC_EH_VAR)).dep
++ 
++ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
++ -include $(LIBGCC_EH_DEP)
++@@ -17,7 +17,7 @@ endif
++ $(LIBGCC_EH_DEP): $(LIBGCC_EH)
++ 	$(Q)$(RM) $(LIBGCC_EH_OUT).*dep $(LIBGCC_EH_OUT)*.o
++ 	$(Q)$(if $(LIBGCC_EH),(cd $(LIBGCC_EH_OUT) && $(AR) x $(LIBGCC_EH)))
++-	$(Q)echo "libgcc_eh-y := \$$(addprefix \$$(LIBGCC_EH_OUT),$(libgcc_eh-y))" > $@
+++	$(Q)printf "# %s\n\n%s\n" "$(LIBGCC_EH)" "libgcc_eh-y := \$$(addprefix \$$(LIBGCC_EH_OUT),$(libgcc_eh-y))" > $@
++ 
++ CLEAN_src/abi/libgcc_eh: ;
++ DISTCLEAN_src/abi/libgcc_eh:
++Index: uClibc++-0.2.5/src/abi/libsupc/Makefile.in
++===================================================================
++--- uClibc++-0.2.5.orig/src/abi/libsupc/Makefile.in
+++++ uClibc++-0.2.5/src/abi/libsupc/Makefile.in
++@@ -5,7 +5,7 @@ OBJS-OMIT = $(filter new_op%.o del_op%.o
++ libsupc-$(IMPORT_LIBSUP) := $(filter-out $(OBJS-OMIT),$(OBJS))
++ 
++ LIBSUP_VAR := $(call variablify,$(LIBSUP))
++-LIBSUP_DEP :=$(LIBSUPC_OUT).$(LIBSUP_VAR).dep
+++LIBSUP_DEP := $(LIBSUPC_OUT).$(call print-hash,$(LIBSUP_VAR)).dep
++ 
++ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
++ -include $(LIBSUP_DEP)
++@@ -17,7 +17,7 @@ endif
++ $(LIBSUP_DEP): $(LIBSUP) $(LIBSUPC_OUT)Makefile.in
++ 	$(Q)$(RM) $(LIBSUPC_OUT).*dep $(LIBSUPC_OUT)*.o
++ 	$(Q)$(if $(LIBSUP),(cd $(LIBSUPC_OUT) && $(AR) x $(LIBSUP) && $(RM) $(OBJS-OMIT)))
++-	$(Q)echo "libsupc-y := \$$(addprefix \$$(LIBSUPC_OUT),$(libsupc-y))" > $@
+++	$(Q)printf "# %s\n\n%s\n" "$(LIBSUP)" "libsupc-y := \$$(addprefix \$$(LIBSUPC_OUT),$(libsupc-y))" > $@
++ 
++ CLEAN_src/abi/libsupc: ;
++ DISTCLEAN_src/abi/libsupc:
+-- 
+2.17.1
+
diff --git a/profiles/glinet_a1300.yml b/profiles/glinet_a1300.yml
index eb6ebb6..7685b92 100644
--- a/profiles/glinet_a1300.yml
+++ b/profiles/glinet_a1300.yml
@@ -1,12 +1,6 @@
 ---
 description: Add the glinet dependencies
 feeds:
-  - name: gl_feeds_commmon
-    uri: https://github.com/gl-inet/gl-feeds.git
-    revision: 4f9654748fe1cc1e0d7eacab99019ae88ab61081
-  - name: gl_feeds
-    uri: https://github.com/gl-inet/gl-feeds.git
-    revision: 85a587c9c1a7f71f535272665f7272ca77b43422
     # - name: glinet
     #path: ../feeds_dir/glinet
   - name: glinet
diff --git a/profiles/target_ipq40xx_gl-a1300.yml b/profiles/target_ipq40xx_gl-a1300.yml
index 16cc56e..f0ce9d3 100644
--- a/profiles/target_ipq40xx_gl-a1300.yml
+++ b/profiles/target_ipq40xx_gl-a1300.yml
@@ -3,16 +3,22 @@ profile: glinet_gl-a1300
 target: ipq40xx
 subtarget: generic
 description: Build image for the GL.iNET A1300
+feeds:
+  - name: gl_feeds_commmon
+    uri: https://github.com/gl-inet/gl-feeds.git
+    revision: 6a45f3f7c0a6407f933f980b284bc217ee38643e
+  - name: gl_feeds
+    uri: https://github.com/gl-inet/gl-feeds.git
+    revision: 85a587c9c1a7f71f535272665f7272ca77b43422
 
 packages:
   - wireless-regdb
   - wget-ssl
   - arp-scan
-  - shortcut-fe
-  - shortcut-fe-cm
   
 diffconfig: |
          CONFIG_ALL_NONSHARED=y
+         CONFIG_PACKAGE_kmod-shortcut-fe-cm=y
          CONFIG_PACKAGE_wpad-basic-wolfssl=n 
          CONFIG_PACKAGE_ath10k-firmware-qca4019=y
          CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=n