From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 4 Nov 2016 10:35:43 +0000 (+0100)
Subject: phase1: remove package/feeds before installing feeds
X-Git-Tag: v1~247
X-Git-Url: http://git.openwrt.org/?p=buildbot.git;a=commitdiff_plain;h=1ae69f14fbd49ff2a62b59d7aaab9a21dd981907

phase1: remove package/feeds before installing feeds

This removal step is needed to get rid of dangling symlinks and to ensure
that core package overrides are effective.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 6d6bb70..5eb70f4 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -285,6 +285,12 @@ for target in targets:
 #		description = "Copy the feeds.conf",
 #		command='''cp ~/feeds.conf ./feeds.conf''' ))
 
+	# feed
+	factory.addStep(ShellCommand(
+		name = "rmfeedlinks",
+		description = "Remove feed symlinks",
+		command=["rm", "-rf", "package/feeds/"]))
+
 	# feed
 	factory.addStep(ShellCommand(
 		name = "updatefeeds",