diff mbox

[OpenWrt-Devel] oxnas: fix the incorrect board names which cause sysupgradefailed

Message ID CABcWh6ZToDihjQf7WLVUxvx76T_pJ7tPqmMfAH1+c7WOB2rLPA@mail.gmail.com
State Changes Requested
Headers show

Commit Message

Shonn Lu Nov. 7, 2015, 3:58 p.m. UTC
This patch fix the incorrect board name which cause sysupgrade failed.
The CONTROL file in xxx-squashfs-sysupgrade.tar says BOARD=pogoplug-pro,
instead of pogoplugpro. A few days ago I submitted this patch failed
because of the email re-formatted. Let me try gmail once more because I
really accustomed to using the command line.

Signed-off-by:  Shonn Lu <openwrtfan@gmail.com>
---

Comments

Felix Fietkau Nov. 7, 2015, 4:13 p.m. UTC | #1
On 2015-11-07 16:58, Shonn Lu wrote:
> This patch fix the incorrect board name which cause sysupgrade failed.
> The CONTROL file in xxx-squashfs-sysupgrade.tar says BOARD=pogoplug-pro,
> instead of pogoplugpro. A few days ago I submitted this patch failed
> because of the email re-formatted. Let me try gmail once more because I
> really accustomed to using the command line.
> 
> Signed-off-by:  Shonn Lu <openwrtfan@gmail.com>
It's still broken. Please send emails to yourself for testing before you
send them to the list. You really should use git send-email, that way
you can easily avoid all your email client issues.

- Felix
diff mbox

Patch

diff --git a/target/linux/oxnas/base-files/etc/board.d/01_leds
b/target/linux/oxnas/base-files/etc/board.d/01_leds
index 17e37cd..f075764 100755
--- a/target/linux/oxnas/base-files/etc/board.d/01_leds
+++ b/target/linux/oxnas/base-files/etc/board.d/01_leds
@@ -14,7 +14,7 @@  case $board in
  kd20)
  ucidef_set_led_default "power" "power" "kd20:blue:status" "1"
  ;;
- pogoplugpro | pogoplugv3)
+ pogoplug-pro | pogoplug-v3)
  ucidef_set_led_default "power" "power" "pogoplug:blue:internal" "1"
  ;;

diff --git a/target/linux/oxnas/base-files/etc/diag.sh
b/target/linux/oxnas/base-files/etc/diag.sh
index 5370696..8f484ae 100644
--- a/target/linux/oxnas/base-files/etc/diag.sh
+++ b/target/linux/oxnas/base-files/etc/diag.sh
@@ -6,13 +6,13 @@ 

 get_status_led() {
  case $(oxnas_board_name) in
- stg212)
+ stg-212)
  status_led="zyxel:blue:status"
  ;;
  kd20)
  status_led="kd20:blue:status"
  ;;
- pogoplugpro | pogoplugv3)
+ pogoplug-pro | pogoplug-v3)
  status_led="pogoplug:blue:internal"
  ;;
  esac
diff --git a/target/linux/oxnas/base-files/lib/oxnas.sh
b/target/linux/oxnas/base-files/lib/oxnas.sh
index 1a04d55..2a07928 100755
--- a/target/linux/oxnas/base-files/lib/oxnas.sh
+++ b/target/linux/oxnas/base-files/lib/oxnas.sh
@@ -14,16 +14,16 @@  oxnas_board_detect() {

  case "$machine" in
  *"MitraStar Technology Corp. STG-212"*)
- name="stg212"
+ name="stg-212"
  ;;
  *"Shuttle KD20"*)
  name="kd20"
  ;;
  *"Pogoplug Pro"*)
- name="pogoplugpro"
+ name="pogoplug-pro"
  ;;
  *"Pogoplug V3"*)
- name="pogoplugv3"
+ name="pogoplug-v3"
  ;;
  esac