leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkimage: Refactor imagetool_get_source_date to take command name

Browse Source 
So we can use imagetool_get_source_date() from callers who do not have
the image tool params struct, just pass in the command name for the error
message.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Simon Glass <sjg@chromum.org>
This commit is contained in:
Alex Kiernan 2018-06-20 20:10:51 +00:00 committed by Tom Rini
parent 67a2616af1
commit 87925df2b3
4 changed files with 7 additions and 6 deletions

2
tools/default_image.c
View File

@ -100,7 +100,7 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
sizeof(image_header_t)),
sbuf->st_size - sizeof(image_header_t));
time = imagetool_get_source_date(params, sbuf->st_mtime);
time = imagetool_get_source_date(params->cmdname, sbuf->st_mtime);
ep = params->ep;
addr = params->addr;

3
tools/fit_image.c
View File

@ -51,7 +51,8 @@ static int fit_add_file_data(struct image_tool_params *params, size_t size_inc,
/* for first image creation, add a timestamp at offset 0 i.e., root */
if (params->datafile) {
time_t time = imagetool_get_source_date(params, sbuf.st_mtime);
time_t time = imagetool_get_source_date(params->cmdname,
sbuf.st_mtime);
ret = fit_set_timestamp(ptr, 0, time);
}

4
tools/imagetool.c
View File

@ -116,7 +116,7 @@ int imagetool_get_filesize(struct image_tool_params *params, const char *fname)
}
time_t imagetool_get_source_date(
struct image_tool_params *params,
const char *cmdname,
time_t fallback)
{
char *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
@ -128,7 +128,7 @@ time_t imagetool_get_source_date(
if (gmtime(&time) == NULL) {
fprintf(stderr, "%s: SOURCE_DATE_EPOCH is not valid\n",
params->cmdname);
cmdname);
time = 0;
}

4
tools/imagetool.h
View File

@ -216,12 +216,12 @@ int imagetool_get_filesize(struct image_tool_params *params, const char *fname);
* an error message if SOURCE_DATE_EPOCH contains an invalid value and returns
* 0.
*
* @params: mkimage parameters
* @cmdname: command name
* @fallback: timestamp to use if SOURCE_DATE_EPOCH isn't set
* @return timestamp based on SOURCE_DATE_EPOCH
*/
time_t imagetool_get_source_date(
struct image_tool_params *params,
const char *cmdname,
time_t fallback);
/*