From ccb75178cf6a726896729c6904bd623636aa0b29 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 10 Mar 2021 22:45:51 +0000 Subject: sys: packagelist: drop ABI version from package name Having the ABI version appended to the package name is not very helpful when checking for updated versions of a package online or requesting a new image for the device from an updater service. In both cases, the ABI version could have been bumped meanwhile and that name is then simply not found. Resolve this by removing the appended ABI version in the output of the rpc-sys packagelist call. Signed-off-by: Daniel Golle --- sys.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys.c b/sys.c index fecf66c..69daa1b 100644 --- a/sys.c +++ b/sys.c @@ -228,6 +228,18 @@ procstr: continue; } + /* If there is ABIVersion, remove that suffix */ + if (!strcmp(var, "ABIVersion:")) { + if (strlen(pkg) <= strlen(p1)) + continue; + tmp = &pkg[strlen(pkg) - strlen(p1)]; + if (strncmp(p1, tmp, strlen(p1))) + continue; + + *tmp = '\0'; + continue; + } + if (!strcmp(var, "Version:")) { strncpy(ver, p1, sizeof(ver)); continue; -- cgit v1.2.1