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

Submitted by txt.file on April 5, 2017, 9:44 p.m.

Details

Message ID 1491428646-20936-1-git-send-email-txt.file@txtfile.eu
State Changes Requested
Headers show

Commit Message

txt.file April 5, 2017, 9:44 p.m.
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@txtfile.eu>
---
 target/linux/ar71xx/image/ubnt.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Felix Fietkau April 26, 2017, 8:36 a.m.
On 2017-04-05 23:44, Matthias Fritzsche wrote:
> 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@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 b203d6a..056dced 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).v0.0.0-$(VERSION_DIST)-$(REVISION) \
The Ubiquiti firmware web interface parses the version number, right?
Did you do any tests to check how it reacts to the 0.0.0 version number?

- Felix
txt.file May 2, 2017, 8:18 a.m.
Not yet. Is now on my TODO for this week.

txt.file

Felix Fietkau:
> On 2017-04-05 23:44, Matthias Fritzsche wrote:
>> 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@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 b203d6a..056dced 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).v0.0.0-$(VERSION_DIST)-$(REVISION) \
> The Ubiquiti firmware web interface parses the version number, right?
> Did you do any tests to check how it reacts to the 0.0.0 version number?
> 
> - Felix
> 
>
Felix Fietkau May 2, 2017, 12:54 p.m.
On 2017-05-02 10:18, txt.file wrote:
> Felix Fietkau:
>>> -		-B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \
>>> +		-B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v0.0.0-$(VERSION_DIST)-$(REVISION) \
>> The Ubiquiti firmware web interface parses the version number, right?
>> Did you do any tests to check how it reacts to the 0.0.0 version number?
> Not yet. Is now on my TODO for this week.
> 
> txt.file
I thought about this some more. Even if it works, I'd prefer changing
the version to match a recent AirOS version. The 0.0.0 just looks weird.
Also, the version should probably be changed in a separate commit.

- Felix
txt.file May 17, 2017, 3:50 a.m.
I have changed the patch to only change the version name. Ubiquiti is
currently at AirMAX firmware version 6.0.4. So version 6.0.0 for us is
IMHO a good/current version number.

I also checked if 0.0.0 would have worked. It resulted in an error on
the device I had.


txt.file
--
This message is signed.

Felix Fietkau:
> On 2017-05-02 10:18, txt.file wrote:
>> Felix Fietkau:
>>>> -		-B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \
>>>> +		-B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v0.0.0-$(VERSION_DIST)-$(REVISION) \
>>> The Ubiquiti firmware web interface parses the version number, right?
>>> Did you do any tests to check how it reacts to the 0.0.0 version number?
>> Not yet. Is now on my TODO for this week.
>>
>> txt.file
> I thought about this some more. Even if it works, I'd prefer changing
> the version to match a recent AirOS version. The 0.0.0 just looks weird.
> Also, the version should probably be changed in a separate commit.
> 
> - Felix
>

Patch hide | download patch | download mbox

diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/ubnt.mk
index b203d6a..056dced 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).v0.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).v0.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).v0.0.0-$(VERSION_DIST)-$(REVISION) \
 		-p jffs2:0x50000:0xf60000:0:0:$@ \
 		-o $@.new
 	@mv $@.new $@