[LEDE-DEV] [PATCH] ar71xx: change image version for ubiquiti devices

[Mathias Kresin]

03.03.2017 16:51, txt.file:
> changes the image version from hardcoded OpenWrt to
> $VERSION_DIST. AirOS shows a notification with the image version
> during a firmware upgrade.
>
> fixes #582
>
> Signed-off-by: Matthias Fritzsche <txt.file at txtfile.eu>
> ---
>  target/linux/ar71xx/image/ubnt.mk | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/ubnt.mk
> index 7a1fc80..c633ca1 100644
> --- a/target/linux/ar71xx/image/ubnt.mk
> +++ b/target/linux/ar71xx/image/ubnt.mk
> @@ -6,7 +6,7 @@
>  # routerboard creates partitions out of the ubnt header
>  define Build/mkubntimage
>         -$(STAGING_DIR_HOST)/bin/mkfwimage \
> -               -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \
> +               -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \
>                 -k $(IMAGE_KERNEL) \
>                 -r $@ \
>                 -o $@
> @@ -19,7 +19,7 @@ define Build/mkubntimage-split
>         dd if=$@ of=$@.old1 bs=1024k count=1; \
>         dd if=$@ of=$@.old2 bs=1024k skip=1; \
>         $(STAGING_DIR_HOST)/bin/mkfwimage \
> -               -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \
> +               -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \
>                 -k $@.old1 \
>                 -r $@.old2 \
>                 -o $@; \
> @@ -28,7 +28,7 @@ endef
>
>  define Build/mkubntimage2
>         -$(STAGING_DIR_HOST)/bin/mkfwimage2 -f 0x9f000000 \
> -               -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \
> +               -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \
>                 -p jffs2:0x50000:0xf60000:0:0:$@ \
>                 -o $@.new
>         @mv $@.new $@
>

Your patch doesn't apply:

wget -q -O- "http://patchwork.ozlabs.org/patch/735156/mbox/" | git am

Applying: ar71xx: change image version for ubiquiti devices
error: patch failed: target/linux/ar71xx/image/ubnt.mk:6
error: target/linux/ar71xx/image/ubnt.mk: patch does not apply
Patch failed at 0001 ar71xx: change image version for ubiquiti devices

Please consider using git send-mail for submissions to prevent all kinds 
of whitespace damages and unexpected linebreaks.

Mathias