[Reproducible-commits] [debhelper] 32/33: fix mtimes also for ddebs.
Mattia Rizzolo
mattia at mapreri.org
Sun Jun 28 13:15:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
mapreri-guest pushed a commit to branch pu/reproducible_builds
in repository debhelper.
commit 6ec554cbf0454b1b249a142bf2262a1a01d42e22
Author: Mattia Rizzolo <mattia at mapreri.org>
Date: Sun Apr 5 15:19:41 2015 +0200
fix mtimes also for ddebs.
Conflicts:
dh_builddeb
---
dh_builddeb | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/dh_builddeb b/dh_builddeb
index e1497dc..2944464 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -131,6 +131,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
foreach split(":", $ENV{DH_ALWAYS_EXCLUDE});
}
}
+
+ my $find_options='';
+ if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
+ $find_options="! \\( $dh{EXCLUDE_FIND} \\)";
+ }
+
if ( -d $ddeb_tmpdir) {
my $ddeb_control = "${ddeb_tmpdir}/DEBIAN/control";
# Only build the ddeb if it has a control file. People might
@@ -141,6 +147,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# the ddeb.
my @args = default_compressor_args(["-z1", "-Zxz", "-Sextreme"],
@{$dh{U_PARAMS}});
+ complex_doit("find $ddeb_tmpdir -newermt '$dh{DATE}' $find_options -print0",
+ "2>/dev/null | xargs -0r touch --no-dereference --date='$dh{DATE}'");
+
doit("dpkg-deb", @args,
"--build", $ddeb_tmpdir, $dh{DESTDIR});
} else {
@@ -149,10 +158,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
}
- my $find_options='';
- if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
- $find_options="! \\( $dh{EXCLUDE_FIND} \\)";
- }
complex_doit("find $tmp -newermt '$dh{DATE}' $find_options -print0",
"2>/dev/null | xargs -0r touch --no-dereference --date='$dh{DATE}'");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debhelper.git
More information about the Reproducible-commits
mailing list