1 files changed, 41 insertions, 8 deletions

diff --git a/tools/firmware-utils/src/addpattern.c b/tools/firmware-utils/src/addpattern.c
index da6797c9ced..9bc48653356 100644
--- a/tools/firmware-utils/src/addpattern.c
+++ b/tools/firmware-utils/src/addpattern.c
@@ -58,6 +58,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/stat.h>
@@ -77,10 +78,11 @@
 /* (from 3.00.24 firmware cyutils.h) */
 #define SUPPORT_4704_CHIP      0x0008
 #define SUPPORT_5352E_CHIP     0x0010
+/* (from WD My Net Wi-Fi Range Extender's cyutils.s) */
+#define SUPPORT_4703_CHIP      0x0020
 
 struct code_header {			/* from cyutils.h */
-	char magic[4];
-	char res1[4];				/* for extra magic */
+	char magic[8];
 	char fwdate[3];
 	char fwvern[3];
 	char id[4];					/* U2ND */
@@ -105,11 +107,25 @@ struct board_info {
 
 struct board_info boards[] = {
 	{
+		.id             = "E2100L",
+		.pattern        = "NL1X",
+		.hw_ver         = 0x00,
+		.sn             = 0x0f,
+		.flags          = {0x3f, 0x00},
+	},
+	{
 		.id		= "WRT160NL",
 		.pattern	= "NL16",
 		.hw_ver		= 0x00,
 		.sn		= 0x0f,
 		.flags		= {0x3f, 0x00},
+	},
+	{
+		.id		= "mynet-rext",
+		.pattern	= "WDHNSTFH",
+		.hw_ver		= 0x00,
+		.sn		= 0x00,
+		.flags		= {0x3f, 0x00},
 	}, {
 		/* Terminating entry */
 		.id	= NULL,
@@ -126,6 +142,20 @@ void usage(void)
 	exit(EXIT_FAILURE);
 }
 
+static time_t source_date_epoch = -1;
+static void set_source_date_epoch() {
+	char *env = getenv("SOURCE_DATE_EPOCH");
+	char *endptr = env;
+	errno = 0;
+        if (env && *env) {
+		source_date_epoch = strtoull(env, &endptr, 10);
+		if (errno || (endptr && *endptr != '\0')) {
+			fprintf(stderr, "Invalid SOURCE_DATE_EPOCH");
+			exit(1);
+		}
+        }
+}
+
 struct board_info *find_board(char *id)
 {
 	struct board_info *board;
@@ -243,8 +273,8 @@ int main(int argc, char **argv)
 		hdr->flags[1] = board->flags[1];
 	}
 
-	if (strlen(pattern) != 4) {
-		fprintf(stderr, "illegal pattern \"%s\": length != 4\n", pattern);
+	if (strlen(pattern) > 8) {
+		fprintf(stderr, "illegal pattern \"%s\"\n", pattern);
 		usage();
 	}
 
@@ -258,7 +288,10 @@ int main(int argc, char **argv)
 		usage();
 	}
 
-	if (time(&t) == (time_t)(-1)) {
+	set_source_date_epoch();
+	if (source_date_epoch != -1) {
+		t = source_date_epoch;
+	} else if ((time(&t) == (time_t)(-1))) {
 		fprintf(stderr, "time call failed\n");
 		return EXIT_FAILURE;
 	}
@@ -270,16 +303,16 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	memcpy(&hdr->magic, pattern, 4);
+	memcpy(hdr->magic, pattern, strlen(pattern));
 	if (pbotflag)
-		memcpy(&hdr->res1, pbotpat, 4);
+		memcpy(&hdr->magic[4], pbotpat, 4);
 	hdr->fwdate[0] = ptm->tm_year % 100;
 	hdr->fwdate[1] = ptm->tm_mon + 1;
 	hdr->fwdate[2] = ptm->tm_mday;
 	hdr->fwvern[0] = v0;
 	hdr->fwvern[1] = v1;
 	hdr->fwvern[2] = v2;
-	memcpy(&hdr->id, CODE_ID, strlen(CODE_ID));
+	memcpy(hdr->id, CODE_ID, strlen(CODE_ID));
 
 	off = sizeof(struct code_header);