[OpenWrt-Devel] [PATCH] oxnas: fix the incorrect board nameswhich cause sysupgrade failed

[未命名]

I have send this email again using Thunderbird.Thanks for your patiently reply.


Best regards,
Shonn







------------------ Original ------------------
From:  "Daniel Golle";<daniel at makrotopia.org>;
Date:  Fri, Oct 30, 2015 02:22 PM
To:  "未命名"<countrysideboy at qq.com>; 
Cc:  "openwrt-devel"<openwrt-devel at lists.openwrt.org>; 
Subject:  Re: [OpenWrt-Devel] [PATCH] oxnas: fix the incorrect board nameswhich cause sysupgrade failed



Hi!

Yes, that's getting closer, but unfortunately it's still not
applicable.

Apparently the patch got white-space mangled and CR-LF'ed by your MUA.
Try attaching the patches created using
git format-patch --to openwrt-devel at ....
instead, as that will prevent the mail-body from getting recoded or
messed with in any way.
If possible, setup ssmtp and avoid any browser-based or GUI-driven MUAs
but rather use git send-email directly with ssmtp or alike.

Thank you for your efforts! Your submission is highly appreciated!

-snip-snap-snap-snip-snap-snip-snap-snip-snap-snip-snap-snip-snap-

$ git am ...
Applying: oxnas: fix the incorrect board names which cause sysupgrade failed
.git/rebase-apply/patch:11: trailing whitespace.
    pogoplug-pro | pogoplug-v3)
.git/rebase-apply/patch:24: trailing whitespace.
    stg-212)
.git/rebase-apply/patch:31: trailing whitespace.
    pogoplug-pro | pogoplug-v3)
.git/rebase-apply/patch:44: trailing whitespace.
	name="stg-212"
.git/rebase-apply/patch:51: trailing whitespace.
	name="pogoplug-pro"
fatal: corrupt patch at line 58
Patch failed at 0001 oxnas: fix the incorrect board names which cause sysupgrade failed
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
$ patch -p1 --dry-run -i .git/rebase-apply/patch
(Stripping trailing CRs from patch; use --binary to disable.)
checking file target/linux/oxnas/base-files/etc/board.d/01_leds
(Stripping trailing CRs from patch; use --binary to disable.)
checking file target/linux/oxnas/base-files/etc/diag.sh
(Stripping trailing CRs from patch; use --binary to disable.)
checking file target/linux/oxnas/base-files/lib/oxnas.sh
patch: **** malformed patch at line 58: _______________________________________________




Cheers


Daniel



On Fri, Oct 30, 2015 at 01:29:34PM +0800, play4fun 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.
> 
> Signed-off-by:  Shonn Lu <countrysideboy at qq.com>
> ---
> 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

> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20151030/6d1a4369/attachment.htm>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel