Re: [Reproducible-builds] [PATCH] Respect SOURCE_DATE_EPOCH when building FIT images.
On 16 June 2016 at 13:28, Vagrant Cascadian wrote: > Embedding timestamps in FIT images results in unreproducible builds > for targets that generate a fit image, such as dra7xx_evm. > > This patch uses the SOURCE_DATE_EPOCH environment variable, when set, > to use specified value for the date. > > Thanks to HW42 for debugging the issue and providing the patch: > > > https://lists.alioth.debian.org/pipermail/reproducible-builds/Week-of-Mon-20160606/005722.html > > For more information about reproducible builds and the > SOURCE_DATE_EPOCH specification: > > https://reproducible-builds.org/specs/source-date-epoch/ > https://reproducible-builds.org/ > > Signed-off-by: Vagrant Cascadian > --- > > tools/default_image.c | 14 +- > tools/fit_image.c | 6 -- > tools/imagetool.c | 20 > tools/imagetool.h | 16 > 4 files changed, 41 insertions(+), 15 deletions(-) Reviewed-by: Simon Glass ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
[Reproducible-builds] strip-nondeterminism_0.019-1~bpo8+1_amd64.changes ACCEPTED into jessie-backports
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Thu, 16 Jun 2016 22:54:40 + Source: strip-nondeterminism Binary: libfile-stripnondeterminism-perl strip-nondeterminism dh-strip-nondeterminism Architecture: source all Version: 0.019-1~bpo8+1 Distribution: jessie-backports Urgency: medium Maintainer: Reproducible builds folks Changed-By: Mattia Rizzolo Description: dh-strip-nondeterminism - file non-deterministic information stripper — Debhelper add-on libfile-stripnondeterminism-perl - file non-deterministic information stripper — Perl module strip-nondeterminism - file non-deterministic information stripper — stand-alone tool Closes: 823917 826700 Changes: strip-nondeterminism (0.019-1~bpo8+1) jessie-backports; urgency=medium . * Rebuild for jessie-backports. . strip-nondeterminism (0.019-1) unstable; urgency=medium . * New upstream release: - Recursively normalize JAR files embedded within JAR files (Closes: #823917) - Add framework for "clamping" the timestamp - Add timestamp clamping support to gzip handler . strip-nondeterminism (0.018-2) unstable; urgency=medium . [ Helmut Grohne ] * Mark dh-strip-nondeterminism and strip-nondeterminism Multi-Arch: foreign (Closes: #826700) Checksums-Sha1: 1e557a40ba078c7253dd7367aaef9669b6ff28bb 2349 strip-nondeterminism_0.019-1~bpo8+1.dsc 748357d1203f54fe4306d04383d3450041653347 strip-nondeterminism_0.019-1~bpo8+1.debian.tar.xz 7a8fd9ca635b7b22338c71c202fd9c32ebfe44fa 12360 libfile-stripnondeterminism-perl_0.019-1~bpo8+1_all.deb fae971234c374f1108f452bb4c77f7607668d933 8494 strip-nondeterminism_0.019-1~bpo8+1_all.deb c5ee8f66aa7e19322fb99d289dc8bc2cd96fcb1b 8218 dh-strip-nondeterminism_0.019-1~bpo8+1_all.deb Checksums-Sha256: 154e66aa3f261fa48f289a6bee7b96a5d49d79ac3999bf78ceae247175e5570c 2349 strip-nondeterminism_0.019-1~bpo8+1.dsc 3bed62e2f106fbcccb2ad7ebdd6b3265d2b6f9c4b607d60ddc164d5b393d4f04 strip-nondeterminism_0.019-1~bpo8+1.debian.tar.xz 8f4d671d678e20b4f5384fc4d246adbb6ba72736985dd53c84a850dbbfe97d9e 12360 libfile-stripnondeterminism-perl_0.019-1~bpo8+1_all.deb a2602ba3629e487f22c6abee62108737beb82ca3e0b82a0f45893f06eaba434a 8494 strip-nondeterminism_0.019-1~bpo8+1_all.deb d8e8467d240c1d6205d10d5d08ec296d276184bab72bded1ba9e79e83c02ad80 8218 dh-strip-nondeterminism_0.019-1~bpo8+1_all.deb Files: d911f24f5c76bf81e706edf7f49100a7 2349 devel optional strip-nondeterminism_0.019-1~bpo8+1.dsc 2acaeda21d5e925ca4c053906d8aea42 devel optional strip-nondeterminism_0.019-1~bpo8+1.debian.tar.xz 46a139e77853c59e7dac2c8e0748c73b 12360 perl optional libfile-stripnondeterminism-perl_0.019-1~bpo8+1_all.deb c991a7f3f93d4d2bbc6e90eb8f7b9a03 8494 devel optional strip-nondeterminism_0.019-1~bpo8+1_all.deb 993e8c697cd09372ade0563b599b2a5c 8218 devel optional dh-strip-nondeterminism_0.019-1~bpo8+1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJXYzCqAAoJEEsEP825REVAPtUQAJrow1m2DKzTzJuJQZjWOUDs 5SehSFLoNCJSsYDLtwEbSCEAswSJo1Xfc0YHAohY2wRNA+gUPc2y1HicF2/peSqn O/H39p7UyEf05+Hs/MCzgGD4NPWE+uD5ZCm2gpleJym+qFOC7Q3EiZM2pLSBEKG6 YQSRgiAo3051s7WlXwZeCLR7PmnYRIZEVdDWh5QXQqR4z1nlayJ16X1pc4QMq+9r ux8hG0gL4muNlp46Wwm5iKDMQzuedJV7UHlxNaejy4ypJR6NkSmzHJdmvlzKr38V iTPDHPTPLWqXE84B9jgK9WXhFWtVQUOHPmyMAm45UuMTPMfj/swEqGGH8kKxtjs4 GD2kk3gNl5vcRNs1E6dqy8fQxE97iwkIql7D/nsC/Vqee0q1pCmSX5lwieGJYUs+ aHrJHzVfPJ17UZWJ9CExjYQjqIii2KojIjmpN65rT/drA1cy0O/246HSydZRqnSH 0rfBnhCeAsSr1yN/+OAM8lAzvUeDUuV8OuV4H/uyOWNTLePG7ApY11ExwyrbWJC/ aPgi/yHeIMGAPTcCTu6eC3ITsxKGIVO43/jeUsVrUeMimrDANrgeaOYWJD5xVGCt p3V3FGPpjUbjQp92SwpDe4fe8GCjzC2t4eFpSblvo4RFELtcdJc+nIWmpVSk0J/i 4WBPp/n/E/c8uXfekXtk =LnqY -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
[Reproducible-builds] Processing of strip-nondeterminism_0.019-1~bpo8+1_amd64.changes
strip-nondeterminism_0.019-1~bpo8+1_amd64.changes uploaded successfully to localhost along with the files: strip-nondeterminism_0.019-1~bpo8+1.dsc strip-nondeterminism_0.019-1~bpo8+1.debian.tar.xz libfile-stripnondeterminism-perl_0.019-1~bpo8+1_all.deb strip-nondeterminism_0.019-1~bpo8+1_all.deb dh-strip-nondeterminism_0.019-1~bpo8+1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
[Reproducible-builds] [PATCH] Respect SOURCE_DATE_EPOCH when building FIT images.
Embedding timestamps in FIT images results in unreproducible builds
for targets that generate a fit image, such as dra7xx_evm.
This patch uses the SOURCE_DATE_EPOCH environment variable, when set,
to use specified value for the date.
Thanks to HW42 for debugging the issue and providing the patch:
https://lists.alioth.debian.org/pipermail/reproducible-builds/Week-of-Mon-20160606/005722.html
For more information about reproducible builds and the
SOURCE_DATE_EPOCH specification:
https://reproducible-builds.org/specs/source-date-epoch/
https://reproducible-builds.org/
Signed-off-by: Vagrant Cascadian
---
tools/default_image.c | 14 +-
tools/fit_image.c | 6 --
tools/imagetool.c | 20
tools/imagetool.h | 16
4 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/tools/default_image.c b/tools/default_image.c
index 3ed7014..6e4ae14 100644
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -88,7 +88,6 @@ static void image_set_header(void *ptr, struct stat *sbuf,
int ifd,
struct image_tool_params *params)
{
uint32_t checksum;
- char *source_date_epoch;
time_t time;
image_header_t * hdr = (image_header_t *)ptr;
@@ -98,18 +97,7 @@ static void image_set_header(void *ptr, struct stat *sbuf,
int ifd,
sizeof(image_header_t)),
sbuf->st_size - sizeof(image_header_t));
- source_date_epoch = getenv("SOURCE_DATE_EPOCH");
- if (source_date_epoch != NULL) {
- time = (time_t) strtol(source_date_epoch, NULL, 10);
-
- if (gmtime(&time) == NULL) {
- fprintf(stderr, "%s: SOURCE_DATE_EPOCH is not valid\n",
- __func__);
- time = 0;
- }
- } else {
- time = sbuf->st_mtime;
- }
+ time = imagetool_get_source_date(params, sbuf->st_mtime);
/* Build new header */
image_set_magic(hdr, IH_MAGIC);
diff --git a/tools/fit_image.c b/tools/fit_image.c
index 0551572..23dbce4 100644
--- a/tools/fit_image.c
+++ b/tools/fit_image.c
@@ -51,8 +51,10 @@ 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)
- ret = fit_set_timestamp(ptr, 0, sbuf.st_mtime);
+ if (params->datafile) {
+ time_t time = imagetool_get_source_date(params, sbuf.st_mtime);
+ ret = fit_set_timestamp(ptr, 0, time);
+ }
if (!ret) {
ret = fit_add_verification_data(params->keydir, dest_blob, ptr,
diff --git a/tools/imagetool.c b/tools/imagetool.c
index 08d191d..855a096 100644
--- a/tools/imagetool.c
+++ b/tools/imagetool.c
@@ -115,3 +115,23 @@ int imagetool_get_filesize(struct image_tool_params
*params, const char *fname)
return sbuf.st_size;
}
+
+time_t imagetool_get_source_date(
+struct image_tool_params *params,
+time_t fallback)
+{
+ char *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+
+ if (source_date_epoch == NULL)
+ return fallback;
+
+ time_t time = (time_t) strtol(source_date_epoch, NULL, 10);
+
+ if (gmtime(&time) == NULL) {
+ fprintf(stderr, "%s: SOURCE_DATE_EPOCH is not valid\n",
+ params->cmdname);
+ time = 0;
+ }
+
+ return time;
+}
diff --git a/tools/imagetool.h b/tools/imagetool.h
index a3ed0f4..b422df2 100644
--- a/tools/imagetool.h
+++ b/tools/imagetool.h
@@ -205,6 +205,22 @@ int imagetool_save_subimage(
*/
int imagetool_get_filesize(struct image_tool_params *params, const char
*fname);
+/**
+ * imagetool_get_source_date() - Get timestamp for build output.
+ *
+ * Gets a timestamp for embedding it in a build output. If set
+ * SOURCE_DATE_EPOCH is used. Else the given fallback value is returned. Prints
+ * an error message if SOURCE_DATE_EPOCH contains an invalid value and returns
+ * 0.
+ *
+ * @params:mkimage parameters
+ * @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,
+ time_t fallback);
+
/*
* There is a c file associated with supported image type low level code
* for ex. default_image.c, fit_image.c
--
2.1.4
___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Re: [Reproducible-builds] Bug#827382: dwarfutils: does not build reproducibly
On Wed, Jun 15, 2016 at 07:47:20PM +0200, Reiner Herrmann wrote: > I found that the problem is in a C file which is generated during build > (tmp-tt-table.c). It contains some tables, and the last two elements > columsn of one table were not deterministic. > The reason is that the array is sized incorrectly. > > It is declared as: > > unsigned int > tag_tree_combination_table[TAG_TABLE_ROW_MAXIMUM][TAG_TABLE_COLUMN_MAXIMUM]; > > where TAG_TABLE_COLUMN_MAXIMUM was set to EXT_TAG_TABLE_COLS, which is 5. > But when calling this tool with -s, it uses STD_TAG_TABLE_COLUMNS for > iterating over the table, which is 7 -> two elements more than the table > is wide, which causes memory from outside the table to be written into > the file. > > The attached patch fixes this by setting the maximum column width to > STD_TAG_TABLE_COLUMNS. Amazing. Thank you very much! ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
[Reproducible-builds] package uploaded to our repo
doxygen_1.8.11-2.0~reproducible0.dsc has just been uploaded to https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
