From fc64fd8712ba1cdde56e537906859bb63dad36d4 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 22 Nov 2015 20:52:10 +0000
Subject: [PATCH] Revert "mvebu: migrate led and network setup to board
detection framework"
Roll back the mvebu conversion to board detection code as we need to fix
some strcutural issues first.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 47597
---
.../base-files/etc/{board.d => uci-defaults}/01_leds | 8 +++-----
.../etc/{board.d => uci-defaults}/02_network | 10 ++++++----
2 files changed, 9 insertions(+), 9 deletions(-)
rename target/linux/mvebu/base-files/etc/{board.d => uci-defaults}/01_leds (89%)
mode change 100755 => 100644
rename target/linux/mvebu/base-files/etc/{board.d => uci-defaults}/02_network (86%)
mode change 100755 => 100644
diff --git a/target/linux/mvebu/base-files/etc/board.d/01_leds b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
old mode 100755
new mode 100644
similarity index 89%
rename from target/linux/mvebu/base-files/etc/board.d/01_leds
rename to target/linux/mvebu/base-files/etc/uci-defaults/01_leds
index eb245d85ae9..612f949da4c
--- a/target/linux/mvebu/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
@@ -1,13 +1,11 @@
#!/bin/sh
#
-# Copyright (C) 2014-2015 OpenWrt.org
+# Copyright (C) 2014 OpenWrt.org
#
-. /lib/functions/uci-defaults-new.sh
+. /lib/functions/uci-defaults.sh
. /lib/mvebu.sh
-board_config_update
-
board=$(mvebu_board_name)
case "$board" in
@@ -34,6 +32,6 @@ armada-xp-linksys-mamba)
esac
-board_config_flush
+ucidef_commit_leds
exit 0
diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
old mode 100755
new mode 100644
similarity index 86%
rename from target/linux/mvebu/base-files/etc/board.d/02_network
rename to target/linux/mvebu/base-files/etc/uci-defaults/02_network
index 803a4dc768c..d1da59fb487
--- a/target/linux/mvebu/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
@@ -3,10 +3,12 @@
# Copyright (C) 2014-2015 OpenWrt.org
#
-. /lib/functions/uci-defaults-new.sh
-. /lib/mvebu.sh
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
-board_config_update
+. /lib/functions/uci-defaults.sh
+. /lib/mvebu.sh
ucidef_set_interface_loopback
@@ -39,6 +41,6 @@ armada-xp-gp)
;;
esac
-board_config_flush
+uci commit network
exit 0
--
GitLab