mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

auc: small improvements 

Detect if calling rpc-sys packagelist fails due to the method not
being provided by rpcd.
Mark package as experimental.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2017-11-13 00:39:30 +01:00
parent 95d96a360f
commit 123ddf66ae
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/auc/Makefile
View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=auc PKG_NAME:=auc
PKG_VERSION:=0.0.1 PKG_VERSION:=0.0.2
PKG_RELEASE=1 PKG_RELEASE=1
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
@ -15,7 +15,7 @@ include $(INCLUDE_DIR)/cmake.mk
define Package/auc define Package/auc
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
TITLE:=attended sysupgrade (CLI version) TITLE:=Attended sysUpgrade CLI (EXPERIMENTAL)
DEPENDS:=+attendedsysupgrade-common +libblobmsg-json +libubox +libubus \ DEPENDS:=+attendedsysupgrade-common +libblobmsg-json +libubox +libubus \
+libuci +libuclient +rpcd-mod-rpcsys +libuci +libuclient +rpcd-mod-rpcsys
endef endef

31
utils/auc/src/auc.c
View File

@ -683,17 +683,15 @@ int main(int args, char *argv[]) {
blobmsg_buf_init(&imgbuf); blobmsg_buf_init(&imgbuf);
blobmsg_buf_init(&upgbuf); blobmsg_buf_init(&upgbuf);
if (!ubus_lookup_id(ctx, "system", &id)) { if (ubus_lookup_id(ctx, "system", &id) ||
ubus_invoke(ctx, id, "board", NULL, board_cb, &checkbuf, 3000); ubus_invoke(ctx, id, "board", NULL, board_cb, &checkbuf, 3000)) {
} else {
fprintf(stderr, "cannot request board info from procd\n"); fprintf(stderr, "cannot request board info from procd\n");
rc=-1; rc=-1;
goto freebufs; goto freebufs;
} }
if (!ubus_lookup_id(ctx, "rpc-sys", &id)) { if (ubus_lookup_id(ctx, "rpc-sys", &id) ||
ubus_invoke(ctx, id, "packagelist", NULL, pkglist_cb, &checkbuf, 3000); ubus_invoke(ctx, id, "packagelist", NULL, pkglist_cb, &checkbuf, 3000)) {
} else {
fprintf(stderr, "cannot request packagelist from rpcd\n"); fprintf(stderr, "cannot request packagelist from rpcd\n");
rc=-1; rc=-1;
goto freeboard; goto freeboard;
@ -741,10 +739,7 @@ int main(int args, char *argv[]) {
} }
if (retry || queuepos) { if (retry || queuepos) {
if (imgbuf.buf) blob_buf_free(&imgbuf);
free(imgbuf.buf);
memset(&imgbuf, '\0', sizeof(imgbuf));
blobmsg_buf_init(&imgbuf); blobmsg_buf_init(&imgbuf);
sleep(3); sleep(3);
} }
@ -828,19 +823,11 @@ freeboard:
free(version); free(version);
free(revision); free(revision);
freebufs: freebufs:
if (checkbuf.buf) blob_buf_free(&checkbuf);
free(checkbuf.buf); blob_buf_free(&reqbuf);
blob_buf_free(&imgbuf);
if (reqbuf.buf) blob_buf_free(&upgbuf);
free(reqbuf.buf);
if (imgbuf.buf)
free(imgbuf.buf);
if (upgbuf.buf)
free(upgbuf.buf);
freessl: freessl:
if (ssl_ctx) if (ssl_ctx)