patches-siflower-18.x: update siflower SDK to e78c95b

2025-12-16 09:10:02 +00:00 · 2021-10-25 15:24:11 +08:00 · 2021-10-25 15:24:11 +08:00 · a718bea30f
commit a718bea30f
parent e99086d61d
9 changed files with 363 additions and 26 deletions
--- a/config-siflower-18.x.yml
+++ b/config-siflower-18.x.yml
@ -2,7 +2,7 @@ repo: https://github.com/Siflower/1806_SDK.git
 branch: release
 git_clone_dir: openwrt-18.06/siflower
 openwrt_root_dir: openwrt-18.06/siflower/openwrt-18.06
-revision: 9bb17f46aa4106ba0878c9574bdd40da707adfd6
+revision: e78c95bd11d8c5e7b48ba25b6c5a62f764151260

 patch_folders:
  - patches-siflower-18.x/
--- a/patches-siflower-18.x/0304-fix-change-system-type-to-sf19a28.patch
+++ b/patches-siflower-18.x/0304-fix-change-system-type-to-sf19a28.patch
@ -1,24 +0,0 @@
-From 19a1635a62945e3a02adecb83391c4836e2ddf82 Mon Sep 17 00:00:00 2001
-From: "GL.iNet-Xinfa.Deng" <xinfa.deng@gl-inet.com>
-Date: Mon, 30 Aug 2021 10:36:28 +0800
-Subject: [PATCH] fix: change system type to sf19a28
-
-Signed-off-by: GL.iNet-Xinfa.Deng <xinfa.deng@gl-inet.com>
---
- linux-4.14.90-dev/linux-4.14.90/arch/mips/siflower/init.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux-4.14.90-dev/linux-4.14.90/arch/mips/siflower/init.c b/linux-4.14.90-dev/linux-4.14.90/arch/mips/siflower/init.c
-index 860665d..cd9ea49 100644
--- a/linux-4.14.90-dev/linux-4.14.90/arch/mips/siflower/init.c
-+++ b/linux-4.14.90-dev/linux-4.14.90/arch/mips/siflower/init.c
-@@ -70,5 +70,5 @@ void __init device_tree_init(void)
- 
- const char *get_system_type(void)
- {
-	return "MIPS sf16a18";
-+	return "MIPS sf19a28";
- }
-- 
-2.7.4
-
--- a/patches-siflower-18.x/0304-fix-modified-the-min_free_kbytes-from-16384-to-4096.patch
+++ b/patches-siflower-18.x/0304-fix-modified-the-min_free_kbytes-from-16384-to-4096.patch
@ -0,0 +1,43 @@
+From 9593f4b59592c41f5bed35ca1a1abd828d1b69ef Mon Sep 17 00:00:00 2001
+From: "GL.iNet-Xinfa.Deng" <xinfa.deng@gl-inet.com>
+Date: Thu, 14 Oct 2021 14:57:57 +0800
+Subject: [PATCH] fix: modified the min_free_kbytes from 16384 to 4096
+
+---
+ .../package/base-files/files/etc/init.d/sysctl       | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/openwrt-18.06/package/base-files/files/etc/init.d/sysctl b/openwrt-18.06/package/base-files/files/etc/init.d/sysctl
+index 4db5644..9295f30 100755
+--- a/openwrt-18.06/package/base-files/files/etc/init.d/sysctl
+++ b/openwrt-18.06/package/base-files/files/etc/init.d/sysctl
+@@ -7,15 +7,17 @@ apply_defaults() {
+ 	local mem="$(awk '/^MemTotal:/ {print $2}' /proc/meminfo)"
+ 	local min_free frag_low_thresh frag_high_thresh
+ 
+-	if [ "$mem" -gt 65536 ]; then # 128M
+-		min_free=16384
+-	elif [ "$mem" -gt 32768 ]; then # 64M
+-		min_free=8192
+-	else
+-		min_free=1024
+-		frag_low_thresh=393216
+-		frag_high_thresh=524288
+-	fi
+	#Fixed SF oom bug
+	min_free=4096
+	#if [ "$mem" -gt 65536 ]; then # 128M
+	#	min_free=16384
+	#elif [ "$mem" -gt 32768 ]; then # 64M
+	#	min_free=8192
+	#else
+	#	min_free=1024
+	#	frag_low_thresh=393216
+	#	frag_high_thresh=524288
+	#fi
+ 
+ 	sysctl -qw vm.min_free_kbytes="$min_free"
+ 
+-- 
+2.7.4
+
--- a/patches-siflower-18.x/0305-fix-pppd-automatically-reconnects.patch
+++ b/patches-siflower-18.x/0305-fix-pppd-automatically-reconnects.patch
@ -0,0 +1,25 @@
+From 46b06cd25022e7329479f60a580bf1ec913fca04 Mon Sep 17 00:00:00 2001
+From: "GL.iNet-Xinfa.Deng" <xinfa.deng@gl-inet.com>
+Date: Sat, 16 Oct 2021 09:35:43 +0800
+Subject: [PATCH] fix: pppd automatically reconnects
+
+---
+ openwrt-18.06/package/network/services/ppp/files/ppp.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/openwrt-18.06/package/network/services/ppp/files/ppp.sh b/openwrt-18.06/package/network/services/ppp/files/ppp.sh
+index 3606fd3..2e18a54 100755
+--- a/openwrt-18.06/package/network/services/ppp/files/ppp.sh
+++ b/openwrt-18.06/package/network/services/ppp/files/ppp.sh
+@@ -111,6 +111,8 @@ ppp_generic_setup() {
+ 		}
+ 	}
+ 
+	[ -n "$keepalive" ] || keepalive="5 1"
+
+ 	local lcp_failure="${keepalive%%[, ]*}"
+ 	local lcp_interval="${keepalive##*[, ]}"
+ 	local lcp_adaptive="lcp-echo-adaptive"
+-- 
+2.7.4
+
--- a/patches-siflower-18.x/0306-fix-icmp_send-stack-overflow.patch
+++ b/patches-siflower-18.x/0306-fix-icmp_send-stack-overflow.patch
@ -0,0 +1,270 @@
+From 48e82d6c2d90fa6838e5d9e0d078488935335749 Mon Sep 17 00:00:00 2001
+From: "GL.iNet-Xinfa.Deng" <xinfa.deng@gl-inet.com>
+Date: Thu, 14 Oct 2021 14:59:32 +0800
+Subject: [PATCH] fix: icmp_send stack overflow
+
+---
+ linux-4.14.90-dev/linux-4.14.90/net/ipv4/icmp.c | 168 +++++++++++++++---------
+ 1 file changed, 103 insertions(+), 65 deletions(-)
+
+diff --git a/linux-4.14.90-dev/linux-4.14.90/net/ipv4/icmp.c b/linux-4.14.90-dev/linux-4.14.90/net/ipv4/icmp.c
+index 3c1570d..8217950 100644
+--- a/linux-4.14.90-dev/linux-4.14.90/net/ipv4/icmp.c
+++ b/linux-4.14.90-dev/linux-4.14.90/net/ipv4/icmp.c
+@@ -575,31 +575,37 @@ relookup_failed:
+ 
+ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
+ {
+-	struct iphdr *iph;
+-	int room;
+-	struct icmp_bxm icmp_param;
+-	struct rtable *rt = skb_rtable(skb_in);
+-	struct ipcm_cookie ipc;
+-	struct flowi4 fl4;
+-	__be32 saddr;
+-	u8  tos;
+-	u32 mark;
+-	struct net *net;
+-	struct sock *sk;
+-
+-	if (!rt)
+	struct iphdr *iph[2] = {0, 0xa5a5a5a5};
+	int room[2] = {0, 0xa5a5a5a5};
+	struct icmp_bxm icmp_param[2];
+	struct rtable *rt[2] = {0, 0xa5a5a5a5};
+	struct ipcm_cookie ipc[2];
+	struct flowi4 fl4[2];
+	__be32 saddr[2] = {0, 0xa5a5a5a5};
+	u8  tos[2] = {0, 0xa5a5a5a5};
+	u32 mark[2] = {0, 0xa5a5a5a5};
+	struct net *net[2] = {0, 0xa5a5a5a5};
+	struct sock *sk[2] = {0, 0xa5a5a5a5};
+	u32 reddata = 0xa5a5a5a5;
+	u8 redflag;
+	memset(&icmp_param[1], 0xa5, sizeof(struct icmp_bxm));
+	memset(&ipc[1], 0xa5, sizeof(struct ipcm_cookie));
+	memset(&fl4[1], 0xa5, sizeof(struct flowi4));
+
+	rt[0]= skb_rtable(skb_in);
+	if (!rt[0])
+ 		goto out;
+-	net = dev_net(rt->dst.dev);
+	net[0] = dev_net(rt[0]->dst.dev);
+ 
+ 	/*
+ 	 *	Find the original header. It is expected to be valid, of course.
+ 	 *	Check this, icmp_send is called from the most obscure devices
+ 	 *	sometimes.
+ 	 */
+-	iph = ip_hdr(skb_in);
+	iph[0] = ip_hdr(skb_in);
+ 
+-	if ((u8 *)iph < skb_in->head ||
+-	    (skb_network_header(skb_in) + sizeof(*iph)) >
+	if ((u8 *)iph[0] < skb_in->head ||
+	    (skb_network_header(skb_in) + sizeof(*iph[0])) >
+ 	    skb_tail_pointer(skb_in))
+ 		goto out;
+ 
+@@ -612,14 +618,14 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
+ 	/*
+ 	 *	Now check at the protocol level
+ 	 */
+-	if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))
+	if (rt[0]->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))
+ 		goto out;
+ 
+ 	/*
+ 	 *	Only reply to fragment 0. We byte re-order the constant
+ 	 *	mask for efficiency.
+ 	 */
+-	if (iph->frag_off & htons(IP_OFFSET))
+	if (iph[0]->frag_off & htons(IP_OFFSET))
+ 		goto out;
+ 
+ 	/*
+@@ -630,12 +636,12 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
+ 		 *	We are an error, check if we are replying to an
+ 		 *	ICMP error
+ 		 */
+-		if (iph->protocol == IPPROTO_ICMP) {
+		if (iph[0]->protocol == IPPROTO_ICMP) {
+ 			u8 _inner_type, *itp;
+ 
+ 			itp = skb_header_pointer(skb_in,
+ 						 skb_network_header(skb_in) +
+-						 (iph->ihl << 2) +
+						 (iph[0]->ihl << 2) +
+ 						 offsetof(struct icmphdr,
+ 							  type) -
+ 						 skb_in->data,
+@@ -662,39 +668,39 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
+ 	 * loopback, then peer ratelimit still work (in icmpv4_xrlim_allow)
+ 	 */
+ 	if (!(skb_in->dev && (skb_in->dev->flags&IFF_LOOPBACK)) &&
+-	      !icmpv4_global_allow(net, type, code))
+	      !icmpv4_global_allow(net[0], type, code))
+ 		goto out_bh_enable;
+ 
+-	sk = icmp_xmit_lock(net);
+-	if (!sk)
+	sk[0] = icmp_xmit_lock(net[0]);
+	if (!sk[0])
+ 		goto out_bh_enable;
+ 
+ 	/*
+ 	 *	Construct source address and options.
+ 	 */
+ 
+-	saddr = iph->daddr;
+-	if (!(rt->rt_flags & RTCF_LOCAL)) {
+	saddr[0] = iph[0]->daddr;
+	if (!(rt[0]->rt_flags & RTCF_LOCAL)) {
+ 		struct net_device *dev = NULL;
+ 
+ 		rcu_read_lock();
+-		if (rt_is_input_route(rt) &&
+-		    net->ipv4.sysctl_icmp_errors_use_inbound_ifaddr)
+-			dev = dev_get_by_index_rcu(net, inet_iif(skb_in));
+		if (rt_is_input_route(rt[0]) &&
+		    net[0]->ipv4.sysctl_icmp_errors_use_inbound_ifaddr)
+			dev = dev_get_by_index_rcu(net[0], inet_iif(skb_in));
+ 
+ 		if (dev)
+-			saddr = inet_select_addr(dev, 0, RT_SCOPE_LINK);
+			saddr[0] = inet_select_addr(dev, 0, RT_SCOPE_LINK);
+ 		else
+-			saddr = 0;
+			saddr[0] = 0;
+ 		rcu_read_unlock();
+ 	}
+ 
+-	tos = icmp_pointers[type].error ? ((iph->tos & IPTOS_TOS_MASK) |
+	tos[0] = icmp_pointers[type].error ? ((iph[0]->tos & IPTOS_TOS_MASK) |
+ 					   IPTOS_PREC_INTERNETCONTROL) :
+-					  iph->tos;
+-	mark = IP4_REPLY_MARK(net, skb_in->mark);
+					  iph[0]->tos;
+	mark[0] = IP4_REPLY_MARK(net[0], skb_in->mark);
+ 
+-	if (ip_options_echo(net, &icmp_param.replyopts.opt.opt, skb_in))
+	if (ip_options_echo(net[0], &icmp_param[0].replyopts.opt.opt, skb_in))
+ 		goto out_unlock;
+ 
+ 
+@@ -702,50 +708,82 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
+ 	 *	Prepare data for ICMP header.
+ 	 */
+ 
+-	icmp_param.data.icmph.type	 = type;
+-	icmp_param.data.icmph.code	 = code;
+-	icmp_param.data.icmph.un.gateway = info;
+-	icmp_param.data.icmph.checksum	 = 0;
+-	icmp_param.skb	  = skb_in;
+-	icmp_param.offset = skb_network_offset(skb_in);
+-	inet_sk(sk)->tos = tos;
+-	sk->sk_mark = mark;
+-	ipc.addr = iph->saddr;
+-	ipc.opt = &icmp_param.replyopts.opt;
+-	ipc.tx_flags = 0;
+-	ipc.ttl = 0;
+-	ipc.tos = -1;
+-
+-	rt = icmp_route_lookup(net, &fl4, skb_in, iph, saddr, tos, mark,
+-			       type, code, &icmp_param);
+-	if (IS_ERR(rt))
+	icmp_param[0].data.icmph.type	 = type;
+	icmp_param[0].data.icmph.code	 = code;
+	icmp_param[0].data.icmph.un.gateway = info;
+	icmp_param[0].data.icmph.checksum	 = 0;
+	icmp_param[0].skb	  = skb_in;
+	icmp_param[0].offset = skb_network_offset(skb_in);
+	inet_sk(sk[0])->tos = tos[0];
+	sk[0]->sk_mark = mark[0];
+	ipc[0].addr = iph[0]->saddr;
+	ipc[0].opt = &icmp_param[0].replyopts.opt;
+	ipc[0].tx_flags = 0;
+	ipc[0].ttl = 0;
+	ipc[0].tos = -1;
+
+	rt[0] = icmp_route_lookup(net[0], &fl4[0], skb_in, iph[0], saddr[0], tos[0], mark[0],
+			       type, code, &icmp_param[0]);
+	if (IS_ERR(rt[0]))
+ 		goto out_unlock;
+ 
+ 	/* peer icmp_ratelimit */
+-	if (!icmpv4_xrlim_allow(net, rt, &fl4, type, code))
+	if (!icmpv4_xrlim_allow(net[0], rt[0], &fl4[0], type, code))
+ 		goto ende;
+ 
+ 	/* RFC says return as much as we can without exceeding 576 bytes. */
+ 
+-	room = dst_mtu(&rt->dst);
+-	if (room > 576)
+-		room = 576;
+-	room -= sizeof(struct iphdr) + icmp_param.replyopts.opt.opt.optlen;
+-	room -= sizeof(struct icmphdr);
+	room[0] = dst_mtu(&rt[0]->dst);
+	if (room[0] > 576)
+		room[0] = 576;
+	room[0] -= sizeof(struct iphdr) + icmp_param[0].replyopts.opt.opt.optlen;
+	room[0] -= sizeof(struct icmphdr);
+ 
+-	icmp_param.data_len = skb_in->len - icmp_param.offset;
+-	if (icmp_param.data_len > room)
+-		icmp_param.data_len = room;
+-	icmp_param.head_len = sizeof(struct icmphdr);
+	icmp_param[0].data_len = skb_in->len - icmp_param[0].offset;
+	if (icmp_param[0].data_len > room[0])
+		icmp_param[0].data_len = room[0];
+	icmp_param[0].head_len = sizeof(struct icmphdr);
+ 
+-	icmp_push_reply(&icmp_param, &fl4, &ipc, &rt);
+	icmp_push_reply(&icmp_param[0], &fl4[0], &ipc[0], &rt[0]);
+ ende:
+-	ip_rt_put(rt);
+	ip_rt_put(rt[0]);
+ out_unlock:
+-	icmp_xmit_unlock(sk);
+	icmp_xmit_unlock(sk[0]);
+ out_bh_enable:
+ 	local_bh_enable();
+ out:;
+	if (    ((u32)iph[1]	!= 0xa5a5a5a5) ||
+		((u32)room[1]	!= 0xa5a5a5a5) ||
+		(memcmp(&icmp_param[1], &reddata, 4)) ||
+		(memcmp(&ipc[1], &reddata, 4)) ||
+		(memcmp(&fl4[1], &reddata, 4)) ||
+		((u32)rt[1]	!= 0xa5a5a5a5) ||
+		((u32)saddr[1]	!= 0xa5a5a5a5) ||
+		((u8 )tos[1]	!= 0xa5) ||
+		((u32)mark[1]	!= 0xa5a5a5a5) ||
+		((u32)net[1]	!= 0xa5a5a5a5) ||
+		((u32)sk[1]	!= 0xa5a5a5a5)) {
+		/*
+		int i;
+		unsigned long sp;
+		__asm__ __volatile__("move %0, $sp" : "=r" (sp));
+		*/
+		printk(KERN_ERR "###ERROR<%s>: Detect stack overflow:\n", __func__);
+		printk(KERN_ERR "iph[1] = %#x", (u32)iph[1]);
+		printk(KERN_ERR "room[1] = %#x",(u32)room[1]);
+		printk(KERN_ERR "rt[1] = %#x", (u32)rt[1]);
+		printk(KERN_ERR "saddr[1] = %#x", (u32)saddr[1]);
+		printk(KERN_ERR "tos[1] = %#x", (u8 )tos[1]);
+		printk(KERN_ERR "mark[1] = %#x", (u32)mark[1]);
+		printk(KERN_ERR "net[1] = %#x", (u32)net[1]);
+		printk(KERN_ERR "sk[1] = %#x", (u32)sk[1]);
+		memcpy(&reddata, &icmp_param[1], 4);
+		printk(KERN_ERR "icmp_param[1] = %#x", reddata);
+		memcpy(&reddata, &ipc[1], 4);
+		printk(KERN_ERR "ipc[1] = %#x", reddata);
+		memcpy(&reddata, &fl4[1], 4);
+		printk(KERN_ERR "fl4[1] = %#x", reddata);
+	}
+ }
+ EXPORT_SYMBOL(icmp_send);
+ 
+-- 
+2.7.4
+
--- a/patches-siflower-18.x/9001-add-support-GL.iNET-SFT1200-target.patch
+++ b/patches-siflower-18.x/9001-add-support-GL.iNET-SFT1200-target.patch
@ -266,7 +266,7 @@ index 0000000..0edb125
 +    ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 +	ucidef_set_interface_guest guest
 +    ucidef_add_switch "switch0" \
-+        "1:lan:1" "2:lan:1" "3:lan:1" "0:wan:2" "5t@eth0:2"
+        "1:lan:1" "2:lan:1" "0:wan:2" "5t@eth0:2"
 +	ucidef_add_switch_port "switch0" "port:5" "pvid:2"
 +}
 +
--- a/profiles/target_siflower_gl-sf1200.yml
+++ b/profiles/target_siflower_gl-sf1200.yml
@ -244,6 +244,7 @@ diffconfig: |
  CONFIG_BUSYBOX_DEFAULT_TEST1=y
  CONFIG_BUSYBOX_DEFAULT_TEST2=y
  CONFIG_BUSYBOX_DEFAULT_FEATURE_TEST_64=y
+  CONFIG_BUSYBOX_DEFAULT_TIMEOUT=y
  CONFIG_BUSYBOX_DEFAULT_TOUCH=y
  CONFIG_BUSYBOX_DEFAULT_FEATURE_TOUCH_SUSV3=y
  CONFIG_BUSYBOX_DEFAULT_TR=y
@ -528,6 +529,7 @@ diffconfig: |
  CONFIG_BUSYBOX_CONFIG_SEQ=y
  CONFIG_BUSYBOX_CONFIG_SLEEP=y
  CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
  CONFIG_BUSYBOX_CONFIG_SORT=y
  CONFIG_BUSYBOX_CONFIG_SYNC=y
  CONFIG_BUSYBOX_CONFIG_TAIL=y
@ -538,6 +540,7 @@ diffconfig: |
  CONFIG_BUSYBOX_CONFIG_TEST1=y
  CONFIG_BUSYBOX_CONFIG_TEST2=y
  CONFIG_BUSYBOX_CONFIG_FEATURE_TEST_64=y
+  CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
  CONFIG_BUSYBOX_CONFIG_TOUCH=y
  CONFIG_BUSYBOX_CONFIG_FEATURE_TOUCH_SUSV3=y
  CONFIG_BUSYBOX_CONFIG_TR=y
--- a/profiles/target_siflower_gl-sft1200.yml
+++ b/profiles/target_siflower_gl-sft1200.yml
@ -248,6 +248,7 @@ diffconfig: |
  CONFIG_BUSYBOX_DEFAULT_TEST1=y
  CONFIG_BUSYBOX_DEFAULT_TEST2=y
  CONFIG_BUSYBOX_DEFAULT_FEATURE_TEST_64=y
+  CONFIG_BUSYBOX_DEFAULT_TIMEOUT=y
  CONFIG_BUSYBOX_DEFAULT_TOUCH=y
  CONFIG_BUSYBOX_DEFAULT_FEATURE_TOUCH_SUSV3=y
  CONFIG_BUSYBOX_DEFAULT_TR=y
@ -532,6 +533,7 @@ diffconfig: |
  CONFIG_BUSYBOX_CONFIG_SEQ=y
  CONFIG_BUSYBOX_CONFIG_SLEEP=y
  CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
  CONFIG_BUSYBOX_CONFIG_SORT=y
  CONFIG_BUSYBOX_CONFIG_SYNC=y
  CONFIG_BUSYBOX_CONFIG_TAIL=y
@ -542,6 +544,7 @@ diffconfig: |
  CONFIG_BUSYBOX_CONFIG_TEST1=y
  CONFIG_BUSYBOX_CONFIG_TEST2=y
  CONFIG_BUSYBOX_CONFIG_FEATURE_TEST_64=y
+  CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
  CONFIG_BUSYBOX_CONFIG_TOUCH=y
  CONFIG_BUSYBOX_CONFIG_FEATURE_TOUCH_SUSV3=y
  CONFIG_BUSYBOX_CONFIG_TR=y
--- a/setup.py
+++ b/setup.py
@ -117,6 +117,20 @@ def setup_tree():
    finally:
        os.chdir(base_dir)

+def remove_feeds():
+    try:
+        print("### Remove feeds")
+        os.chdir(openwrt)
+        if Path("feeds").exists():
+            os.system('rm feeds -fr')
+        if Path("package/feeds").exists():
+            os.system('rm package/feeds -fr')
+        print("### Remove feeds done")
+    except:
+        print("### Remove feeds failed")
+        sys.exit(1)
+    finally:
+        os.chdir(base_dir)

 base_dir = Path.cwd().absolute()
 config = "config-19.x.yml"
@ -157,3 +171,6 @@ clone_tree()
 # pull_tree()
 reset_tree()
 setup_tree()
+
+if git_clone_dir == "openwrt-18.06/siflower":
+    remove_feeds()