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

auc: send revision in update check 

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2019-03-08 00:32:03 +01:00
parent a903808e2c
commit 8945a3f4d5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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.1.3 PKG_VERSION:=0.1.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0

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

@ -13,7 +13,7 @@
*/ */
#define _GNU_SOURCE #define _GNU_SOURCE
#define AUC_VERSION "0.1.3" #define AUC_VERSION "0.1.4"
#include <fcntl.h> #include <fcntl.h>
#include <dlfcn.h> #include <dlfcn.h>
@ -62,7 +62,7 @@ static int output_fd = -1;
static int retry, imagebuilder, building, ibready; static int retry, imagebuilder, building, ibready;
static char *board_name = NULL; static char *board_name = NULL;
static char *target = NULL; static char *target = NULL;
static char *distribution = NULL, *version = NULL; static char *distribution = NULL, *version = NULL, *revision = NULL;
static int uptodate; static int uptodate;
static char *filename = NULL; static char *filename = NULL;
static int rc; static int rc;
@ -93,6 +93,7 @@ static const struct blobmsg_policy board_policy[__BOARD_MAX] = {
enum { enum {
RELEASE_DISTRIBUTION, RELEASE_DISTRIBUTION,
RELEASE_VERSION, RELEASE_VERSION,
RELEASE_REVISION,
RELEASE_TARGET, RELEASE_TARGET,
__RELEASE_MAX, __RELEASE_MAX,
}; };
@ -100,6 +101,7 @@ enum {
static const struct blobmsg_policy release_policy[__RELEASE_MAX] = { static const struct blobmsg_policy release_policy[__RELEASE_MAX] = {
[RELEASE_DISTRIBUTION] = { .name = "distribution", .type = BLOBMSG_TYPE_STRING }, [RELEASE_DISTRIBUTION] = { .name = "distribution", .type = BLOBMSG_TYPE_STRING },
[RELEASE_VERSION] = { .name = "version", .type = BLOBMSG_TYPE_STRING }, [RELEASE_VERSION] = { .name = "version", .type = BLOBMSG_TYPE_STRING },
[RELEASE_REVISION] = { .name = "revision", .type = BLOBMSG_TYPE_STRING },
[RELEASE_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING }, [RELEASE_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
}; };
@ -308,20 +310,24 @@ static void board_cb(struct ubus_request *req, int type, struct blob_attr *msg)
blobmsg_parse(release_policy, __RELEASE_MAX, rel, blobmsg_parse(release_policy, __RELEASE_MAX, rel,
blobmsg_data(tb[BOARD_RELEASE]), blobmsg_data_len(tb[BOARD_RELEASE])); blobmsg_data(tb[BOARD_RELEASE]), blobmsg_data_len(tb[BOARD_RELEASE]));
if (!rel[RELEASE_TARGET]) { if (!rel[RELEASE_TARGET] ||
fprintf(stderr, "No target received\n"); !rel[RELEASE_DISTRIBUTION] ||
!rel[RELEASE_VERSION] ||
!rel[RELEASE_REVISION]) {
fprintf(stderr, "No release information received\n");
rc=-1; rc=-1;
return; return;
} }
target = strdup(blobmsg_get_string(rel[RELEASE_TARGET])); target = strdup(blobmsg_get_string(rel[RELEASE_TARGET]));
distribution = strdup(blobmsg_get_string(rel[RELEASE_DISTRIBUTION])); distribution = strdup(blobmsg_get_string(rel[RELEASE_DISTRIBUTION]));
version = strdup(blobmsg_get_string(rel[RELEASE_VERSION])); version = strdup(blobmsg_get_string(rel[RELEASE_VERSION]));
revision = strdup(blobmsg_get_string(rel[RELEASE_REVISION]));
blobmsg_add_string(buf, "distro", distribution); blobmsg_add_string(buf, "distro", distribution);
blobmsg_add_string(buf, "target", target); blobmsg_add_string(buf, "target", target);
blobmsg_add_string(buf, "version", version); blobmsg_add_string(buf, "version", version);
blobmsg_add_string(buf, "revision", revision);
} }
/* /*