aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-04-07 18:09:08 +0200
committerMathias Kresin <dev@kresin.me>2017-07-15 23:13:34 +0200
commitac3e05c5d757334944fbf1f14583164cd1d69172 (patch)
tree3eb292a1b367affc29977ff0f2b59801ab3fdf28
parentc7f8bcede6be73d0c07e058d57b55e4efc746440 (diff)
downloadupstream-ac3e05c5d757334944fbf1f14583164cd1d69172.tar.gz
upstream-ac3e05c5d757334944fbf1f14583164cd1d69172.tar.bz2
upstream-ac3e05c5d757334944fbf1f14583164cd1d69172.zip
treewide: populate boardname and model earlier
For targets using the generic board detection and board specific settings in diag.sh, the board name is still unset at the time the set_state() provided by diag.sh is called by 10_indicate_preinit. Change the execution order to ensure the boardname is populated before required the first time. Do the target specific board detection as early as possible, directly followed by the generic one to allow a seamless switch to the generic function for populating /tmp/sysinfo/. Signed-off-by: Mathias Kresin <dev@kresin.me>
-rw-r--r--package/base-files/files/lib/preinit/02_sysinfo (renamed from package/base-files/files/lib/preinit/10_sysinfo)0
-rw-r--r--target/linux/adm5120/base-files/lib/preinit/01_preinit_do_adm5120.sh (renamed from target/linux/adm5120/base-files/lib/preinit/05_preinit_do_adm5120.sh)0
-rw-r--r--target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh (renamed from target/linux/apm821xx/base-files/lib/preinit/03_preinit_do_apm821xx.sh)0
-rw-r--r--target/linux/ar71xx/base-files/lib/preinit/01_preinit_do_ar71xx.sh (renamed from target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh)0
-rw-r--r--target/linux/at91/base-files/lib/preinit/01_preinit_do_at91.sh (renamed from target/linux/at91/base-files/lib/preinit/03_preinit_do_at91.sh)0
-rw-r--r--target/linux/brcm2708/base-files/lib/preinit/01_preinit_do_brcm2708.sh (renamed from target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh)0
-rw-r--r--target/linux/brcm63xx/base-files/lib/preinit/01_do_brcm63xx.sh (renamed from target/linux/brcm63xx/base-files/lib/preinit/03_do_brcm63xx.sh)0
-rw-r--r--target/linux/ipq806x/base-files/lib/preinit/01_preinit_do_ipq806x.sh (renamed from target/linux/ipq806x/base-files/lib/preinit/03_preinit_do_ipq806x.sh)0
-rwxr-xr-xtarget/linux/lantiq/base-files/lib/preinit/01_preinit_board.sh (renamed from target/linux/lantiq/base-files/lib/preinit/03_preinit_board.sh)0
-rwxr-xr-xtarget/linux/mcs814x/base-files/lib/preinit/01_preinit_do_mcs814x.sh (renamed from target/linux/mcs814x/base-files/lib/preinit/03_preinit_do_mcs814x.sh)0
-rw-r--r--target/linux/mpc85xx/base-files/lib/preinit/01_preinit_do_mpc85xx.sh (renamed from target/linux/mpc85xx/base-files/lib/preinit/03_preinit_do_mpc85xx.sh)0
-rw-r--r--target/linux/mxs/base-files/lib/preinit/01_preinit_do_mxs.sh (renamed from target/linux/mxs/base-files/lib/preinit/03_preinit_do_mxs.sh)0
-rw-r--r--target/linux/octeon/base-files/lib/preinit/01_sysinfo (renamed from target/linux/octeon/base-files/lib/preinit/20_sysinfo)0
-rw-r--r--target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh (renamed from target/linux/oxnas/base-files/lib/preinit/03_preinit_do_oxnas.sh)0
-rw-r--r--target/linux/ramips/base-files/lib/preinit/01_preinit_do_ramips.sh (renamed from target/linux/ramips/base-files/lib/preinit/03_preinit_do_ramips.sh)0
-rw-r--r--target/linux/rb532/base-files/lib/preinit/01_sysinfo (renamed from target/linux/rb532/base-files/lib/preinit/10_sysinfo)0
-rw-r--r--target/linux/x86/base-files/lib/preinit/01_sysinfo (renamed from target/linux/x86/base-files/lib/preinit/20_sysinfo)0
17 files changed, 0 insertions, 0 deletions
diff --git a/package/base-files/files/lib/preinit/10_sysinfo b/package/base-files/files/lib/preinit/02_sysinfo
index 65b50968e2..65b50968e2 100644
--- a/package/base-files/files/lib/preinit/10_sysinfo
+++ b/package/base-files/files/lib/preinit/02_sysinfo
diff --git a/target/linux/adm5120/base-files/lib/preinit/05_preinit_do_adm5120.sh b/target/linux/adm5120/base-files/lib/preinit/01_preinit_do_adm5120.sh
index 4fca1e71b2..4fca1e71b2 100644
--- a/target/linux/adm5120/base-files/lib/preinit/05_preinit_do_adm5120.sh
+++ b/target/linux/adm5120/base-files/lib/preinit/01_preinit_do_adm5120.sh
diff --git a/target/linux/apm821xx/base-files/lib/preinit/03_preinit_do_apm821xx.sh b/target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh
index 5675357533..5675357533 100644
--- a/target/linux/apm821xx/base-files/lib/preinit/03_preinit_do_apm821xx.sh
+++ b/target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh
diff --git a/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh b/target/linux/ar71xx/base-files/lib/preinit/01_preinit_do_ar71xx.sh
index ff5407a0d4..ff5407a0d4 100644
--- a/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/preinit/01_preinit_do_ar71xx.sh
diff --git a/target/linux/at91/base-files/lib/preinit/03_preinit_do_at91.sh b/target/linux/at91/base-files/lib/preinit/01_preinit_do_at91.sh
index 5c981016a4..5c981016a4 100644
--- a/target/linux/at91/base-files/lib/preinit/03_preinit_do_at91.sh
+++ b/target/linux/at91/base-files/lib/preinit/01_preinit_do_at91.sh
diff --git a/target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh b/target/linux/brcm2708/base-files/lib/preinit/01_preinit_do_brcm2708.sh
index 294364848d..294364848d 100644
--- a/target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh
+++ b/target/linux/brcm2708/base-files/lib/preinit/01_preinit_do_brcm2708.sh
diff --git a/target/linux/brcm63xx/base-files/lib/preinit/03_do_brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/preinit/01_do_brcm63xx.sh
index 4179695024..4179695024 100644
--- a/target/linux/brcm63xx/base-files/lib/preinit/03_do_brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/preinit/01_do_brcm63xx.sh
diff --git a/target/linux/ipq806x/base-files/lib/preinit/03_preinit_do_ipq806x.sh b/target/linux/ipq806x/base-files/lib/preinit/01_preinit_do_ipq806x.sh
index 785f1ebb8b..785f1ebb8b 100644
--- a/target/linux/ipq806x/base-files/lib/preinit/03_preinit_do_ipq806x.sh
+++ b/target/linux/ipq806x/base-files/lib/preinit/01_preinit_do_ipq806x.sh
diff --git a/target/linux/lantiq/base-files/lib/preinit/03_preinit_board.sh b/target/linux/lantiq/base-files/lib/preinit/01_preinit_board.sh
index aef946036e..aef946036e 100755
--- a/target/linux/lantiq/base-files/lib/preinit/03_preinit_board.sh
+++ b/target/linux/lantiq/base-files/lib/preinit/01_preinit_board.sh
diff --git a/target/linux/mcs814x/base-files/lib/preinit/03_preinit_do_mcs814x.sh b/target/linux/mcs814x/base-files/lib/preinit/01_preinit_do_mcs814x.sh
index d509770c55..d509770c55 100755
--- a/target/linux/mcs814x/base-files/lib/preinit/03_preinit_do_mcs814x.sh
+++ b/target/linux/mcs814x/base-files/lib/preinit/01_preinit_do_mcs814x.sh
diff --git a/target/linux/mpc85xx/base-files/lib/preinit/03_preinit_do_mpc85xx.sh b/target/linux/mpc85xx/base-files/lib/preinit/01_preinit_do_mpc85xx.sh
index 88ba608379..88ba608379 100644
--- a/target/linux/mpc85xx/base-files/lib/preinit/03_preinit_do_mpc85xx.sh
+++ b/target/linux/mpc85xx/base-files/lib/preinit/01_preinit_do_mpc85xx.sh
diff --git a/target/linux/mxs/base-files/lib/preinit/03_preinit_do_mxs.sh b/target/linux/mxs/base-files/lib/preinit/01_preinit_do_mxs.sh
index 692078d3e2..692078d3e2 100644
--- a/target/linux/mxs/base-files/lib/preinit/03_preinit_do_mxs.sh
+++ b/target/linux/mxs/base-files/lib/preinit/01_preinit_do_mxs.sh
diff --git a/target/linux/octeon/base-files/lib/preinit/20_sysinfo b/target/linux/octeon/base-files/lib/preinit/01_sysinfo
index d8f467ed27..d8f467ed27 100644
--- a/target/linux/octeon/base-files/lib/preinit/20_sysinfo
+++ b/target/linux/octeon/base-files/lib/preinit/01_sysinfo
diff --git a/target/linux/oxnas/base-files/lib/preinit/03_preinit_do_oxnas.sh b/target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh
index ca7bce1054..ca7bce1054 100644
--- a/target/linux/oxnas/base-files/lib/preinit/03_preinit_do_oxnas.sh
+++ b/target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh
diff --git a/target/linux/ramips/base-files/lib/preinit/03_preinit_do_ramips.sh b/target/linux/ramips/base-files/lib/preinit/01_preinit_do_ramips.sh
index 31ef5f8146..31ef5f8146 100644
--- a/target/linux/ramips/base-files/lib/preinit/03_preinit_do_ramips.sh
+++ b/target/linux/ramips/base-files/lib/preinit/01_preinit_do_ramips.sh
diff --git a/target/linux/rb532/base-files/lib/preinit/10_sysinfo b/target/linux/rb532/base-files/lib/preinit/01_sysinfo
index 4c932fde19..4c932fde19 100644
--- a/target/linux/rb532/base-files/lib/preinit/10_sysinfo
+++ b/target/linux/rb532/base-files/lib/preinit/01_sysinfo
diff --git a/target/linux/x86/base-files/lib/preinit/20_sysinfo b/target/linux/x86/base-files/lib/preinit/01_sysinfo
index cb63a04014..cb63a04014 100644
--- a/target/linux/x86/base-files/lib/preinit/20_sysinfo
+++ b/target/linux/x86/base-files/lib/preinit/01_sysinfo