17dd18d993
Release Notes: https://lore.kernel.org/buildroot/c0992bbb-9487-9a51-ea9f-39cf074b61ec@sigma-star.at/ Refresh patches: - 130-lzma_jffs2.patch - 320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch Signed-off-by: Nick Hainke <vincent@systemli.org>
61 lines
1.5 KiB
Diff
61 lines
1.5 KiB
Diff
--- a/jffsX-utils/mkfs.jffs2.c
|
|
+++ b/jffsX-utils/mkfs.jffs2.c
|
|
@@ -109,7 +109,7 @@ static char *rootdir = default_rootdir;
|
|
static int verbose = 0;
|
|
static int squash_uids = 0;
|
|
static int squash_perms = 0;
|
|
-static int fake_times = 0;
|
|
+static time_t fixed_timestamp = -1;
|
|
int target_endian = __BYTE_ORDER;
|
|
|
|
static uint32_t find_hardlink(struct filesystem_entry *e)
|
|
@@ -251,8 +251,8 @@ static struct filesystem_entry *add_host
|
|
mode &= ~(S_ISUID | S_ISGID);
|
|
}
|
|
}
|
|
- if (fake_times) {
|
|
- timestamp = 0;
|
|
+ if (fixed_timestamp != -1) {
|
|
+ timestamp = fixed_timestamp;
|
|
}
|
|
|
|
entry = xcalloc(1, sizeof(struct filesystem_entry));
|
|
@@ -1559,6 +1559,20 @@ static void parse_image(void){
|
|
close(in_fd);
|
|
}
|
|
|
|
+static void set_source_date_epoch() {
|
|
+ char *env = getenv("SOURCE_DATE_EPOCH");
|
|
+ char *endptr = env;
|
|
+ errno = 0;
|
|
+ if (env && *env) {
|
|
+ fixed_timestamp = strtoull(env, &endptr, 10);
|
|
+ if (errno || (endptr && *endptr != '\0')) {
|
|
+ fprintf(stderr, "Invalid SOURCE_DATE_EPOCH");
|
|
+ exit(1);
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+
|
|
int main(int argc, char **argv)
|
|
{
|
|
int c, opt;
|
|
@@ -1577,6 +1591,7 @@ int main(int argc, char **argv)
|
|
warn_page_size = 1; /* warn user if page size not 4096 */
|
|
|
|
jffs2_compressors_init();
|
|
+ set_source_date_epoch();
|
|
|
|
while ((opt = getopt_long(argc, argv,
|
|
"D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
|
|
@@ -1627,7 +1642,7 @@ int main(int argc, char **argv)
|
|
break;
|
|
|
|
case 'f':
|
|
- fake_times = 1;
|
|
+ fixed_timestamp = 0;
|
|
break;
|
|
|
|
case 'h':
|