domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware-utils: tplink-safeloader: use revision field

Browse Source 
The structured soft-version partition has a field which contains a
(source) revision number. Factory images used to include this, but
it was accidentaly removed during an earlier refactoring.

Include the source revision number again in the generated soft-version
partition. Additionaly, also show this revision number when printing
image info.

Fixes: 1a211af2cb ("firmware-utils: tplink-safeloader: refactor meta-partition generation")
Signed-off-by: Sander Vanheule <sander@svanheule.net>
This commit is contained in:
Sander Vanheule
2021-09-01 21:15:57 +02:00
committed by Hauke Mehrtens
parent 70c75965a9
commit df63619eea
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/firmware-utils/Makefile
View File

@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME := firmware-utils PKG_NAME := firmware-utils
PKG_RELEASE := 9 PKG_RELEASE := 10
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk

2
tools/firmware-utils/src/tplink-safeloader.c
View File

@@ -2722,6 +2722,7 @@ static struct image_partition_entry make_soft_version(
.year_lo = bcd(tm->tm_year%100), .year_lo = bcd(tm->tm_year%100),
.month = bcd(tm->tm_mon+1), .month = bcd(tm->tm_mon+1),
.day = bcd(tm->tm_mday), .day = bcd(tm->tm_mday),
.rev = htonl(rev),
.compat_level = htonl(info->soft_ver_compat_level) .compat_level = htonl(info->soft_ver_compat_level)
}; };
@@ -3411,6 +3412,7 @@ static int firmware_info(const char *input)
printf("Version: %d.%d.%d\n", s->version_major, s->version_minor, s->version_patch); printf("Version: %d.%d.%d\n", s->version_major, s->version_minor, s->version_patch);
printf("Date: %02x%02x-%02x-%02x\n", s->year_hi, s->year_lo, s->month, s->day); printf("Date: %02x%02x-%02x-%02x\n", s->year_hi, s->year_lo, s->month, s->day);
printf("Revision: %d\n", ntohl(s->rev));
} else { } else {
printf("Failed to parse data\n"); printf("Failed to parse data\n");
} }