SW/openwrt
2
0
Fork 0
forked from Ivasoft/openwrt
Code Pull Requests Activity

treewide: use only board_name function to get name

Browse Source 
Do not parse /tmp/sysinfo/board_name, /proc/cpuinfo or the device tree
compatible string directly. Always use the board_name function to get
the board name.

The admswconfig package still reads /proc/cpuinfo directly. The code
looks somehow broken and the whole adm5120 which uses this package
looks unmaintained. Leave it as it is for now.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin
2017-07-09 13:00:36 +02:00
parent e0b9ec8e96
commit e4e984f2a0
20 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
View File

@@ -51,7 +51,7 @@ merakinand_copy_caldata() {
local cal_src=$1
local cal_dst=$2
local ubidev="$(nand_find_ubi $CI_UBIPART)"
local board_name="$(cat /tmp/sysinfo/board_name)"
local board_name="$(board_name)"
local rootfs_size="$(ubinfo /dev/ubi0 -N rootfs_data | grep "Size" | awk '{ print $6 }')"
# Setup partitions using board name, in case of future platforms
@@ -143,7 +143,7 @@ merakinand_do_platform_check() {
merakinand_do_upgrade() {
local tar_file="$1"
local board_name="$(cat /tmp/sysinfo/board_name)"
local board_name="$(board_name)"
# Do we need to do any platform tweaks?
case "$board_name" in