Accepting request 1110990 from Java:packages

more reproducibility stuff

OBS-URL: https://build.opensuse.org/request/show/1110990
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tycho?expand=0&rev=12
This commit is contained in:
Ana Guerrero 2023-09-14 14:25:37 +00:00 committed by Git OBS Bridge
commit 76eeb1d3cc
4 changed files with 42 additions and 0 deletions

13
tycho-getTimestamp.patch Normal file
View File

@ -0,0 +1,13 @@
diff -urEbwB org.eclipse.tycho-tycho-1.6.0.orig/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/DefaultBuildTimestampProvider.java org.eclipse.tycho-tycho-1.6.0/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/DefaultBuildTimestampProvider.java
--- org.eclipse.tycho-tycho-1.6.0.orig/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/DefaultBuildTimestampProvider.java 2023-09-05 17:53:07.666513409 +0200
+++ org.eclipse.tycho-tycho-1.6.0/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/DefaultBuildTimestampProvider.java 2023-09-14 06:14:27.034252611 +0200
@@ -28,6 +28,9 @@
@Override
public Date getTimestamp(MavenSession session, MavenProject project, MojoExecution execution) {
+ if (System.getenv("SOURCE_DATE_EPOCH") != null) {
+ return new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
+ }
return session.getStartTime();
}
}

View File

@ -0,0 +1,11 @@
--- a/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
+++ b/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
@@ -617,4 +617,8 @@ private void checkCompilerArgs(Collection<Map.Entry<String, String>> argEntries,
}
+ public String getCompilerId() {
+ return "tycho-jdt";
+ }
+
}

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Sep 14 04:19:53 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* tycho-getTimestamp.patch
+ use SOURCE_DATE_EPOCH for timestamp generated by tycho
-------------------------------------------------------------------
Wed Sep 13 18:53:55 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* tycho-plexus-compiler-2.13.patch
+ fix build against newer plexus-compiler
-------------------------------------------------------------------
Sat Sep 9 14:56:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -65,7 +65,9 @@ Patch5: 0006-Mockito-does-not-have-test-scope.patch
Patch6: 0007-Fix-dependency-problems-when-bootstrapping-with-extr.patch
Patch7: 0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
Patch8: plexus-lookup-fix.patch
Patch9: tycho-plexus-compiler-2.13.patch
Patch10: tycho-sourcetarget.patch
Patch11: tycho-getTimestamp.patch
Patch100: fedoraproject-p2-bootstrap-fix.patch
BuildRequires: bash
BuildRequires: fdupes
@ -211,7 +213,9 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch100
# Unneeded for RPM builds