Author: nbd Date: 2016-01-30 00:19:41 +0100 (Sat, 30 Jan 2016) New Revision: 48558
Added: trunk/target/linux/octeon/base-files/lib/preinit/20_sysinfo Removed: trunk/target/linux/octeon/base-files/lib/functions/ Modified: trunk/target/linux/octeon/base-files/etc/board.d/01_network trunk/target/linux/octeon/base-files/lib/preinit/79_move_config trunk/target/linux/octeon/base-files/lib/upgrade/platform.sh Log: octeon: get rid of /lib/functions/octeon.sh hackery, use sysinfo directly Fixes sysupgrade Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/target/linux/octeon/base-files/etc/board.d/01_network =================================================================== --- trunk/target/linux/octeon/base-files/etc/board.d/01_network 2016-01-29 23:19:36 UTC (rev 48557) +++ trunk/target/linux/octeon/base-files/etc/board.d/01_network 2016-01-29 23:19:41 UTC (rev 48558) @@ -4,13 +4,10 @@ # . /lib/functions/uci-defaults.sh -. /lib/functions/octeon.sh board_config_update -board=$(octeon_board_name) - -case "$board" in +case "$(cat /tmp/sysinfo/board_name)" in erlite) ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; Added: trunk/target/linux/octeon/base-files/lib/preinit/20_sysinfo =================================================================== --- trunk/target/linux/octeon/base-files/lib/preinit/20_sysinfo (rev 0) +++ trunk/target/linux/octeon/base-files/lib/preinit/20_sysinfo 2016-01-29 23:19:41 UTC (rev 48558) @@ -0,0 +1,31 @@ +do_sysinfo_octeon() { + local machine + local name + + machine=$(grep "^system type" /proc/cpuinfo | sed "s/system type.*: \(.*\)/\1/g") + + case "$machine" in + "UBNT_E100"*) + name="erlite" + ;; + + "UBNT_E200"*) + name="er" + ;; + + "UBNT_E220"*) + name="erpro" + ;; + + *) + name="generic" + ;; + esac + + [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" + + echo "$name" > /tmp/sysinfo/board_name + echo "$machine" > /tmp/sysinfo/model +} + +boot_hook_add preinit_main do_sysinfo_octeon Modified: trunk/target/linux/octeon/base-files/lib/preinit/79_move_config =================================================================== --- trunk/target/linux/octeon/base-files/lib/preinit/79_move_config 2016-01-29 23:19:36 UTC (rev 48557) +++ trunk/target/linux/octeon/base-files/lib/preinit/79_move_config 2016-01-29 23:19:41 UTC (rev 48558) @@ -2,11 +2,7 @@ # Copyright (C) 2014 OpenWrt.org move_config() { - . /lib/functions/octeon.sh - - local board="$(octeon_board_name)" - - case "$board" in + case "$(cat /tmp/sysinfo/board_name)" in erlite) mount -t vfat /dev/sda1 /mnt mv -f /mnt/sysupgrade.tgz / Modified: trunk/target/linux/octeon/base-files/lib/upgrade/platform.sh =================================================================== --- trunk/target/linux/octeon/base-files/lib/upgrade/platform.sh 2016-01-29 23:19:36 UTC (rev 48557) +++ trunk/target/linux/octeon/base-files/lib/upgrade/platform.sh 2016-01-29 23:19:41 UTC (rev 48558) @@ -2,8 +2,6 @@ # Copyright (C) 2014 OpenWrt.org # -. /lib/functions/octeon.sh - platform_get_rootfs() { local rootfsdev @@ -24,7 +22,7 @@ } platform_copy_config() { - local board="$(octeon_board_name)" + local board="$(cat /tmp/sysinfo/board_name)" case "$board" in erlite) @@ -60,7 +58,7 @@ platform_do_upgrade() { local tar_file="$1" - local board=$(octeon_board_name) + local board=$(cat /tmp/sysinfo/board_name) local rootfs="$(platform_get_rootfs)" local kernel= @@ -83,7 +81,7 @@ } platform_check_image() { - local board=$(octeon_board_name) + local board=$(cat /tmp/sysinfo/board_name) case "$board" in erlite | \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
