Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b223316d50 | ||
|
|
fa610ddf7b |
52
.gitignore
vendored
52
.gitignore
vendored
@ -1,49 +1,3 @@
|
||||
/openjdk-jdk17u-jdk-17.0.7+7.tar.xz
|
||||
/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
/openjdk-jdk18u-jdk-18.0.1+0.tar.xz
|
||||
/openjdk-jdk18u-jdk-18.0.1+10.tar.xz
|
||||
/openjdk-jdk18u-jdk-18.0.1.1+2.tar.xz
|
||||
/openjdk-jdk18u-jdk-18.0.2+9.tar.xz
|
||||
/openjdk-jdk19u-jdk-19+36.tar.xz
|
||||
/openjdk-jdk19u-jdk-19.0.1+10.tar.xz
|
||||
/openjdk-jdk19u-jdk-19.0.2+7.tar.xz
|
||||
/openjdk-jdk20u-jdk-20+36.tar.xz
|
||||
/openjdk-jdk20u-jdk-20.0.1+9.tar.xz
|
||||
/openjdk-jdk20u-jdk-20.0.2+9.tar.xz
|
||||
/openjdk-jdk21u-jdk-21+35.tar.xz
|
||||
/openjdk-21.0.1+12.tar.xz
|
||||
/openjdk-21.0.2+11.tar.xz
|
||||
/openjdk-21.0.2+12.tar.xz
|
||||
/openjdk-21.0.2+13.tar.xz
|
||||
/openjdk-21.0.3+1-ea.tar.xz
|
||||
/openjdk-21.0.3+7-ea.tar.xz
|
||||
/openjdk-21.0.3+9.tar.xz
|
||||
/openjdk-21.0.4+1-ea.tar.xz
|
||||
/openjdk-21.0.4+5-ea.tar.xz
|
||||
/openjdk-21.0.4+7.tar.xz
|
||||
/openjdk-21.0.5+1-ea.tar.xz
|
||||
/openjdk-21.0.5+5-ea.tar.xz
|
||||
/openjdk-21.0.5+9-ea.tar.xz
|
||||
/openjdk-21.0.5+10.tar.xz
|
||||
/openjdk-21.0.5+11.tar.xz
|
||||
/openjdk-21.0.6+6-ea.tar.xz
|
||||
/openjdk-21.0.6+7.tar.xz
|
||||
/openjdk-21.0.7+1-ea.tar.xz
|
||||
/openjdk-21.0.7+2-ea.tar.xz
|
||||
/openjdk-21.0.7+3-ea.tar.xz
|
||||
/openjdk-21.0.7+4-ea.tar.xz
|
||||
/openjdk-21.0.7+5-ea.tar.xz
|
||||
/openjdk-21.0.7+6.tar.xz
|
||||
/openjdk-21.0.8+1-ea.tar.xz
|
||||
/openjdk-21.0.8+2-ea.tar.xz
|
||||
/openjdk-21.0.8+8-ea.tar.xz
|
||||
/openjdk-21.0.8+9.tar.xz
|
||||
/openjdk-22.0.2+9.tar.xz
|
||||
/openjdk-23.0.2+7.tar.xz
|
||||
/openjdk-24.0.2+12.tar.xz
|
||||
/openjdk-25+36.tar.xz
|
||||
/openjdk-25.0.1+8.tar.xz
|
||||
/nssadapter-0.1.0.tar.xz
|
||||
/openjdk-25.0.2+10.tar.xz
|
||||
/nssadapter-0.1.1.tar.xz
|
||||
/openjdk-25.0.3+9.tar.xz
|
||||
SOURCES/nssadapter-0.1.0.tar.xz
|
||||
SOURCES/openjdk-25.0.2+10.tar.xz
|
||||
SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
|
||||
3
.java-25-openjdk.metadata
Normal file
3
.java-25-openjdk.metadata
Normal file
@ -0,0 +1,3 @@
|
||||
f796f454a7f6eb8df8fc66c842e3fb2e7f5b82e8 SOURCES/nssadapter-0.1.0.tar.xz
|
||||
b842f1ba4b1c5b25c36a9ce694a9205d64ebfc15 SOURCES/openjdk-25.0.2+10.tar.xz
|
||||
c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
@ -3,468 +3,6 @@ Key:
|
||||
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
|
||||
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
|
||||
|
||||
New in release OpenJDK 25.0.3 (2026-04-21):
|
||||
===========================================
|
||||
Live versions of these release notes can be found at:
|
||||
* https://bit.ly/openjdk2503
|
||||
|
||||
* CVEs
|
||||
- CVE-2026-22007
|
||||
- CVE-2026-22008
|
||||
- CVE-2026-22013
|
||||
- CVE-2026-22016
|
||||
- CVE-2026-22018
|
||||
- CVE-2026-22021
|
||||
- CVE-2026-23865
|
||||
- CVE-2026-34268
|
||||
- CVE-2026-34282
|
||||
* Changes
|
||||
- JDK-7191877: TEST_BUG: java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java failing intermittently
|
||||
- JDK-8030957: AIX: Implement OperatingSystemMXBean.getSystemCpuLoad() and .getProcessCpuLoad() on AIX
|
||||
- JDK-8068378: [TEST_BUG]The java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java instruction need to update
|
||||
- JDK-8183336: Better cleanup for jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java
|
||||
- JDK-8212084: G1: Implement UseGCOverheadLimit
|
||||
- JDK-8244336: Restrict algorithms at JCE layer
|
||||
- JDK-8246037: Shenandoah: update man pages to mention -XX:+UseShenandoahGC
|
||||
- JDK-8255463: java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java failed with ThreadTimeoutException
|
||||
- JDK-8256289: java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java failed with "RuntimeException: Wrong focus owner: java.awt.Button[button1,41,36,56x23,label=Button1]"
|
||||
- JDK-8274082: Wrong test name in jtreg run tag for java/awt/print/PrinterJob/SwingUIText.java
|
||||
- JDK-8286258: [Accessibility,macOS,VoiceOver] VoiceOver reads the spinner value wrong and sometime partially
|
||||
- JDK-8286865: vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/Test.java fails with Out of space in CodeCache
|
||||
- JDK-8287062: com/sun/jndi/ldap/LdapPoolTimeoutTest.java failed due to different timeout message
|
||||
- JDK-8293484: AArch64: TestUseSHA512IntrinsicsOptionOnSupportedCPU.java fails on CPU with SHA512 feature support
|
||||
- JDK-8299304: Test "java/awt/print/PrinterJob/PageDialogTest.java" fails on macOS 13 x64 because the Page Dialog blocks the Toolkit
|
||||
- JDK-8307495: Specialize atomic bitset functions for aix-ppc
|
||||
- JDK-8313770: jdk/internal/platform/docker/TestSystemMetrics.java fails on Ubuntu
|
||||
- JDK-8316274: javax/swing/ButtonGroup/TestButtonGroupFocusTraversal.java fails in Ubuntu 23.10 with Motif LAF
|
||||
- JDK-8317838: java/nio/channels/Channels/SocketChannelStreams.java running into timeout (aix)
|
||||
- JDK-8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit
|
||||
- JDK-8320677: Printer tests use invalid '@run main/manual=yesno
|
||||
- JDK-8333857: Test sun/security/ssl/SSLSessionImpl/ResumeChecksServer.java failed: Existing session was used
|
||||
- JDK-8333871: Check return values of sysinfo
|
||||
- JDK-8334928: Test sun/security/ssl/SSLSocketImpl/ReuseAddr.java failed: java.net.BindException: Address already in use
|
||||
- JDK-8335646: Nimbus : JLabel not painted with LAF defined foreground color on Ubuntu 24.04
|
||||
- JDK-8336695: Update Commons BCEL to Version 6.10.0
|
||||
- JDK-8339791: Refactor MiscUndecorated/ActiveAWTWindowTest.java
|
||||
- JDK-8341039: compiler/cha/TypeProfileFinalMethod.java fails with assertEquals expected: 0 but was: 2
|
||||
- JDK-8342175: MemoryEaterMT fails intermittently with ExceptionInInitializerError
|
||||
- JDK-8342401: [TESTBUG] javax/swing/JSpinner/8223788/JSpinnerButtonFocusTest.java test fails in ubuntu 22.04 on SBR Hosts
|
||||
- JDK-8342640: GenShen: Silently ignoring ShenandoahGCHeuristics considered poor user-experience
|
||||
- JDK-8342659: Test vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java failed: Class nsk.share.jdi.TestClass1 was not unloaded
|
||||
- JDK-8343316: Review and update tests using explicit provider names
|
||||
- JDK-8343340: Swapping checking do not work for MetricsMemoryTester failcount
|
||||
- JDK-8343474: [updates] Customize README.md to specifics of update project
|
||||
- JDK-8344073: Test runtime/cds/appcds/TestParallelGCWithCDS.java#id0 failed
|
||||
- JDK-8346154: [XWayland] Some tests fail intermittently in the CI, but not locally
|
||||
- JDK-8346962: Test CRLReadTimeout.java fails with -Xcomp on a fastdebug build
|
||||
- JDK-8348014: Enhance certificate processing
|
||||
- JDK-8349192: jvmti/scenarios/contention/TC05/tc05t001 fails: ERROR: tc05t001.cpp, 281: (waitedThreadCpuTime - waitThreadCpuTime) < (EXPECTED_ACCURACY * 1000000)
|
||||
- JDK-8352149: Test java/awt/Frame/MultiScreenTest.java fails: Window list is empty
|
||||
- JDK-8353755: Add a helper method to Util - findComponent()
|
||||
- JDK-8354244: Use random data in MinMaxRed_Long data arrays
|
||||
- JDK-8354469: Keytool exposes the password in plain text when command is piped using | grep
|
||||
- JDK-8354894: java/lang/Thread/virtual/Starvation.java timeout on server with high CPUs
|
||||
- JDK-8354937: Cleanup some sparc related coding in os_linux
|
||||
- JDK-8356548: Use ClassFile API instead of ASM to transform classes in tests
|
||||
- JDK-8356868: Not all cgroup parameters are made available
|
||||
- JDK-8357277: Update OpenSSL library for interop tests
|
||||
- JDK-8357380: java/lang/StringBuilder/RacingSBThreads.java times out with C1
|
||||
- JDK-8357390: java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java Test failing on Ubuntu 24.04 Vm Hosts used by Oracle's internal CI system
|
||||
- JDK-8357470: src/java.base/share/classes/sun/security/util/Debug.java implement the test for args.toLowerCase
|
||||
- JDK-8357570: [macOS] os::Bsd::available_memory() might return too low values
|
||||
- JDK-8357591: Re-enable CDS test cases for jvmci after JDK-8345826
|
||||
- JDK-8358058: sun/java2d/OpenGL/DrawImageBg.java Test fails intermittently
|
||||
- JDK-8358159: Empty mode/padding in cipher transformations
|
||||
- JDK-8358529: GenShen: Heuristics do not respond to changes in SoftMaxHeapSize
|
||||
- JDK-8358679: [asan] vmTestbase/nsk/jvmti tests show memory issues
|
||||
- JDK-8358686: CDS and AOT can cause buffer truncation warning even when logging is disabled
|
||||
- JDK-8358735: GenShen: block_start() may be incorrect after class unloading
|
||||
- JDK-8358756: [s390x] Test StartupOutput.java crash due to CodeCache size
|
||||
- JDK-8358801: javac produces class that does not pass verifier.
|
||||
- JDK-8359064: Expose reason for marking nmethod non-entrant to JVMCI client
|
||||
- JDK-8359182: Use @requires instead of SkippedException for MaxPath.java
|
||||
- JDK-8359388: Stricter checking for cipher transformations
|
||||
- JDK-8359418: Test "javax/swing/text/GlyphView/bug4188841.java" failed because the phrase of text pane does not match the instructions
|
||||
- JDK-8359472: JVM crashes when attaching a dynamic agent before JVMTI_PHASE_LIVE
|
||||
- JDK-8359707: Add classfile modification code to RedefineClassHelper
|
||||
- JDK-8359868: Shenandoah: Free threshold heuristic does not use SoftMaxHeapSize
|
||||
- JDK-8359978: Test javax/net/ssl/SSLSocket/Tls13PacketSize.java failed again with java.net.SocketException: An established connection was aborted by the software in your host machine
|
||||
- JDK-8360049: CodeInvalidationReasonTest.java fails with ZGC on AArch64
|
||||
- JDK-8360160: ubuntu-22-04 machine is failing client tests
|
||||
- JDK-8360169: Problem list CodeInvalidationReasonTest.java on linux-riscv64 until JDK-8360168 is fixed
|
||||
- JDK-8360271: String.indexOf intrinsics fail with +EnableX86ECoreOpts and -CompactStrings
|
||||
- JDK-8360395: sun/security/tools/keytool/i18n.java user country is current user location instead of the language
|
||||
- JDK-8360539: DTLS handshakes fails due to improper cookie validation logic
|
||||
- JDK-8360562: sun/security/tools/keytool/i18n.java add an ability to add comment for failures
|
||||
- JDK-8360702: runtime/Thread/AsyncExceptionTest.java timed out
|
||||
- JDK-8360882: Tests throw SkippedException when they should fail
|
||||
- JDK-8361067: Test ExtraButtonDrag.java requires frame.dispose in finally block
|
||||
- JDK-8361106: [TEST] com/sun/net/httpserver/Test9.java fails with java.nio.file.FileSystemException
|
||||
- JDK-8361363: ShenandoahAsserts::print_obj() does not work for forwarded objects and UseCompactObjectHeaders
|
||||
- JDK-8361381: GlyphLayout behavior differs on JDK 11+ compared to JDK 8
|
||||
- JDK-8361492: [IR Framework] Has too restrictive regex for load and store
|
||||
- JDK-8361521: BogusFocusableWindowState.java fails with StackOverflowError on Linux
|
||||
- JDK-8361530: Test javax/swing/GraphicsConfigNotifier/StalePreferredSize.java timed out
|
||||
- JDK-8361613: System.console() should only be available for interactive terminal
|
||||
- JDK-8361894: sun/security/krb5/config/native/TestDynamicStore.java ensure that the test is run with sudo
|
||||
- JDK-8362284: RISC-V: cleanup NativeMovRegMem
|
||||
- JDK-8362979: C2 fails with unexpected node in SuperWord truncation: CmpLTMask, RoundF
|
||||
- JDK-8363950: Incorrect jtreg header in TestLayoutVsICU.java
|
||||
- JDK-8364373: Transform Affine transformations
|
||||
- JDK-8364465: Enhance behavior of some intrinsics
|
||||
- JDK-8364580: Test compiler/vectorization/TestSubwordTruncation.java fails on platforms without RoundF/RoundD
|
||||
- JDK-8364741: [asan] runtime/ErrorHandling/PrintVMInfoAtExitTest.java fails because output differs slightly
|
||||
- JDK-8364756: JFR: Improve slow tests
|
||||
- JDK-8364936: Shenandoah: Switch nmethod entry barriers to conc_instruction_and_data_patch
|
||||
- JDK-8365065: cancelled ForkJoinPool tasks no longer throw CancellationException
|
||||
- JDK-8365184: sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java Re-enable SerialGC flag on debuggee process
|
||||
- JDK-8365305: The ARIA role ‘contentinfo’ is not valid for the element <footer>
|
||||
- JDK-8365398: TEST_BUG: java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java failing intermittently
|
||||
- JDK-8365526: Crash with null Symbol passed to SystemDictionary::resolve_or_null
|
||||
- JDK-8365570: C2 fails assert(false) failed: Unexpected node in SuperWord truncation: CastII
|
||||
- JDK-8365776: Convert JShell tests to use JUnit instead of TestNG
|
||||
- JDK-8365861: test/jdk/sun/security/pkcs11/Provider/ tests skipped without SkippedException
|
||||
- JDK-8365972: JFR: ThreadDump and ClassLoaderStatistics events may cause back to back rotations
|
||||
- JDK-8366082: Improve queue size computation in CPU-time sampler
|
||||
- JDK-8366128: jdk/jdk/nio/zipfs/TestPosix.java::testJarFile uses wrong file
|
||||
- JDK-8366182: Some PKCS11Tests are being skipped when they shouldn't
|
||||
- JDK-8366261: Provide utility methods for sun.security.util.Password
|
||||
- JDK-8366278: Form control element <select> has no associated label
|
||||
- JDK-8366369: Add @requires linux for GTK L&F tests
|
||||
- JDK-8366486: Test jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java is timing out
|
||||
- JDK-8366733: Re-examine older java.text NF, DF, and DFS serialization tests
|
||||
- JDK-8366747: RISC-V: Improve VerifyMethodHandles for method handle linkers
|
||||
- JDK-8366817: test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcServer.java and JdkProcClient.java should not delete logs
|
||||
- JDK-8366874: Test gc/arguments/TestParallelGCErgo.java fails with UseTransparentHugePages
|
||||
- JDK-8366878: Improve flags of compiler/loopopts/superword/TestAlignVectorFuzzer.java
|
||||
- JDK-8366908: Use a different class for testing JDK-8351654
|
||||
- JDK-8366938: Test runtime/handshake/HandshakeTimeoutTest.java crashed
|
||||
- JDK-8366951: Test runtime/logging/StressAsyncUL.java is timing out
|
||||
- JDK-8367135: Test compiler/loopstripmining/CheckLoopStripMining.java needs internal timeouts adjusted
|
||||
- JDK-8367271: Add parsing tests to DateFormat JMH benchmark
|
||||
- JDK-8367278: Test compiler/startup/StartupOutput.java timed out after completion on Windows
|
||||
- JDK-8367302: New test jdk/jfr/event/profiling/TestCPUTimeSampleQueueAutoSizes.java from JDK-8366082 is failing
|
||||
- JDK-8367371: Remove @requires vm.opt.UseLargePages from InternSharedString.java test
|
||||
- JDK-8367372: Test `test/hotspot/jtreg/gc/TestObjectAlignmentCardSize.java` fails on 32 bit systems
|
||||
- JDK-8367463: Improved Arena allocations
|
||||
- JDK-8367583: sun/security/util/AlgorithmConstraints/InvalidCryptoDisabledAlgos.java fails after JDK-8244336
|
||||
- JDK-8367772: Refactor createUI in PassFailJFrame
|
||||
- JDK-8367784: java/awt/Focus/InitialFocusTest/InitialFocusTest1.java failed with Wrong focus owner
|
||||
- JDK-8367862: debug.cpp: Do not print help message for methods ifdef'd out
|
||||
- JDK-8367901: Calendar.roll(hour, 24) returns wrong result
|
||||
- JDK-8367994: test/jdk/sun/security/pkcs11/Signature/ tests pass when they should skip
|
||||
- JDK-8368029: Several tests in httpserver/simpleserver should throw SkipException
|
||||
- JDK-8368182: AOT cache creation fails with class defined by JNI
|
||||
- JDK-8368328: CompactNumberFormat.clone does not produce independent instances
|
||||
- JDK-8368335: Refactor the rest of Locale TestNG based tests to JUnit
|
||||
- JDK-8368498: Use JUnit instead of TestNG for jdk_text tests
|
||||
- JDK-8368500: ContextClassLoader cannot be reset on threads in ForkJoinPool.commonPool()
|
||||
- JDK-8368551: Core dump warning may be confusing
|
||||
- JDK-8368625: com/sun/net/httpserver/ServerStopTerminationTest.java fails intermittently
|
||||
- JDK-8368677: acvp test should throw SkippedException when no ACVP-Server available
|
||||
- JDK-8368683: [process] Increase jtreg debug output maxOutputSize for TreeTest
|
||||
- JDK-8368754: runtime/cds/appcds/SignedJar.java log regex is too strict
|
||||
- JDK-8368787: Error reporting: hs_err files should show instructions when referencing code in nmethods
|
||||
- JDK-8368866: compiler/codecache/stress/UnexpectedDeoptimizationTest.java intermittent timed out
|
||||
- JDK-8368882: NPE during text drawing on machine with JP locale
|
||||
- JDK-8368885: NMT CommandLine tests can check for error better
|
||||
- JDK-8368892: Make JEditorPane/TestBrowserBGColor.java headless
|
||||
- JDK-8369032: Add test to ensure serialized ICC_Profile stores only necessary optional data
|
||||
- JDK-8369050: DecimalFormat Rounding Errors for Fractional Ties Near Zero
|
||||
- JDK-8369227: Virtual thread stuck in PARKED state
|
||||
- JDK-8369255: Assess and remedy any unsafe usage of the Semaphores used by JFR
|
||||
- JDK-8369282: Distrust TLS server certificates anchored by Chunghwa ePKI Root CA
|
||||
- JDK-8369335: Two sun/java2d/OpenGL tests fail on Windows after JDK-8358058
|
||||
- JDK-8369505: jhsdb jstack cannot handle continuation stub
|
||||
- JDK-8369516: Delete duplicate imaging test
|
||||
- JDK-8369575: Enhance crypto algorithm support
|
||||
- JDK-8369804: TestGenerators.java fails with IllegalArgumentException: bound must be greater than origin
|
||||
- JDK-8369851: Remove darcy author tags from langtools tests
|
||||
- JDK-8369858: Remove darcy author tags from jdk tests
|
||||
- JDK-8369881: C2: Unexpected node in SuperWord truncation: ReverseBytesS, ReverseBytesUS
|
||||
- JDK-8369911: Test sun/java2d/marlin/ClipShapeTest.java#CubicDoDash, #Cubic and #Poly fail intermittent
|
||||
- JDK-8369991: Thread blocking during JFR emergency dump must be in safepoint safe state
|
||||
- JDK-8370036: TestJhsdbJstackWithVirtualThread.java fails when run with -showversion
|
||||
- JDK-8370064: Test runtime/NMT/CheckForProperDetailStackTrace.java fails on Windows when using stripped pdb files
|
||||
- JDK-8370197: Add missing @Override annotations in com.sun.beans package
|
||||
- JDK-8370201: Test serviceability/sa/TestJhsdbJstackWithVirtualThread.java fails due to VM warnings
|
||||
- JDK-8370203: Add jcmd AOT.end_recording diagnostic command
|
||||
- JDK-8370240: [PPC64] jhsdb jstack cannot handle continuation stub
|
||||
- JDK-8370242: JFR: Clear event reference eagerly when using EventStream
|
||||
- JDK-8370244: [PPC64] Several vector tests fail on Power8
|
||||
- JDK-8370325: G1: Disallow GC for TLAB allocation
|
||||
- JDK-8370378: Some compiler tests inadvertently exclude particular platforms
|
||||
- JDK-8370393: Cleanup handling of ancient Windows versions from GetJavaProperties java_props_md
|
||||
- JDK-8370405: C2: mismatched store from MergeStores wrongly scalarized in allocation elimination
|
||||
- JDK-8370492: [Linux] Update cpu shares to cpu.weight mapping function
|
||||
- JDK-8370511: test/jdk/javax/swing/JSlider/bug4382876.java does not release previously pressed keys
|
||||
- JDK-8370529: Enhance Path Factories Redux
|
||||
- JDK-8370572: Cgroups hierarchical memory limit is not honored after JDK-8322420
|
||||
- JDK-8370579: PPC: fix inswri immediate argument order
|
||||
- JDK-8370615: Improve Kerberos credentialing
|
||||
- JDK-8370636: com/sun/jdi/TwoThreadsTest.java should wait for completion of all threads
|
||||
- JDK-8370646: TestLargeUTF8Length.java needs lots of memory
|
||||
- JDK-8370649: Add intermittent tag for gc/shenandoah/generational/TestOldGrowthTriggers.java
|
||||
- JDK-8370708: RISC-V: Add VerifyStackAtCalls
|
||||
- JDK-8370730: Test serviceability/attach/EarlyDynamicLoad/EarlyDynamicLoad.java needs to be resilient about warnings
|
||||
- JDK-8370732: Use WhiteBox.getWhiteBox().fullGC() to provoking gc for nsk/jvmti tests
|
||||
- JDK-8370887: DelayScheduler.replace method may break the 4-ary heap in certain scenarios
|
||||
- JDK-8370905: Update vm.defmeth tests to use virtual threads
|
||||
- JDK-8370942: test/jdk/java/security/Provider/NewInstance.java and /test/jdk/java/security/cert/CertStore/NoLDAP.java may skip without notifying
|
||||
- JDK-8370966: Create regression test for the hierarchical memory limit fix in JDK-8370572
|
||||
- JDK-8370986: Enhance Zip file reading
|
||||
- JDK-8370995: Enhance ZipFile usage
|
||||
- JDK-8371014: Dump JFR recording on CrashOnOutOfMemoryError is incorrectly implemented
|
||||
- JDK-8371103: vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/TestDescription.java failing
|
||||
- JDK-8371262: sun/security/pkcs11/Cipher/KeyWrap tests may silently skip
|
||||
- JDK-8371316: Adjust assertion (GC pause time cannot be smaller than the sum of each phase) in G1GCPhaseTimes::print
|
||||
- JDK-8371349: Update NSS library to 3.117
|
||||
- JDK-8371364: Refactor javax/swing/JFileChooser/FileSizeCheck.java to use Util.findComponent()
|
||||
- JDK-8371365: Update javax/swing/JFileChooser/bug4759934.java to use Util.findComponent()
|
||||
- JDK-8371366: java/net/httpclient/whitebox/RawChannelTestDriver.java fails intermittently in jtreg timeout
|
||||
- JDK-8371368: SIGSEGV in JfrVframeStream::next_vframe() on arm64
|
||||
- JDK-8371383: Test sun/security/tools/jarsigner/DefaultOptions.java failed due to CertificateNotYetValidException
|
||||
- JDK-8371385: compiler/escapeAnalysis/TestRematerializeObjects.java fails in case of -XX:-UseUnalignedAccesses
|
||||
- JDK-8371420: Still sporadic failures of gc/TestAlwaysPreTouchBehavior.java#<gcname> on Linux after JDK-8359104
|
||||
- JDK-8371485: ProblemList awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java for linux
|
||||
- JDK-8371559: Intermittent timeouts in test javax/net/ssl/Stapling/HttpsUrlConnClient.java
|
||||
- JDK-8371608: Jtreg test jdk/internal/vm/Continuation/Fuzz.java sometimes fails with (fast)debug binaries
|
||||
- JDK-8371759: Add missing @Override annotations in com.sun.imageio package
|
||||
- JDK-8371769: TestMemoryInvisibleParent.java fails with java.nio.file.AccessDeniedException
|
||||
- JDK-8371830: Enhance certificate chain validation
|
||||
- JDK-8371854: Shenandoah: Simplify WALK_FORWARD_IN_BLOCK_START use
|
||||
- JDK-8371864: GaloisCounterMode.implGCMCrypt0 AVX512/AVX2 intrinsics stubs cause AES-GCM encryption failure for certain payload sizes
|
||||
- JDK-8371895: Lower GCTimeLimit in TestUseGCOverheadLimit.java
|
||||
- JDK-8371935: Enhance key generation
|
||||
- JDK-8371944: AOT configuration is corrupted when app closes System.out
|
||||
- JDK-8371948: TestStackOverflowDuringInit.java fails xss too small on linux-aarch64
|
||||
- JDK-8371966: RISC-V: Incorrect pointer dereference in TemplateInterpreterGenerator::generate_native_entry
|
||||
- JDK-8371967: Add Visual Studio 2026 to build toolchain for Windows
|
||||
- JDK-8371978: tools/jar/ReproducibleJar.java fails on XFS
|
||||
- JDK-8372012: java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java should check ability to create links
|
||||
- JDK-8372046: compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java fails IR verification
|
||||
- JDK-8372048: Performance improvement on Linux remote desktop
|
||||
- JDK-8372110: GenShen: Fix erroneous assert
|
||||
- JDK-8372120: Add missing sound keyword to MIDI tests
|
||||
- JDK-8372147: ConnectionFlowControlTest should use HttpResponse.connectionLabel()
|
||||
- JDK-8372321: TestBackToBackSensitive fails intermittently after JDK-8365972
|
||||
- JDK-8372348: Adjust some UL / JFR string deduplication output messages
|
||||
- JDK-8372412: Increase buffer size for ring-buffer events in CollectedHeap
|
||||
- JDK-8372441: JFR: Improve logging of TestBackToBackSensitive
|
||||
- JDK-8372534: Update Libpng to 1.6.51
|
||||
- JDK-8372586: Crashes on ppc64(le) after JDK-8371368
|
||||
- JDK-8372589: VM crashes on init when NonNMethodCodeHeapSize is set too small and UseTransparentHugePages is enabled
|
||||
- JDK-8372591: assert(!current->cont_fastpath() || freeze.check_valid_fast_path()) failed
|
||||
- JDK-8372609: Bug4944439 does not enforce locale correctly
|
||||
- JDK-8372661: Add a null-safe static factory method to "jdk.test.lib.net.SimpleSSLContext"
|
||||
- JDK-8372704: ThreadMXBean.getThreadUserTime may return total time
|
||||
- JDK-8372710: Update ProcessBuilder/Basic regex
|
||||
- JDK-8372733: GHA: Bump to Ubuntu 24.04
|
||||
- JDK-8372756: Mouse additional buttons and horizontal scrolling are broken on XWayland GNOME >= 47 after JDK-8351907
|
||||
- JDK-8372835: WorkQueue::push is missing an acquire-fence
|
||||
- JDK-8372857: Improve debuggability of java/rmi/server/RemoteServer/AddrInUse.java test
|
||||
- JDK-8372860: TestCodeCacheUnloadDuringConcCycle fails on ARM32
|
||||
- JDK-8372977: Unnecessary gthread-2.0 loading
|
||||
- JDK-8372988: Test runtime/Nestmates/membership/TestNestHostErrorWithMultiThread.java failed: Unexpected interrupt
|
||||
- JDK-8373021: aarch64: MacroAssembler::arrays_equals reads out of bounds
|
||||
- JDK-8373101: JdkClient and JdkServer test classes ignore namedGroups field
|
||||
- JDK-8373106: JFR suspend/resume deadlock on macOS in pthreads library
|
||||
- JDK-8373290: Update FreeType to 2.14.1
|
||||
- JDK-8373429: gc/g1/TestCodeCacheUnloadDuringConcCycle fails on various platforms
|
||||
- JDK-8373476: (tz) Update Timezone Data to 2025c
|
||||
- JDK-8373485: JFR Crash during sampling: assert(jt->has_last_Java_frame()) failed: invariant
|
||||
- JDK-8373525: C2: assert(_base == Long) failed: Not a Long
|
||||
- JDK-8373537: Migrate "test/jdk/com/sun/net/httpserver/" to null-safe "SimpleSSLContext" methods
|
||||
- JDK-8373593: Support latest VS2026 MSC_VER in abstract_vm_version.cpp
|
||||
- JDK-8373623: Refactor Serialization tests for Records to JUnit
|
||||
- JDK-8373630: r18_tls should not be modified on Windows AArch64
|
||||
- JDK-8373632: Some sound tests failing in CI due to lack of sound key
|
||||
- JDK-8373704: Improve "SocketException: Protocol family unavailable" message
|
||||
- JDK-8373716: Refactor further java/util tests from TestNG to JUnit
|
||||
- JDK-8373727: New XBM images parser regression: only the first line of the bitmap array is parsed
|
||||
- JDK-8373793: TestDynamicStore.java '/manual' disables use of '/timeout'
|
||||
- JDK-8373807: test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java getURI() uses "localhost"
|
||||
- JDK-8373832: Test java/lang/invoke/TestVHInvokerCaching.java tests nothing
|
||||
- JDK-8373869: Refactor java/net/httpclient/ThrowingPushPromises*.java tests to use JUnit5
|
||||
- JDK-8373931: Test javax/sound/sampled/Clip/AutoCloseTimeCheck.java timed out
|
||||
- JDK-8373946: Synth ProgressBarUI implementation confuses background painting with border painting
|
||||
- JDK-8373984: Check for macos 11 in CGraphicsDevice.m can be removed
|
||||
- JDK-8373998: RISC-V: simple optimization of ConvHF2F
|
||||
- JDK-8374056: RISC-V: Fix argument passing for the RiscvFlushIcache::flush
|
||||
- JDK-8374178: Missing include in systemDictionary.cpp after JDK-8365526
|
||||
- JDK-8374433: java/util/Locale/PreserveTagCase.java does not run any tests
|
||||
- JDK-8374434: Several JShell tests report JUnit discovery warnings
|
||||
- JDK-8374525: RISC-V: Several masked float16 vector operations are not supported
|
||||
- JDK-8374555: No need for visible input warning in s.s.u.Password when not reading from System.in
|
||||
- JDK-8374557: Enhance TLS connection handling
|
||||
- JDK-8374642: EscapeHash macro fails with GNU make 4.3 and 4.4
|
||||
- JDK-8374644: Regression in GZIPInputStream performance after JDK-7036144
|
||||
- JDK-8374711: Hotspot runtime/CommandLine/OptionsValidation/TestOptionsWithRanges fails without printing the option name
|
||||
- JDK-8374872: Cleanup outdated SAP AG copyright header info
|
||||
- JDK-8374875: Improve perfMemory warning about 'Insufficient space for shared memory file'
|
||||
- JDK-8375057: Update HarfBuzz to 12.3.2
|
||||
- JDK-8375063: Update Libpng to 1.6.54
|
||||
- JDK-8375094: RISC-V: Fix client builds after JDK-8368732
|
||||
- JDK-8375231: Refactor util/ServiceLoader tests to use JUnit
|
||||
- JDK-8375232: Refactor util/StringJoiner tests to use JUnit
|
||||
- JDK-8375233: Refactor util/Vector tests to use JUnit
|
||||
- JDK-8375311: Some builds are missing debug helpers
|
||||
- JDK-8375530: PPC64: incorrect quick verify_method_data_pointer check causes poor performance in debug build
|
||||
- JDK-8375549: ConcurrentModificationException if jdk.crypto.disabledAlgorithms has multiple entries with known oid
|
||||
- JDK-8375598: VM crashes with "assert((labs(val) & 0xFFFFFFFF00000000) == 0 || dest == (address)-1) failed: must be 32bit offset or -1" when using too high value for NonNMethodCodeHeapSize
|
||||
- JDK-8375657: RISC-V: Need to check size in SharedRuntime::is_wide_vector
|
||||
- JDK-8375742: Test java/lang/invoke/MethodHandleProxies/Driver.java does not run Unnamed.java
|
||||
- JDK-8375963: [25u] Set designator DEFAULT_PROMOTED_VERSION_PRE=ea in jdk25u-dev
|
||||
- JDK-8375999: com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails sporadically on Windows
|
||||
- JDK-8376572: RISC-V: Interpreter: Load array index as signed int
|
||||
- JDK-8376688: Gtest os.attempt_reserve_memory_between_small_range_fill_hole_vm fails on AIX 7.3
|
||||
- JDK-8376889: Enhance JfrRecorder::on_create_vm_3() assert output
|
||||
- JDK-8377347: jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java intermittent OOME
|
||||
- JDK-8377509: Add licenses for gcc 14.2.0
|
||||
- JDK-8377526: Update Libpng to 1.6.55
|
||||
- JDK-8377811: [25u] G1: Optional Evacuations may evacuate pinned objects
|
||||
- JDK-8377898: Hotspot build on AIX with unused-functions warning reports some unused functions
|
||||
- JDK-8377905: gcc.md included with every build
|
||||
- JDK-8378113: Add sun/java2d/OpenGL/ScaleParamsOOB.java to the ProblemList.txt file
|
||||
- JDK-8378218: MSYS2 reports cygwin triplet causing bash configure failure
|
||||
- JDK-8378353: [PPC64] StringCoding.countPositives causes errors when the length is not a proper 32 bit int
|
||||
- JDK-8378623: Use unique font names in FormatCharAdvanceTest
|
||||
- JDK-8378631: Update Zlib Data Compression Library to Version 1.3.2
|
||||
- JDK-8378823: AIX build fails after zlib updated by JDK-8378631
|
||||
- JDK-8378853: [25u] Make backport of JDK-8244336 comply with differences in CSR
|
||||
- JDK-8379035: (tz) Update Timezone Data to 2026a
|
||||
- JDK-8379158: Update FreeType to 2.14.2
|
||||
- JDK-8379256: Update GIFlib to 6.1.1
|
||||
- JDK-8380078: Update GIFlib to 6.1.2
|
||||
- JDK-8380959: Update Libpng to 1.6.56
|
||||
- JDK-8382047: Update Libpng to 1.6.57
|
||||
- JDK-8382438: [25u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 25.0.3
|
||||
|
||||
Notes on individual issues:
|
||||
===========================
|
||||
|
||||
security-libs/javax.net.ssl:
|
||||
|
||||
JDK-8369282: Distrust TLS server certificates anchored by Chunghwa ePKI Root CA
|
||||
===============================================================================
|
||||
In accordance with similar plans recently announced by Google and
|
||||
Mozilla, the JDK will not trust Transport Layer Security (TLS)
|
||||
certificates issued after the 17th of March 2026 which are anchored by
|
||||
Chungwa root certificates.
|
||||
|
||||
Certificates issued on or before the 17th of March, 2026 will continue
|
||||
to be trusted until they expire.
|
||||
|
||||
If a server's certificate chain is anchored by an affected
|
||||
certificate, attempts to negotiate a TLS session will fail with an
|
||||
Exception that indicates the trust anchor is not trusted. For example,
|
||||
|
||||
"TLS server certificate issued after 2026-03-17 and anchored by a
|
||||
distrusted legacy Chungwa root CA: OU=ePKI Root Certification
|
||||
Authority, O="Chunghwa Telecom Co.", Ltd. C=TW"
|
||||
|
||||
To check whether a certificate in a JDK keystore is affected by this
|
||||
change, you can the `keytool` utility:
|
||||
|
||||
keytool -v -list -alias <your_server_alias> -keystore <your_keystore_filename>
|
||||
|
||||
If any of the certificates in the chain are affected by this change,
|
||||
then you will need to update the certificate or contact the
|
||||
organisation responsible for managing the certificate.
|
||||
|
||||
These restrictions apply to the following Chungwa root certificates
|
||||
included in the JDK:
|
||||
|
||||
Alias name: chunghwaepkirootca
|
||||
OU=ePKI Root Certification Authority
|
||||
O="Chunghwa Telecom Co., Ltd."
|
||||
C=TW
|
||||
SHA256:A6:F4:DC:63:A2:4B:FD:CF:54:EF:2A:6A:08:2A:0A:72:DE:35:80:3E:2F:F5:FF:52:7A:E5:D8:72:06:DF:D5
|
||||
|
||||
Users can, *at their own risk*, remove this restriction by modifying
|
||||
the `java.security` configuration file (or override it by using the
|
||||
`java.security.properties` system property) so "CHUNGWA_TLS" is no
|
||||
longer listed in the `jdk.security.caDistrustPolicies` security
|
||||
property.
|
||||
|
||||
hotspot/jfr:
|
||||
|
||||
JDK-8365972: JFR: ThreadDump and ClassLoaderStatistics events may cause back to back rotations
|
||||
==============================================================================================
|
||||
In previous OpenJDK releases, the `jdk.ThreadDump` and
|
||||
`jdk.ClassLoaderStatistics` events were written at the beginning of a
|
||||
new file created by a file rotation. However, in applications with
|
||||
many threads (typically more than a thousand), deep Java stacks
|
||||
(typically more than three hundred frames) or many class loaders
|
||||
(typically hundreds of thousands), the size of these events alone
|
||||
could trigger a further file rotation within one second. This causes
|
||||
other relevant data to be flushed out very quickly (e.g. about fifteen
|
||||
seconds if using the default 250MB max file size). In this release,
|
||||
these events are only written when a recording starts and at the end
|
||||
of a file rotation.
|
||||
|
||||
security-libs/java.security:
|
||||
|
||||
JDK-8244336: Restrict algorithms at JCE layer
|
||||
=============================================
|
||||
A security property named `jdk.crypto.disabledAlgorithms` has been
|
||||
added that can be used to disable JCE/JCA cryptographic services. The
|
||||
property accepts a comma-separated list of services, specified as
|
||||
Service.AlgorithName. The current list of supported services is
|
||||
`Cipher`, `KeyStore`, `MessageDigest` and `Signature`. Algorithms
|
||||
should be drawn from those specified by the Java Security Standard
|
||||
Algorithm Names Specification [0]. For example:
|
||||
|
||||
jdk.crypto.disabledAlgorithms=Cipher.RSA/ECB/PKCS1Padding, MessageDigest.MD2
|
||||
|
||||
would disable the RSA cipher when used with the ECB cipher algorithm
|
||||
mode and PKCS #1 algorithm padding, and the MD2 message digest
|
||||
algorithm.
|
||||
|
||||
The default value for this security property is empty, which means
|
||||
that no algorithms are disabled out-of-the-box. The value of the
|
||||
security property specified in `java.security` can be overridden by
|
||||
specifying a system property of the same name,
|
||||
`jdk.crypto.disabledAlgorithms`. With the above example in place in
|
||||
`java.security`, running `java` as:
|
||||
|
||||
$ java -Djdk.crypto.disabledAlgorithms=
|
||||
|
||||
would cause these algorithms to be enabled for that run of the Java
|
||||
virtual machine.
|
||||
|
||||
[0] https://docs.oracle.com/en/java/javase/25/docs/specs/security/standard-names.html
|
||||
|
||||
JDK-8354469: Keytool exposes the password in plain text when command is piped using | grep
|
||||
==========================================================================================
|
||||
The `keytool` and `jarsigner` commands read passwords using the system
|
||||
console with echoing disabled to avoid them being displayed on screen.
|
||||
However, the system console is usually only available when both the
|
||||
standard input and standard output have *not* been redirected. In
|
||||
previous OpenJDK releases, running these tools with input or output
|
||||
redirected would cause the password to be echoed to the screen in
|
||||
plain text. With this release, echoing no longer takes place in such
|
||||
scenarios when using these tools or the JAAS `TextCallbackHandler`
|
||||
API.
|
||||
|
||||
hotspot/gc:
|
||||
|
||||
JDK-8212084: G1: Implement UseGCOverheadLimit
|
||||
=============================================
|
||||
In this release, the G1 garbage collector now respects the values of
|
||||
`GCTimeLimit` and `GCHeapFreeLimit`. The garbage collector will throw
|
||||
an `OutOfMemoryException` (OOME) when the garbage collection overhead
|
||||
is more than `GCTimeLimit` percent (default: 98%) and the free Java
|
||||
heap is less than `GCHeapFreeLimit` (default: 2%) for five consecutive
|
||||
garbage collections.
|
||||
|
||||
This feature is enabled by default. It may be disabled by specifying
|
||||
the `-XX:-UseGCOverheadLimit` option. The implementation mirrors the
|
||||
functionality already provided by the parallel garbage collector,
|
||||
though there may be differences in the exact conditions when an OOME
|
||||
is triggered, due to differences in the way the collectors calculate
|
||||
the collection overhead and free Java heap.
|
||||
|
||||
New in release OpenJDK 25.0.2 (2026-01-20):
|
||||
===========================================
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java
|
||||
index de2845fb550..60eeab678ca 100644
|
||||
index de2845fb550..b1e416b90f4 100644
|
||||
--- a/src/java.base/share/classes/java/security/Provider.java
|
||||
+++ b/src/java.base/share/classes/java/security/Provider.java
|
||||
@@ -1203,6 +1203,34 @@ public Set<Service> getServices() {
|
||||
@@ -1203,6 +1203,39 @@ public Set<Service> getServices() {
|
||||
return serviceSet;
|
||||
}
|
||||
|
||||
@ -10,7 +10,9 @@ index de2845fb550..60eeab678ca 100644
|
||||
+ private static final class RedHatFIPSFilter {
|
||||
+ static final boolean IS_ON = Boolean.parseBoolean(
|
||||
+ Security.getProperty("__redhat_fips_filter__"));
|
||||
+ private static final Set<String> ANY_SERVICE_TYPE = Set.of();
|
||||
+ private static final Map<String, Set<String>> ALLOW_LIST = Map.of(
|
||||
+ "SunPKCS11-FIPS", ANY_SERVICE_TYPE,
|
||||
+ "SUN", Set.of(
|
||||
+ "AlgorithmParameterGenerator",
|
||||
+ "AlgorithmParameters", "CertificateFactory",
|
||||
@ -18,18 +20,21 @@ index de2845fb550..60eeab678ca 100644
|
||||
+ "Configuration", "KeyStore"),
|
||||
+ "SunEC", Set.of(
|
||||
+ "AlgorithmParameters", "KeyFactory"),
|
||||
+ "SunJSSE", ANY_SERVICE_TYPE,
|
||||
+ "SunJCE", Set.of(
|
||||
+ "AlgorithmParameters",
|
||||
+ "AlgorithmParameterGenerator", "KeyFactory",
|
||||
+ "SecretKeyFactory"),
|
||||
+ "SunRsaSign", Set.of(
|
||||
+ "KeyFactory", "AlgorithmParameters")
|
||||
+ "KeyFactory", "AlgorithmParameters"),
|
||||
+ "XMLDSig", ANY_SERVICE_TYPE
|
||||
+ );
|
||||
+
|
||||
+ static boolean isAllowed(String provName, String serviceType) {
|
||||
+ Set<String> allowedServiceTypes = ALLOW_LIST.get(provName);
|
||||
+ return allowedServiceTypes == null ||
|
||||
+ allowedServiceTypes.contains(serviceType);
|
||||
+ return allowedServiceTypes != null &&
|
||||
+ (allowedServiceTypes == ANY_SERVICE_TYPE ||
|
||||
+ allowedServiceTypes.contains(serviceType));
|
||||
+ }
|
||||
+ }
|
||||
+ /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FIPS PATCH ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
|
||||
@ -37,7 +42,7 @@ index de2845fb550..60eeab678ca 100644
|
||||
/**
|
||||
* Add a service. If a service of the same type with the same algorithm
|
||||
* name exists, and it was added using {@link #putService putService()},
|
||||
@@ -1231,6 +1259,15 @@ protected void putService(Service s) {
|
||||
@@ -1231,6 +1264,15 @@ protected void putService(Service s) {
|
||||
("service.getProvider() must match this Provider object");
|
||||
}
|
||||
String type = s.getType();
|
||||
@ -1,97 +1,4 @@
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 25
|
||||
%global interimver 0
|
||||
%global updatever 3
|
||||
%global patchver 0
|
||||
%global buildver 9
|
||||
%global portablerelease 3
|
||||
%global rpmrelease 0
|
||||
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
%global icedteaver 6.0.0pre00-c848b93a8598
|
||||
# Define current Git revision for the FIPS support patches
|
||||
%global fipsver 57722aab802
|
||||
# Define JDK versions
|
||||
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||
%global javaver %{featurever}
|
||||
# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
|
||||
%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
|
||||
# The tag used to create the OpenJDK tarball
|
||||
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
||||
|
||||
# Standard JPackage naming and versioning defines
|
||||
%global origin openjdk
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
# Define an optional suffix for the OS this package is built on
|
||||
%if 0%{?rhel} == 7
|
||||
%global pkgos rhel7
|
||||
%endif
|
||||
|
||||
# Define milestone (EA for pre-releases, GA for releases)
|
||||
# Release will be (where N is usually a number starting at 1):
|
||||
# - 0.N.ea<dist> for EA releases,
|
||||
# - N<dist> for GA releases
|
||||
%global is_ga 1
|
||||
%if %{is_ga}
|
||||
%global build_type GA
|
||||
%global ea_designator ""
|
||||
%global ea_designator_zip %{nil}
|
||||
%global extraver %{nil}
|
||||
%global eaprefix %{nil}
|
||||
%else
|
||||
%global build_type EA
|
||||
%global ea_designator ea
|
||||
%global ea_designator_zip -%{ea_designator}
|
||||
%global extraver .%{ea_designator}
|
||||
%global eaprefix 0.
|
||||
%endif
|
||||
|
||||
%global compatiblename java-%{javaver}-%{origin}
|
||||
|
||||
Name: %{compatiblename}-portable%{?pkgos:-%{pkgos}}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: %{?eaprefix}%{portablerelease}.%{rpmrelease}%{?extraver}%{?dist}
|
||||
|
||||
%global fullversion %{compatiblename}-%{version}-%{release}
|
||||
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
# situation where in-the-wild java-1.5.0-ibm packages provided "java =
|
||||
# 1:1.5.0". In RPM terms, "1.6.0 < 1:1.5.0" since 1.6.0 is
|
||||
# interpreted as 0:1.6.0. So the "java >= 1.6.0" requirement would be
|
||||
# satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in
|
||||
# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual
|
||||
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
|
||||
Epoch: 1
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
|
||||
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
# HotSpot code is licensed under GPLv2
|
||||
# JDK library code is licensed under GPLv2 with the Classpath exception
|
||||
# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
|
||||
# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
|
||||
# The JSR166 concurrency code is in the public domain
|
||||
# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
|
||||
# The OpenJDK source tree includes:
|
||||
# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
|
||||
# - freetype (FTL), jline (BSD) and LCMS (MIT)
|
||||
# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
|
||||
# - public_suffix_list.dat from publicsuffix.org (MPLv2.0)
|
||||
# The test code includes copies of NSS under the Mozilla Public License v2.0
|
||||
# The PCSClite headers are under a BSD with advertising license
|
||||
# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
|
||||
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
|
||||
URL: http://openjdk.java.net/
|
||||
|
||||
# We are producing RPMs containing only tarballs
|
||||
# and checksums so there are no binaries outside
|
||||
# the tarballs to be processed for debuginfo
|
||||
# debug_package %%{nil} is portable-jdks specific
|
||||
%define debug_package %{nil}
|
||||
|
||||
# RPM conditionals so as to be able to dynamically produce
|
||||
@ -189,6 +96,25 @@ URL: http://openjdk.java.net/
|
||||
%global normal_build %{nil}
|
||||
%endif
|
||||
|
||||
# We have hardcoded list of files, which is appearing in alternatives, and in files
|
||||
# in alternatives those are slaves and master, very often triplicated by man pages
|
||||
# in files all masters and slaves are ghosted
|
||||
# the ghosts are here to allow installation via query like `dnf install /usr/bin/java`
|
||||
# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_
|
||||
# TODO - fix those hardcoded lists via single list
|
||||
# Those files must *NOT* be ghosted for *slowdebug* packages
|
||||
# FIXME - if you are moving jshell or jlink or similar, always modify all three sections
|
||||
# you can check via headless and devels:
|
||||
# rpm -ql --noghost java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
|
||||
# == rpm -ql java-11-openjdk-headless-slowdebug-11.0.1.13-8.fc29.x86_64.rpm | grep bin
|
||||
# != rpm -ql java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
|
||||
# similarly for other %%{_jvmdir}/{jre,java} and %%{_javadocdir}/{java,java-zip}
|
||||
%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" -o "%{?1}" == "%{fastdebug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
|
||||
|
||||
# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1
|
||||
# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
|
||||
%global is_system_jdk 0
|
||||
|
||||
%global aarch64 aarch64 arm64 armv8
|
||||
# we need to distinguish between big and little endian PPC64
|
||||
%global ppc64le ppc64le
|
||||
@ -407,14 +333,17 @@ URL: http://openjdk.java.net/
|
||||
%global with_systemtap 0
|
||||
%endif
|
||||
|
||||
|
||||
# buildjdkver is usually same as featurever,
|
||||
# but at the time of bootstrap of the next jdk, it is featurever-1,
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 25
|
||||
%global interimver 0
|
||||
%global updatever 2
|
||||
%global patchver 0
|
||||
# buildjdkver is usually same as %%{featurever},
|
||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||
# and this it is better to change it here, on single place
|
||||
%global buildjdkver %{featurever}
|
||||
|
||||
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
||||
# We need to explicitly exclude EPEL as it has the rhel macro defined.
|
||||
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
||||
%if 0%{?rhel} && !0%{?epel}
|
||||
%global lts_designator "LTS"
|
||||
%global lts_designator_zip -%{lts_designator}
|
||||
@ -426,8 +355,7 @@ URL: http://openjdk.java.net/
|
||||
# Define vendor information used by OpenJDK
|
||||
%global oj_vendor Red Hat, Inc.
|
||||
%global oj_vendor_url https://www.redhat.com/
|
||||
|
||||
# Define what url the JVM should offer in case of a crash report
|
||||
# Define what url should JVM offer in case of a crash report
|
||||
# order may be important, epel may have rhel declared
|
||||
%if 0%{?epel}
|
||||
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{name}&version=epel%{epel}
|
||||
@ -443,13 +371,67 @@ URL: http://openjdk.java.net/
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease})
|
||||
%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
|
||||
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
%global icedteaver 6.0.0pre00-c848b93a8598
|
||||
# Define current Git revision for the FIPS support patches
|
||||
%global fipsver df044414ef4
|
||||
# Define JDK versions
|
||||
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||
%global javaver %{featurever}
|
||||
# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
|
||||
%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
|
||||
# The tag used to create the OpenJDK tarball
|
||||
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
||||
|
||||
# Standard JPackage naming and versioning defines
|
||||
%global origin openjdk
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 10
|
||||
%global rpmrelease 2
|
||||
#%%global tagsuffix %%{nil}
|
||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
%if %is_system_jdk
|
||||
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
||||
# It is very unlikely we will ever have a patch version > 4 or a build version > 20, so we combine as (patch * 20) + build.
|
||||
# This means 11.0.9.0+11 would have had a priority of 11000911 as before
|
||||
# A 11.0.9.1+1 would have had a priority of 11000921 (20 * 1 + 1), thus ensuring it is bigger than 11.0.9.0+11
|
||||
%global combiver $( expr 20 '*' %{patchver} + %{buildver} )
|
||||
%global priority %( printf '%02d%02d%02d%02d' %{featurever} %{interimver} %{updatever} %{combiver} )
|
||||
%else
|
||||
# for techpreview, using 1, so slowdebugs can have 0
|
||||
%global priority %( printf '%08d' 1 )
|
||||
%endif
|
||||
|
||||
# Define milestone (EA for pre-releases, GA for releases)
|
||||
# Release will be (where N is usually a number starting at 1):
|
||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||
# - N%%{?extraver}{?dist} for GA releases
|
||||
%global is_ga 1
|
||||
%if %{is_ga}
|
||||
%global build_type GA
|
||||
%global ea_designator ""
|
||||
%global ea_designator_zip %{nil}
|
||||
%global extraver %{nil}
|
||||
%global eaprefix %{nil}
|
||||
%else
|
||||
%global build_type EA
|
||||
%global ea_designator ea
|
||||
%global ea_designator_zip -%{ea_designator}
|
||||
%global extraver .%{ea_designator}
|
||||
%global eaprefix 0.
|
||||
%endif
|
||||
|
||||
# parametrized macros are order-sensitive
|
||||
%global compatiblename java-%{featurever}-%{origin}
|
||||
%global fullversion %{compatiblename}-%{version}-%{release}
|
||||
# images directories from upstream build
|
||||
%global jdkimage jdk
|
||||
%global static_libs_image static-libs-graal
|
||||
# output dir stub
|
||||
# Parameterised macros are order-sensitive
|
||||
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
|
||||
%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
|
||||
%global altjavaoutputdir install/altjava.install
|
||||
@ -460,29 +442,20 @@ URL: http://openjdk.java.net/
|
||||
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
|
||||
# portable only declarations
|
||||
%global jreimage jre
|
||||
%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable%{1}.jre;g")
|
||||
%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable%{1}.jdk;g")
|
||||
%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable%{1}.static-libs;g")
|
||||
|
||||
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
|
||||
# so we have to pass in "" but evaluate it, otherwise files will include it
|
||||
%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jre;g")
|
||||
%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jdk;g")
|
||||
%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.static-libs;g")
|
||||
%define jreportablearchive() %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz}
|
||||
%define jreportablearchive_for_files() %(echo %{jreportablearchive -- ""})
|
||||
%define jdkportablearchive() %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz}
|
||||
%define jdkportablearchive_for_files() %(echo %{jdkportablearchive -- ""})
|
||||
%define staticlibsportablearchive() %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}
|
||||
%define staticlibsportablearchive_for_files() %(echo %{staticlibsportablearchive -- ""})
|
||||
|
||||
%define jreportablename() %{expand:%{jreportablenameimpl -- %%{1}}}
|
||||
%define jdkportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
|
||||
# We intentionally use jdkportablenameimpl here since we want to have
|
||||
# static-libs files overlayed on top of the JDK archive
|
||||
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
|
||||
# top of the JDK archive
|
||||
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
|
||||
|
||||
# These macros are not parameterised as the same is shared by all builds
|
||||
%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable.docs;g")
|
||||
%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g")
|
||||
%define docportablearchive() %{docportablename}.tar.xz
|
||||
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable.misc;g")
|
||||
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
|
||||
%define miscportablearchive() %{miscportablename}.tar.xz
|
||||
|
||||
# JDK to use for bootstrapping
|
||||
@ -501,6 +474,26 @@ URL: http://openjdk.java.net/
|
||||
%global build_hotspot_first 0
|
||||
%endif
|
||||
|
||||
#################################################################
|
||||
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
|
||||
%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsystemconf[.]so.*|libzip[.]so.*%{freetype_lib}
|
||||
%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.*
|
||||
%if %is_system_jdk
|
||||
%global __provides_exclude ^(%{_privatelibs})$
|
||||
%global __requires_exclude ^(%{_privatelibs})$
|
||||
# Never generate lib-style provides/requires for slowdebug packages
|
||||
%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
|
||||
%global __requires_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
|
||||
%global __provides_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
|
||||
%global __requires_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
|
||||
%else
|
||||
# Don't generate provides/requires for JDK provided shared libraries at all.
|
||||
%global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$
|
||||
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
|
||||
%endif
|
||||
|
||||
# VM variant being built
|
||||
%ifarch %{zero_arches}
|
||||
%global vm_variant zero
|
||||
@ -508,11 +501,28 @@ URL: http://openjdk.java.net/
|
||||
%global vm_variant server
|
||||
%endif
|
||||
|
||||
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
|
||||
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
|
||||
# Standard JPackage directories and symbolic links.
|
||||
%define sdkdir() %{expand:%{uniquesuffix -- %{?1}}}
|
||||
%define jrelnk() %{expand:jre-%{javaver}-%{origin}-%{version}-%{release}.%{_arch}%{?1}}
|
||||
|
||||
%define sdkbindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin}
|
||||
%define jrebindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin}
|
||||
|
||||
%global alt_java_name alt-java
|
||||
%global devkit_name %{origin}-devkit
|
||||
|
||||
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
|
||||
|
||||
# For flatpack builds hard-code /usr/sbin/alternatives,
|
||||
# otherwise use %%{_sbindir} relative path.
|
||||
%if 0%{?flatpak}
|
||||
%global alternatives_requires /usr/sbin/alternatives
|
||||
%else
|
||||
%global alternatives_requires %{_sbindir}/alternatives
|
||||
%endif
|
||||
|
||||
# Portables have no repo (requires/provides), but these are awesome for orientation in spec
|
||||
# Also scriptlets are happily missing and files are handled old fashion
|
||||
# not-duplicated requires/provides/obsoletes for normal/debug packages
|
||||
@ -537,6 +547,11 @@ URL: http://openjdk.java.net/
|
||||
# Prevent brp-java-repack-jars from being run
|
||||
%global __jar_repack 0
|
||||
|
||||
# Define an optional suffix for the OS this package is built on
|
||||
%if 0%{?rhel} == 7
|
||||
%global pkgos rhel7
|
||||
%endif
|
||||
|
||||
# Define the architectures on which we build
|
||||
# On RHEL, this should be the architectures with a devkit
|
||||
%if 0%{?centos} == 0
|
||||
@ -545,6 +560,43 @@ ExclusiveArch: %{devkit_arches}
|
||||
ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64
|
||||
%endif
|
||||
|
||||
Name: java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
# situation where in-the-wild java-1.5.0-ibm packages provided "java =
|
||||
# 1:1.5.0". In RPM terms, "1.6.0 < 1:1.5.0" since 1.6.0 is
|
||||
# interpreted as 0:1.6.0. So the "java >= 1.6.0" requirement would be
|
||||
# satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in
|
||||
# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual
|
||||
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
|
||||
|
||||
Epoch: 1
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
|
||||
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
# HotSpot code is licensed under GPLv2
|
||||
# JDK library code is licensed under GPLv2 with the Classpath exception
|
||||
# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
|
||||
# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
|
||||
# The JSR166 concurrency code is in the public domain
|
||||
# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
|
||||
# The OpenJDK source tree includes:
|
||||
# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
|
||||
# - freetype (FTL), jline (BSD) and LCMS (MIT)
|
||||
# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
|
||||
# - public_suffix_list.dat from publicsuffix.org (MPLv2.0)
|
||||
# The test code includes copies of NSS under the Mozilla Public License v2.0
|
||||
# The PCSClite headers are under a BSD with advertising license
|
||||
# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
|
||||
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
|
||||
URL: http://openjdk.java.net/
|
||||
|
||||
# The source tarball, generated using generate_source_tarball.sh
|
||||
Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz
|
||||
|
||||
@ -586,17 +638,42 @@ Source18: TestTranslations.java
|
||||
# RPM/distribution specific patches
|
||||
#
|
||||
############################################
|
||||
|
||||
# Crypto policy and FIPS support patches
|
||||
|
||||
# Patch is generated from the fips-25u tree at https://github.com/rh-openjdk/jdk/tree/fips-25u
|
||||
# as follows: git diff <vcstag> src make test > fips-25u-$(git show -s --format=%h HEAD).patch
|
||||
# as follows: git diff %%{vcstag} src make test > fips-25u-$(git show -s --format=%h HEAD).patch
|
||||
# Diff is limited to src and make subdirectories to exclude .github changes
|
||||
|
||||
# Fixes currently included:
|
||||
# OPENJDK-2108: Internal __redhat_fips__ property
|
||||
# OPENJDK-2123: Algorithms lockdown
|
||||
# OPENJDK-4559: Red Hat Build of OpenJDK 25 should not restrict all the providers in FIPS
|
||||
# PR3183, RH1340845: Follow system wide crypto policy
|
||||
# PR3695: Allow use of system crypto policy to be disabled by the user
|
||||
# RH1655466: Support RHEL FIPS mode using SunPKCS11 provider
|
||||
# RH1818909: No ciphersuites availale for SSLSocket in FIPS mode
|
||||
# RH1860986: Disable TLSv1.3 with the NSS-FIPS provider until PKCS#11 v3.0 support is available
|
||||
# RH1915071: Always initialise JavaSecuritySystemConfiguratorAccess
|
||||
# RH1929465: Improve system FIPS detection
|
||||
# RH1995150: Disable non-FIPS crypto in SUN and SunEC security providers
|
||||
# RH1996182: Login to the NSS software token in FIPS mode
|
||||
# RH1991003: Allow plain key import unless com.redhat.fips.plainKeySupport is set to false
|
||||
# RH2021263: Resolve outstanding FIPS issues
|
||||
# RH2052819: Fix FIPS reliance on crypto policies
|
||||
# RH2052829: Detect NSS at Runtime for FIPS detection
|
||||
# RH2052070: Enable AlgorithmParameters and AlgorithmParameterGenerator services in FIPS mode
|
||||
# RH2023467: Enable FIPS keys export
|
||||
# RH2094027: SunEC runtime permission for FIPS
|
||||
# RH2036462: sun.security.pkcs11.wrapper.PKCS11.getInstance breakage
|
||||
# RH2090378: Revert to disabling system security properties and FIPS mode support together
|
||||
# RH2104724: Avoid import/export of DH private keys
|
||||
# RH2092507: P11Key.getEncoded does not work for DH keys in FIPS mode
|
||||
# Build the systemconf library on all platforms
|
||||
# RH2048582: Support PKCS#12 keystores [now part of JDK-8301553 upstream]
|
||||
# RH2020290: Support TLS 1.3 in FIPS mode
|
||||
# Add nss.fips.cfg support to OpenJDK tree
|
||||
# RH2117972: Extend the support for NSS DBs (PKCS11) in FIPS mode
|
||||
# Remove forgotten dead code from RH2020290 and RH2104724
|
||||
# OJ1357: Fix issue on FIPS with a SecurityManager in place
|
||||
# RH2134669: Add missing attributes when registering services in FIPS mode.
|
||||
# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
|
||||
# RH1940064: Enable XML Signature provider in FIPS mode
|
||||
# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream]
|
||||
Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
||||
|
||||
#############################################
|
||||
@ -612,13 +689,9 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
||||
# OpenJDK patches which missed last update
|
||||
#
|
||||
#############################################
|
||||
|
||||
# JDK-8375294: (fs) Files.copy can fail with EOPNOTSUPP when copy_file_range not supported
|
||||
Patch2001: jdk8375294-handle-EOPNOTSUPP-in-copying.patch
|
||||
# JDK-8347901: C2 should remove unused leaf / pure runtime calls
|
||||
Patch2002: jdk8347901-c2_unused_leaf_removal.patch
|
||||
# JDK-83787313: C2: performance regression due to missing constant folding for Math.pow()
|
||||
Patch2003: jdk8378713-c2_missing_pow_constant_folding.patch
|
||||
# JDK-8372534: Update Libpng to 1.6.51
|
||||
# Integrated in 25.0.3
|
||||
Patch2001: jdk8372534-libpng-1.6.51.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -701,19 +774,19 @@ BuildRequires: libpng-devel
|
||||
BuildRequires: zlib-devel
|
||||
%else
|
||||
# Version in src/java.desktop/share/legal/freetype.md
|
||||
Provides: bundled(freetype) = 2.14.2
|
||||
Provides: bundled(freetype) = 2.13.3
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
||||
Provides: bundled(giflib) = 6.1.2
|
||||
Provides: bundled(giflib) = 5.2.2
|
||||
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
||||
Provides: bundled(harfbuzz) = 12.3.2
|
||||
Provides: bundled(harfbuzz) = 10.4.0
|
||||
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
||||
Provides: bundled(lcms2) = 2.17.0
|
||||
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
||||
Provides: bundled(libjpeg) = 6b
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
||||
Provides: bundled(libpng) = 1.6.57
|
||||
Provides: bundled(libpng) = 1.6.51
|
||||
# Version in src/java.base/share/native/libzip/zlib/zlib.h
|
||||
Provides: bundled(zlib) = 1.3.2
|
||||
Provides: bundled(zlib) = 1.3.1
|
||||
# We link statically against libstdc++ to increase portability
|
||||
%ifnarch %{devkit_arches}
|
||||
BuildRequires: libstdc++-static
|
||||
@ -902,6 +975,11 @@ fi
|
||||
export XZ_OPT="-T0"
|
||||
%setup -q -c -n %{uniquesuffix ""} -T -a 0
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1189084
|
||||
prioritylength=`expr length %{priority}`
|
||||
if [ $prioritylength -ne 8 ] ; then
|
||||
echo "priority must be 8 digits in total, violated"
|
||||
exit 14
|
||||
fi
|
||||
|
||||
# OpenJDK patches
|
||||
|
||||
@ -911,15 +989,24 @@ sh %{SOURCE12} %{top_level_dir_name}
|
||||
%endif
|
||||
|
||||
# Patch the JDK
|
||||
|
||||
# This syntax is deprecated:
|
||||
# %patchN [...]
|
||||
# and should be replaced with:
|
||||
# %patch -PN [...]
|
||||
# For example:
|
||||
# %patch1001 -p1
|
||||
# becomes:
|
||||
# %patch -P1001 -p1
|
||||
# The replacement format suggested by recent (circa Fedora 38) RPM
|
||||
# deprecation messages:
|
||||
# %patch N [...]
|
||||
# is not backward-compatible with prior (circa RHEL-8) versions of
|
||||
# rpmbuild.
|
||||
pushd %{top_level_dir_name}
|
||||
# Add crypto policy and FIPS support
|
||||
%patch -P1001 -p1
|
||||
# Add EOPNOTSUPP patch
|
||||
# Add libpng update ahead of 25.0.3
|
||||
%patch -P2001 -p1
|
||||
# Add C2 patches
|
||||
%patch -P2002 -p1
|
||||
%patch -P2003 -p1
|
||||
popd # openjdk
|
||||
|
||||
echo "Generating %{alt_java_name} man page"
|
||||
@ -1003,6 +1090,7 @@ cat %{bootjdk}/release
|
||||
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
|
||||
export NUM_PROC=${NUM_PROC:-1}
|
||||
%if 0%{?_smp_ncpus_max}
|
||||
# Honor %%_smp_ncpus_max
|
||||
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
|
||||
%endif
|
||||
export XZ_OPT="-T0"
|
||||
@ -1122,8 +1210,8 @@ function buildjdk() {
|
||||
mkdir -p ${outputdir}
|
||||
pushd ${outputdir}
|
||||
|
||||
# Note: zlib and freetype use link_type (macro)
|
||||
# rather than link_opt (shell var) as the system versions
|
||||
# Note: zlib and freetype use %{link_type}
|
||||
# rather than ${link_opt} as the system versions
|
||||
# are always used in a system_libs build, even
|
||||
# for the static library build
|
||||
LD_LIBRARY_PATH=${LIBPATH} \
|
||||
@ -1814,8 +1902,8 @@ done
|
||||
|
||||
%files
|
||||
# main package builds always
|
||||
%{_jvmdir}/%{jreportablearchive_for_files}
|
||||
%{_jvmdir}/%{jreportablearchive_for_files}.sha256sum
|
||||
%{_jvmdir}/%{jreportablearchive -- %%{nil}}
|
||||
%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum
|
||||
%else
|
||||
%files
|
||||
# placeholder
|
||||
@ -1824,15 +1912,15 @@ done
|
||||
%if %{include_normal_build}
|
||||
|
||||
%files devel
|
||||
%{_jvmdir}/%{jdkportablearchive_for_files}
|
||||
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}
|
||||
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
|
||||
%{_jvmdir}/%{jdkportablearchive_for_files}.sha256sum
|
||||
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}.sha256sum
|
||||
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
|
||||
|
||||
%if %{include_staticlibs}
|
||||
%files static-libs
|
||||
%{_jvmdir}/%{staticlibsportablearchive_for_files}
|
||||
%{_jvmdir}/%{staticlibsportablearchive_for_files}.sha256sum
|
||||
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}
|
||||
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}.sha256sum
|
||||
%endif
|
||||
|
||||
%files unstripped
|
||||
@ -1886,63 +1974,6 @@ done
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jul 13 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-3.0
|
||||
- Add 25u backports of JDK-8347901 & JDK-8378713 C2 performance fixes
|
||||
- Resolves: OPENJDK-4885
|
||||
|
||||
* Thu Jul 02 2026 Andrea Bolognani <abologna@redhat.com> - 1:25.0.3.0.9-3.0
|
||||
- Strip %%{dist} more thoroughly
|
||||
- Resolves: OPENJDK-4881
|
||||
|
||||
* Fri Jun 26 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-2.0
|
||||
- Port ForFiles patch to RHEL and update to use standard function naming format
|
||||
- Remove macro references in comments where possible (%dnl not compatible enough yet)
|
||||
- Drop unused tagsuffix line which causes issues on older RPM versions without %dnl
|
||||
- Cleanup RPM only macros unused in the portable spec file
|
||||
- Move version information and core NVR definitions back towards the top of the file
|
||||
- Specify portablerelease and rpmrelease (always 0 for portables) in the Release field
|
||||
- Related: OPENJDK-4872
|
||||
- Resolves: OPENJDK-4873
|
||||
- Resolves: OPENJDK-4875
|
||||
- Resolves: OPENJDK-4876
|
||||
|
||||
* Fri Jun 26 2026 Jiri Vanek <jvanek@redhat.com> - 1:25.0.3.0.9-2
|
||||
- Redeclared ForFiles release sections as %%nil no longer works with %%1
|
||||
- RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
|
||||
- so we have to pass in "" but evaluate it, otherwise files record will include it
|
||||
- Resolves: OPENJDK-4872
|
||||
|
||||
* Sat Apr 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-1
|
||||
- Update to jdk-25.0.3+9 (GA)
|
||||
- Update release notes to 25.0.3+9
|
||||
- Update FIPS patch to 57722aab802 version synced with 25.0.3+8
|
||||
- Drop local libpng patches now JDK-8372534, JDK-8375063 & JDK-8377526 are included upstream
|
||||
- Drop local HarfBuzz patch now JDK-8375057 is included upstream
|
||||
- Bump freetype version to 2.14.2 following JDK-8373290 & JDK-8379158
|
||||
- Bump giflib version to 6.1.2 following JDK-8379256 & JDK-8380078
|
||||
- Bump libpng version to 1.6.57 following JDK-8380959 & JDK-8382047
|
||||
- Bump zlib version to 1.3.2 following JDK-8378631
|
||||
- Add JDK-8375294 EOPNOTSUPP patch ahead of 25.0.4
|
||||
- ** This tarball is embargoed until 2026-04-21 @ 1pm PT. **
|
||||
- Resolves: OPENJDK-4634
|
||||
- Resolves: OPENJDK-4656
|
||||
- Resolves: OPENJDK-4607
|
||||
- Resolves: OPENJDK-4675
|
||||
|
||||
* Tue Mar 03 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-3
|
||||
- Update FIPS patch to e55ada9353e to include the fix for the too restrictive provider lockdown
|
||||
- Fix FIPS issue list to represent the new 25u version
|
||||
- Add JDK-8375063 libpng 1.6.54 ahead of 25.0.3
|
||||
- Add JDK-8375057 harfbuzz 12.3.2 ahead of 25.0.3
|
||||
- Add JDK-8377526 libpng 1.6.55 ahead of 25.0.3
|
||||
- Bump libpng version to 1.6.55 following JDK-8375063 & JDK-8377526
|
||||
- Bump harfbuzz version to 12.3.2 following JDK-8375057
|
||||
- Resolves: OPENJDK-4570
|
||||
- Resolves: OPENJDK-4304
|
||||
- Resolves: OPENJDK-4524
|
||||
- Resolves: OPENJDK-4544
|
||||
- Resolves: OPENJDK-4553
|
||||
|
||||
* Mon Jan 12 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-2
|
||||
- Add JDK-8372534 libpng 1.6.51 ahead of 25.0.3
|
||||
- Bump libpng version to 1.6.51 following JDK-8372534
|
||||
1598
SOURCES/jdk8372534-libpng-1.6.51.patch
Normal file
1598
SOURCES/jdk8372534-libpng-1.6.51.patch
Normal file
File diff suppressed because it is too large
Load Diff
41
SOURCES/nssadapter-ldflags.patch
Normal file
41
SOURCES/nssadapter-ldflags.patch
Normal file
@ -0,0 +1,41 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 5175f21..571748a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -13,12 +13,12 @@ DEVEL_PKGS = nss nss-softokn
|
||||
LIB_DIR = $(shell pkg-config --variable=libdir nss-softokn)
|
||||
SHARED_LIBS = pthread softokn3 nss3
|
||||
STATIC_LIBS = freebl
|
||||
-SHR_CFLAGS = -shared -fPIC -fvisibility=hidden -Wl,--exclude-libs,ALL \
|
||||
- $(addprefix -l,$(SHARED_LIBS)) \
|
||||
+SHR_CFLAGS = -shared -fPIC -fvisibility=hidden \
|
||||
$(strip $(shell pkg-config --cflags $(DEVEL_PKGS))) \
|
||||
-Wpedantic -Wall -Wextra -Wconversion -Werror
|
||||
DBG_CFLAGS = -Wno-error=unused-variable -Wno-error=unused-parameter -DDEBUG \
|
||||
-O0 -g
|
||||
+SHR_LDFLAGS = -Wl,--exclude-libs,ALL $(addprefix -l,$(SHARED_LIBS))
|
||||
|
||||
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
|
||||
CLANG_FORMAT_STYLE = { \
|
||||
@@ -53,10 +53,12 @@ endif
|
||||
|
||||
.PHONY: release ## Build the library in RELEASE mode (default)
|
||||
release: BLD_CFLAGS = $(SHR_CFLAGS) $(CFLAGS)
|
||||
+release: BLD_LDFLAGS = $(SHR_LDFLAGS) $(LDFLAGS)
|
||||
release: $(CLEAN_IF_PREVIOUS_BUILD_MODE_IS_DEBUG) $(OUTPUT)
|
||||
|
||||
.PHONY: debug ## Build the library in DEBUG mode
|
||||
debug: BLD_CFLAGS = $(SHR_CFLAGS) $(DBG_CFLAGS) $(CFLAGS)
|
||||
+debug: BLD_LDFLAGS = $(SHR_LDFLAGS) $(LDFLAGS)
|
||||
debug: CREATE_DBG_SENTINEL_IF_NEEDED = touch $(DBG_SENTINEL)
|
||||
debug: $(CLEAN_IF_PREVIOUS_BUILD_MODE_IS_RELEASE) $(OUTPUT)
|
||||
|
||||
@@ -73,7 +75,7 @@ $(BIN_DIR):
|
||||
|
||||
$(OUTPUT): $(BIN_DIR) $(SRC_FILES)
|
||||
@$(CREATE_DBG_SENTINEL_IF_NEEDED)
|
||||
- $(CC) $(BLD_CFLAGS) $(filter %.c, $+) \
|
||||
+ $(CC) $(BLD_CFLAGS) $(filter %.c, $+) $(BLD_LDFLAGS) \
|
||||
$(addprefix $(LIB_DIR)/lib,$(addsuffix .a,$(STATIC_LIBS))) -o $@
|
||||
|
||||
|
||||
@ -3,124 +3,6 @@
|
||||
# it and then adjust portablerelease and portablesuffix
|
||||
# to match the new portable.
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 25
|
||||
%global interimver 0
|
||||
%global updatever 3
|
||||
%global patchver 0
|
||||
%global buildver 9
|
||||
%global portablerelease 3
|
||||
%global rpmrelease 1
|
||||
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
%global icedteaver 6.0.0pre00-c848b93a8598
|
||||
# Define current Git revision for the FIPS support patches
|
||||
%global fipsver 57722aab802
|
||||
# Define nssadapter variables
|
||||
%global nssadapter_version 0.1.1
|
||||
%global nssadapter_name nssadapter-%{nssadapter_version}
|
||||
# Define whether the crypto policy is expected to be active when testing
|
||||
%global crypto_policy_active true
|
||||
# Define JDK versions
|
||||
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||
%global javaver %{featurever}
|
||||
# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
|
||||
%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
|
||||
# The tag used to create the OpenJDK tarball
|
||||
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
||||
|
||||
# Standard JPackage naming and versioning defines
|
||||
%global origin openjdk
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
|
||||
# Define milestone (EA for pre-releases, GA for releases)
|
||||
# Release will be (where N is usually a number starting at 1):
|
||||
# - 0.N.ea<dist> for EA releases,
|
||||
# - N<dist> for GA releases
|
||||
%global is_ga 1
|
||||
%if %{is_ga}
|
||||
%global build_type GA
|
||||
%global ea_designator ""
|
||||
%global ea_designator_zip %{nil}
|
||||
%global extraver %{nil}
|
||||
%global eaprefix %{nil}
|
||||
%else
|
||||
%global build_type EA
|
||||
%global ea_designator ea
|
||||
%global ea_designator_zip -%{ea_designator}
|
||||
%global extraver .%{ea_designator}
|
||||
%global eaprefix 0.
|
||||
%endif
|
||||
|
||||
%global compatiblename java-%{javaver}-%{origin}
|
||||
|
||||
Name: %{compatiblename}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: %{?eaprefix}%{portablerelease}.%{rpmrelease}%{?extraver}%{?dist}
|
||||
|
||||
%global fullversion %{compatiblename}-%{version}-%{release}
|
||||
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
# situation where in-the-wild java-1.5.0-ibm packages provided "java =
|
||||
# 1:1.5.0". In RPM terms, "1.6.0 < 1:1.5.0" since 1.6.0 is
|
||||
# interpreted as 0:1.6.0. So the "java >= 1.6.0" requirement would be
|
||||
# satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in
|
||||
# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual
|
||||
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
|
||||
Epoch: 1
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment
|
||||
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
# HotSpot code is licensed under GPLv2
|
||||
# JDK library code is licensed under GPLv2 with the Classpath exception
|
||||
# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
|
||||
# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
|
||||
# The JSR166 concurrency code is in the public domain
|
||||
# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
|
||||
# The OpenJDK source tree includes:
|
||||
# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
|
||||
# - freetype (FTL), jline (BSD) and LCMS (MIT)
|
||||
# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
|
||||
# - public_suffix_list.dat from publicsuffix.org (MPLv2.0)
|
||||
# The test code includes copies of NSS under the Mozilla Public License v2.0
|
||||
# The PCSClite headers are under a BSD with advertising license
|
||||
# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
|
||||
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
|
||||
URL: http://openjdk.java.net/
|
||||
|
||||
# Define the OS the portable JDK is built on
|
||||
# This is undefined for CentOS & openjdk-portable-rhel-8 builds and
|
||||
# equals 'rhel7' for openjdk-portable-rhel-7 builds
|
||||
%if 0
|
||||
%global pkgos rhel7
|
||||
%endif
|
||||
# Define the root name of the portable packages
|
||||
%global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}}
|
||||
# Release field for the portable build
|
||||
# The rpmrelease field is always zero for portables
|
||||
%global prelease %{?eaprefix}%{portablerelease}.0%{?extraver}
|
||||
# Portable suffix differs between RHEL and CentOS
|
||||
%if 0%{?centos} == 0
|
||||
%global portablerhel %{?pkgos:7_9}%{!?pkgos:8}
|
||||
%else
|
||||
%global portablerhel 9
|
||||
%endif
|
||||
%global portablebuilddir /builddir/build/BUILD
|
||||
%global portablesuffix el%{portablerhel}
|
||||
# Check if pandoc was available to generate docs (including man pages)
|
||||
%if 0%{?portablerhel} == 8
|
||||
%global pandoc_available 1
|
||||
%else
|
||||
%global pandoc_available 0
|
||||
%endif
|
||||
|
||||
# RPM conditionals so as to be able to dynamically produce
|
||||
# slowdebug/release builds. See:
|
||||
# http://rpm.org/user_doc/conditional_builds.html
|
||||
@ -205,20 +87,19 @@ URL: http://openjdk.java.net/
|
||||
%global normal_build %{nil}
|
||||
%endif
|
||||
|
||||
# We have a hardcoded list of files, which appears in alternatives and in files
|
||||
# In alternatives, those are slaves and master, very often triplicated by man pages
|
||||
# In files, all masters and slaves are ghosted
|
||||
# The ghosts are here to allow installation via query like `dnf install /usr/bin/java`
|
||||
# You can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_ -e alternatives
|
||||
# We have hardcoded list of files, which is appearing in alternatives, and in files
|
||||
# in alternatives those are slaves and master, very often triplicated by man pages
|
||||
# in files all masters and slaves are ghosted
|
||||
# the ghosts are here to allow installation via query like `dnf install /usr/bin/java`
|
||||
# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_ -e alternatives
|
||||
# TODO - fix those hardcoded lists via single list
|
||||
# Those files must *NOT* be ghosted for *debug* packages
|
||||
# Those files must *NOT* be ghosted for *slowdebug* packages
|
||||
# FIXME - if you are moving jshell or jlink or similar, always modify all three sections
|
||||
# You can check via headless and devels:
|
||||
# you can check via headless and devels:
|
||||
# rpm -ql --noghost java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
|
||||
# == rpm -ql java-11-openjdk-headless-slowdebug-11.0.1.13-8.fc29.x86_64.rpm | grep bin
|
||||
# != rpm -ql java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
|
||||
# and similarly for other packages.
|
||||
|
||||
# similarly for other %%{_jvmdir}/{jre,java} and %%{_javadocdir}/{java,java-zip}
|
||||
%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" -o "%{?1}" == "%{fastdebug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
|
||||
|
||||
# Indicates whether this is the default JDK on this version of RHEL
|
||||
@ -402,8 +283,13 @@ URL: http://openjdk.java.net/
|
||||
%global with_systemtap 0
|
||||
%endif
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 25
|
||||
%global interimver 0
|
||||
%global updatever 2
|
||||
%global patchver 0
|
||||
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
||||
# We need to explicitly exclude EPEL as it has the rhel macro defined.
|
||||
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
||||
%if 0%{?rhel} && !0%{?epel}
|
||||
%global lts_designator "LTS"
|
||||
%global lts_designator_zip -%{lts_designator}
|
||||
@ -415,8 +301,7 @@ URL: http://openjdk.java.net/
|
||||
# Define vendor information used by OpenJDK
|
||||
%global oj_vendor Red Hat, Inc.
|
||||
%global oj_vendor_url https://www.redhat.com/
|
||||
|
||||
# Define what url the JVM should offer in case of a crash report
|
||||
# Define what url should JVM offer in case of a crash report
|
||||
# order may be important, epel may have rhel declared
|
||||
%if 0%{?epel}
|
||||
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{name}&version=epel%{epel}
|
||||
@ -434,6 +319,58 @@ URL: http://openjdk.java.net/
|
||||
%endif
|
||||
%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease})
|
||||
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
%global icedteaver 6.0.0pre00-c848b93a8598
|
||||
# Define current Git revision for the crypto policy & FIPS support patches
|
||||
%global fipsver df044414ef4
|
||||
# Define nssadapter variables
|
||||
%global nssadapter_version 0.1.0
|
||||
%global nssadapter_name nssadapter-%{nssadapter_version}
|
||||
# Define whether the crypto policy is expected to be active when testing
|
||||
%global crypto_policy_active true
|
||||
# Define JDK versions
|
||||
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||
%global javaver %{featurever}
|
||||
# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
|
||||
%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
|
||||
# The tag used to create the OpenJDK tarball
|
||||
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
||||
|
||||
# Define the OS the portable JDK is built on
|
||||
# This is undefined for CentOS & openjdk-portable-rhel-8 builds and
|
||||
# equals 'rhel7' for openjdk-portable-rhel-7 builds
|
||||
%if 0
|
||||
%global pkgos rhel7
|
||||
%endif
|
||||
|
||||
# Standard JPackage naming and versioning defines
|
||||
%global origin openjdk
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 10
|
||||
%global rpmrelease 2
|
||||
# Settings used by the portable build
|
||||
%global portablerelease 2
|
||||
# Portable suffix differs between RHEL and CentOS
|
||||
%if 0%{?centos} == 0
|
||||
%global portablerhel %{?pkgos:7_9}%{!?pkgos:8}
|
||||
%else
|
||||
%global portablerhel 9
|
||||
%endif
|
||||
%global portablebuilddir /builddir/build/BUILD
|
||||
|
||||
%if 0%{?almalinux}
|
||||
%global portablesuffix el9
|
||||
%endif
|
||||
%global portablesuffix el%{portablerhel}
|
||||
# Check if pandoc was available to generate docs (including man pages)
|
||||
%if 0%{?portablerhel} == 8
|
||||
%global pandoc_available 1
|
||||
%else
|
||||
%global pandoc_available 0
|
||||
%endif
|
||||
|
||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
%if %is_system_jdk
|
||||
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
||||
@ -447,6 +384,29 @@ URL: http://openjdk.java.net/
|
||||
%global priority %( printf '%08d' 1 )
|
||||
%endif
|
||||
|
||||
# Define milestone (EA for pre-releases, GA for releases)
|
||||
# Release will be (where N is usually a number starting at 1):
|
||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||
# - N%%{?extraver}{?dist} for GA releases
|
||||
%global is_ga 1
|
||||
%if %{is_ga}
|
||||
%global build_type GA
|
||||
%global ea_designator ""
|
||||
%global ea_designator_zip %{nil}
|
||||
%global extraver %{nil}
|
||||
%global eaprefix %{nil}
|
||||
%else
|
||||
%global build_type EA
|
||||
%global ea_designator ea
|
||||
%global ea_designator_zip -%{ea_designator}
|
||||
%global extraver .%{ea_designator}
|
||||
%global eaprefix 0.
|
||||
%endif
|
||||
|
||||
# parametrized macros are order-sensitive
|
||||
%global compatiblename java-%{featurever}-%{origin}
|
||||
%global fullversion %{compatiblename}-%{version}-%{release}
|
||||
# output dir stub
|
||||
%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
|
||||
# we can copy the javadoc to not arched dir, or make it not noarch
|
||||
%define uniquejavadocdir() %{expand:%{compatiblename}%{?1}}
|
||||
@ -492,7 +452,7 @@ URL: http://openjdk.java.net/
|
||||
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
|
||||
|
||||
# For flatpack builds hard-code /usr/sbin/alternatives,
|
||||
# otherwise use _sbindir relative path.
|
||||
# otherwise use %%{_sbindir} relative path.
|
||||
%if 0%{?flatpak}
|
||||
%global alternatives_requires /usr/sbin/alternatives
|
||||
%else
|
||||
@ -1165,8 +1125,8 @@ Requires: ca-certificates
|
||||
# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
|
||||
Requires: javapackages-filesystem
|
||||
# Require zone-info data provided by tzdata-java sub-package
|
||||
# 2026a required as of JDK-8379035
|
||||
Requires: tzdata-java >= 2026a
|
||||
# 2025a required as of JDK-8347965
|
||||
Requires: tzdata-java >= 2025a
|
||||
# for support of kernel stream control
|
||||
# libsctp.so.1 is being `dlopen`ed on demand
|
||||
Requires: lksctp-tools%{?_isa}
|
||||
@ -1287,10 +1247,51 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
# Prevent brp-java-repack-jars from being run
|
||||
%global __jar_repack 0
|
||||
# Define the root name of the portable packages
|
||||
%global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}}
|
||||
|
||||
# Define the architectures on which we build
|
||||
ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.alma.1
|
||||
# Equivalent for the portable build
|
||||
%global prelease %{?eaprefix}%{portablerelease}%{?extraver}
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
# situation where in-the-wild java-1.5.0-ibm packages provided "java =
|
||||
# 1:1.5.0". In RPM terms, "1.6.0 < 1:1.5.0" since 1.6.0 is
|
||||
# interpreted as 0:1.6.0. So the "java >= 1.6.0" requirement would be
|
||||
# satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in
|
||||
# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual
|
||||
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
|
||||
|
||||
Epoch: 1
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment
|
||||
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
# HotSpot code is licensed under GPLv2
|
||||
# JDK library code is licensed under GPLv2 with the Classpath exception
|
||||
# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
|
||||
# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
|
||||
# The JSR166 concurrency code is in the public domain
|
||||
# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
|
||||
# The OpenJDK source tree includes:
|
||||
# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
|
||||
# - freetype (FTL), jline (BSD) and LCMS (MIT)
|
||||
# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
|
||||
# - public_suffix_list.dat from publicsuffix.org (MPLv2.0)
|
||||
# The test code includes copies of NSS under the Mozilla Public License v2.0
|
||||
# The PCSClite headers are under a BSD with advertising license
|
||||
# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
|
||||
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
|
||||
URL: http://openjdk.java.net/
|
||||
|
||||
# The source tarball, generated using generate_source_tarball.sh
|
||||
Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz
|
||||
|
||||
@ -1370,15 +1371,41 @@ Source32: create-redhat-properties-files.bash
|
||||
############################################
|
||||
|
||||
# Crypto policy and FIPS support patches
|
||||
|
||||
# Patch is generated from the fips-25u tree at https://github.com/rh-openjdk/jdk/tree/fips-25u
|
||||
# as follows: git diff <vcstag> src make test > fips-25u-$(git show -s --format=%h HEAD).patch
|
||||
# as follows: git diff %%{vcstag} src make test > fips-25u-$(git show -s --format=%h HEAD).patch
|
||||
# Diff is limited to src and make subdirectories to exclude .github changes
|
||||
|
||||
# Fixes currently included:
|
||||
# OPENJDK-2108: Internal __redhat_fips__ property
|
||||
# OPENJDK-2123: Algorithms lockdown
|
||||
# OPENJDK-4559: Red Hat Build of OpenJDK 25 should not restrict all the providers in FIPS
|
||||
# PR3183, RH1340845: Follow system wide crypto policy
|
||||
# PR3695: Allow use of system crypto policy to be disabled by the user
|
||||
# RH1655466: Support RHEL FIPS mode using SunPKCS11 provider
|
||||
# RH1818909: No ciphersuites availale for SSLSocket in FIPS mode
|
||||
# RH1860986: Disable TLSv1.3 with the NSS-FIPS provider until PKCS#11 v3.0 support is available
|
||||
# RH1915071: Always initialise JavaSecuritySystemConfiguratorAccess
|
||||
# RH1929465: Improve system FIPS detection
|
||||
# RH1995150: Disable non-FIPS crypto in SUN and SunEC security providers
|
||||
# RH1996182: Login to the NSS software token in FIPS mode
|
||||
# RH1991003: Allow plain key import unless com.redhat.fips.plainKeySupport is set to false
|
||||
# RH2021263: Resolve outstanding FIPS issues
|
||||
# RH2052819: Fix FIPS reliance on crypto policies
|
||||
# RH2052829: Detect NSS at Runtime for FIPS detection
|
||||
# RH2052070: Enable AlgorithmParameters and AlgorithmParameterGenerator services in FIPS mode
|
||||
# RH2023467: Enable FIPS keys export
|
||||
# RH2094027: SunEC runtime permission for FIPS
|
||||
# RH2036462: sun.security.pkcs11.wrapper.PKCS11.getInstance breakage
|
||||
# RH2090378: Revert to disabling system security properties and FIPS mode support together
|
||||
# RH2104724: Avoid import/export of DH private keys
|
||||
# RH2092507: P11Key.getEncoded does not work for DH keys in FIPS mode
|
||||
# Build the systemconf library on all platforms
|
||||
# RH2048582: Support PKCS#12 keystores [now part of JDK-8301553 upstream]
|
||||
# RH2020290: Support TLS 1.3 in FIPS mode
|
||||
# Add nss.fips.cfg support to OpenJDK tree
|
||||
# RH2117972: Extend the support for NSS DBs (PKCS11) in FIPS mode
|
||||
# Remove forgotten dead code from RH2020290 and RH2104724
|
||||
# OJ1357: Fix issue on FIPS with a SecurityManager in place
|
||||
# RH2134669: Add missing attributes when registering services in FIPS mode.
|
||||
# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
|
||||
# RH1940064: Enable XML Signature provider in FIPS mode
|
||||
# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream]
|
||||
Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
||||
|
||||
#############################################
|
||||
@ -1394,13 +1421,9 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
||||
# OpenJDK patches which missed last update
|
||||
#
|
||||
#############################################
|
||||
|
||||
# JDK-8375294: (fs) Files.copy can fail with EOPNOTSUPP when copy_file_range not supported
|
||||
Patch2001: jdk8375294-handle-EOPNOTSUPP-in-copying.patch
|
||||
# JDK-8347901: C2 should remove unused leaf / pure runtime calls
|
||||
Patch2002: jdk8347901-c2_unused_leaf_removal.patch
|
||||
# JDK-83787313: C2: performance regression due to missing constant folding for Math.pow()
|
||||
Patch2003: jdk8378713-c2_missing_pow_constant_folding.patch
|
||||
# JDK-8372534: Update Libpng to 1.6.51
|
||||
# Integrated in 25.0.3
|
||||
Patch2001: jdk8372534-libpng-1.6.51.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -1415,8 +1438,7 @@ Patch2003: jdk8378713-c2_missing_pow_constant_folding.patch
|
||||
# NSS adapter patches
|
||||
#
|
||||
#############################################
|
||||
|
||||
# Currently empty
|
||||
Patch3001: nssadapter-ldflags.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -1465,8 +1487,8 @@ BuildRequires: %{pkgnameroot}-misc = %{epoch}:%{version}-%{prelease}.%{portables
|
||||
%ifarch %{zero_arches}
|
||||
BuildRequires: libffi-devel
|
||||
%endif
|
||||
# 2026a required as of JDK-8379035
|
||||
BuildRequires: tzdata-java >= 2026a
|
||||
# 2025a required as of JDK-8347965
|
||||
BuildRequires: tzdata-java >= 2025a
|
||||
# Earlier versions have a bug in tree vectorization on PPC
|
||||
BuildRequires: gcc >= 4.8.3-8
|
||||
|
||||
@ -1489,19 +1511,19 @@ BuildRequires: libpng-devel
|
||||
BuildRequires: zlib-devel
|
||||
%else
|
||||
# Version in src/java.desktop/share/legal/freetype.md
|
||||
Provides: bundled(freetype) = 2.14.2
|
||||
Provides: bundled(freetype) = 2.13.3
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
||||
Provides: bundled(giflib) = 6.1.2
|
||||
Provides: bundled(giflib) = 5.2.2
|
||||
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
||||
Provides: bundled(harfbuzz) = 12.3.2
|
||||
Provides: bundled(harfbuzz) = 10.4.0
|
||||
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
||||
Provides: bundled(lcms2) = 2.17.0
|
||||
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
||||
Provides: bundled(libjpeg) = 6b
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
||||
Provides: bundled(libpng) = 1.6.57
|
||||
Provides: bundled(libpng) = 1.6.51
|
||||
# Version in src/java.base/share/native/libzip/zlib/zlib.h
|
||||
Provides: bundled(zlib) = 1.3.2
|
||||
Provides: bundled(zlib) = 1.3.1
|
||||
%endif
|
||||
%ifarch %{sleef_arches}
|
||||
# SLEEF is always bundled
|
||||
@ -1919,20 +1941,29 @@ sh %{SOURCE12} %{top_level_dir_name}
|
||||
%endif
|
||||
|
||||
# Patch the JDK
|
||||
|
||||
# This syntax is deprecated:
|
||||
# %%patchN [...]
|
||||
# and should be replaced with:
|
||||
# %%patch -PN [...]
|
||||
# For example:
|
||||
# %%patch1001 -p1
|
||||
# becomes:
|
||||
# %%patch -P1001 -p1
|
||||
# The replacement format suggested by recent (circa Fedora 38) RPM
|
||||
# deprecation messages:
|
||||
# %%patch N [...]
|
||||
# is not backward-compatible with prior (circa RHEL-8) versions of
|
||||
# rpmbuild.
|
||||
pushd %{top_level_dir_name}
|
||||
# Add crypto policy and FIPS support
|
||||
%patch -P1001 -p1
|
||||
# Add EOPNOTSUPP patch
|
||||
# Add libpng update ahead of 25.0.3
|
||||
%patch -P2001 -p1
|
||||
# Add C2 patches
|
||||
%patch -P2002 -p1
|
||||
%patch -P2003 -p1
|
||||
popd # openjdk
|
||||
|
||||
# Patch NSS adapter
|
||||
pushd %{nssadapter_name}
|
||||
# Nothing to do
|
||||
%patch -P3001 -p1
|
||||
popd # nssadapter
|
||||
|
||||
# The OpenJDK version file includes the current
|
||||
@ -2602,90 +2633,18 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jul 14 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-3.1
|
||||
- Cleanup tagging and gating scripts to appease shellcheck:
|
||||
- * scripts/builds/build_vanilla.sh: Use an array to handle the varying arguments to rhpkg.
|
||||
- * scripts/builds/check_signatures.sh: Quote variable usage.
|
||||
- * scripts/builds/waive_issue.sh: Remove redundant 'test "x"' usage.
|
||||
- * scripts/builds/waive_leapp_issue.sh: Likewise.
|
||||
- * scripts/builds/waive_rpminspect.sh: Likewise.
|
||||
- * scripts/builds/waive_usual_rpminspect.sh: Likewise and add missing WORKING_DIR variable.
|
||||
- * scripts/builds/waive_usual_tier0.sh: Remove redundant 'test "x"' usage.
|
||||
- Remove macro references in comments where possible (%dnl not compatible enough yet)
|
||||
- Move version information and core NVR definitions back towards the top of the file
|
||||
- Add 25u backports of JDK-8347901 & JDK-8378713 C2 performance fixes
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Related: RHEL-155327
|
||||
- Related: RHEL-155339
|
||||
- Resolves: RHEL-150977
|
||||
- Resolves: RHEL-210972
|
||||
- Resolves: RHEL-210993
|
||||
* Thu Apr 16 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:25.0.2.0.10-2.alma.1
|
||||
- Use el9 portable packages
|
||||
|
||||
* Sat Apr 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-1
|
||||
- Update to jdk-25.0.3+9 (GA)
|
||||
- Update release notes to 25.0.3+9
|
||||
- Update FIPS patch to 57722aab802 version synced with 25.0.3+8
|
||||
- Drop local libpng patches now JDK-8372534, JDK-8375063 & JDK-8377526 are included upstream
|
||||
- Drop local HarfBuzz patch now JDK-8375057 is included upstream
|
||||
- Bump freetype version to 2.14.2 following JDK-8373290 & JDK-8379158
|
||||
- Bump giflib version to 6.1.2 following JDK-8379256 & JDK-8380078
|
||||
- Bump libpng version to 1.6.57 following JDK-8380959 & JDK-8382047
|
||||
- Bump zlib version to 1.3.2 following JDK-8378631
|
||||
- Bump tzdata version to 2026a following JDK-8379035
|
||||
- Add JDK-8375294 EOPNOTSUPP patch ahead of 25.0.4
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- ** This tarball is embargoed until 2026-04-21 @ 1pm PT. **
|
||||
- Resolves: RHEL-169620
|
||||
- Resolves: RHEL-157091
|
||||
- Resolves: RHEL-161217
|
||||
- Resolves: RHEL-161333
|
||||
- Resolves: RHEL-169613
|
||||
|
||||
* Thu Mar 12 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-4
|
||||
- Add tagging scripts with signature checks and gating handling
|
||||
- Update tagged versions to include 9.8.0-z, 9.9.0, 10.2-z & 10.3.
|
||||
- Add gating scripts to simplify obtaining results and waiving issues
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Resolves: RHEL-155327
|
||||
- Resolves: RHEL-155337
|
||||
- Resolves: RHEL-155339
|
||||
- Related: RHEL-155000
|
||||
- Related: RHEL-146649
|
||||
- Related: RHEL-148327
|
||||
- Related: RHEL-148830
|
||||
|
||||
* Wed Mar 11 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.2.0.10-3
|
||||
- Disable abidiff inspection in rpminspect.yaml to avoid an out-of-memory error on the CentOS test farm
|
||||
- See: https://docs.testing-farm.io/Testing%20Farm/0.1/errors.html#TFE-1
|
||||
- Resolves: RHEL-150976
|
||||
|
||||
* Tue Mar 03 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-3
|
||||
- Update FIPS patch to e55ada9353e to include the fix for the too restrictive provider lockdown
|
||||
- Fix FIPS issue list to represent the new 25u version
|
||||
- Add JDK-8375063 libpng 1.6.54 ahead of 25.0.3
|
||||
- Add JDK-8375057 harfbuzz 12.3.2 ahead of 25.0.3
|
||||
- Add JDK-8377526 libpng 1.6.55 ahead of 25.0.3
|
||||
- Bump libpng version to 1.6.55 following JDK-8375063 & JDK-8377526
|
||||
- Bump harfbuzz version to 12.3.2 following JDK-8375057
|
||||
- Bump nssadapter version to bring in shared PKCS11 session fix
|
||||
- Drop LDFLAGS nssadapter patch which is now upstream in 0.1.1
|
||||
- Resolves: RHEL-155000
|
||||
- Resolves: RHEL-146649
|
||||
- Resolves: RHEL-148327
|
||||
- Resolves: RHEL-148830
|
||||
- Resolves: RHEL-155044
|
||||
|
||||
* Wed Feb 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-2
|
||||
* Wed Jan 28 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-2
|
||||
- Bump rpmrelease for CentOS build
|
||||
- Related: RHEL-139579
|
||||
- Related: RHEL-131430
|
||||
- Related: RHEL-131443
|
||||
- Related: RHEL-142855
|
||||
- Related: RHEL-142799
|
||||
- Related: RHEL-139577
|
||||
- Related: RHEL-142856
|
||||
- Related: RHEL-142808
|
||||
|
||||
* Wed Jan 21 2026 Jiri Vanek <jvanek@redhat.com> - 1:25.0.2.0.10-1
|
||||
- Execute create-redhat-properties-files.bash with '-e' to exit on failure
|
||||
- Related: RHEL-142855
|
||||
- Related: RHEL-142856
|
||||
|
||||
* Mon Jan 12 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-1
|
||||
- Update to jdk-25.0.2+10 (GA)
|
||||
@ -2697,65 +2656,64 @@ exit 0
|
||||
- Handle 'upgrade' as an alternative to 'update' in openjdk_news.sh
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- ** This tarball is embargoed until 2026-01-20 @ 1pm PT. **
|
||||
- Resolves: RHEL-139579
|
||||
- Resolves: RHEL-131430
|
||||
- Resolves: RHEL-131443
|
||||
- Resolves: RHEL-142855
|
||||
- Resolves: RHEL-142799
|
||||
- Resolves: RHEL-139577
|
||||
- Resolves: RHEL-143373
|
||||
- Resolves: RHEL-143368
|
||||
- Resolves: RHEL-142856
|
||||
- Resolves: RHEL-142808
|
||||
|
||||
* Sat Dec 06 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-6
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Related: RHEL-133733
|
||||
- Related: RHEL-133735
|
||||
|
||||
* Thu Dec 04 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-6
|
||||
- Remove /usr/lib/jvm/java-25-openjdk/conf/security/redhat/fips.properties
|
||||
- Resolves: RHEL-131897
|
||||
|
||||
* Thu Dec 04 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-5
|
||||
* Mon Dec 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-2
|
||||
- Incorporate new FIPS patch for 25u
|
||||
- Drop static libjvm.a following adjusted build target for portable build
|
||||
- Remove redundant (and now outdated) build targets, jdkimage and static_libs_image
|
||||
- Pass ourflags and ourldflags into the nssadapter build using CFLAGS & LDFLAGS
|
||||
- Patch the nssadapter build to recognise LDFLAGS
|
||||
- Remove OpenJDK compiler flag filters and use build_{c,ld}flags directly
|
||||
- Resolves: RHEL-133733
|
||||
- Resolves: RHEL-133735
|
||||
- Resolves: RHEL-133763
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Resolves: RHEL-133743
|
||||
- Resolves: RHEL-133737
|
||||
- Related: RHEL-131898
|
||||
|
||||
* Wed Nov 26 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-4
|
||||
* Mon Dec 08 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-2
|
||||
- Add java-25-openjdk-crypto-adapter subpackage
|
||||
- Update library setting in create-redhat-properties-files.bash
|
||||
- Resolves: RHEL-131896
|
||||
- Remove /usr/lib/jvm/java-25-openjdk/conf/security/redhat/fips.properties
|
||||
- Resolves: RHEL-132520
|
||||
- Resolves: RHEL-132523
|
||||
|
||||
* Mon Nov 24 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-3
|
||||
* Fri Nov 28 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-1
|
||||
- Pass ourflags and ourldflags into the nssadapter build using CFLAGS & LDFLAGS
|
||||
- Patch the nssadapter build to recognise LDFLAGS
|
||||
- Resolves: RHEL-131898
|
||||
|
||||
* Mon Nov 24 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.1.0.8-1
|
||||
- Add libnssadapter.so
|
||||
- Add FIPS crypto-policies configuration
|
||||
- Remove obsolete security.useSystemPropertiesFile setup
|
||||
- Update TestSecurityProperties.java test and calling convention
|
||||
- Resolves: RHEL-128413
|
||||
- Resolves: RHEL-128409
|
||||
- Resolves: RHEL-128414
|
||||
- Resolves: RHEL-128412
|
||||
|
||||
* Wed Nov 12 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-2
|
||||
- Remove superfluous backslashes that cause two alternative commands to be combined
|
||||
- Related: RHEL-120553
|
||||
|
||||
* Mon Nov 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-1
|
||||
* Wed Nov 12 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-1
|
||||
- Create java-25-openjdk package based on java-21-openjdk
|
||||
- Update to jdk-25.0.1+8 (GA)
|
||||
- Update release notes with features of JDK 25
|
||||
- Update release notes with features of JDK 22, 23, 24 & 25
|
||||
- Mention finalisation JEP for features finalised in JDK 22, 23 & 24
|
||||
- Drop fakefeaturever now we have reached OpenJDK 25
|
||||
- Update release notes to 25.0.1+8
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Resolves: RHEL-120553
|
||||
|
||||
* Wed Nov 05 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:24.0.2.0.12-1
|
||||
- Update to jdk-24.0.2+12 (GA)
|
||||
- Update release notes with features of JDK 24
|
||||
- Update README file for java-25-openjdk
|
||||
- Make sure this is not the default/system JDK providing 'java', 'jre', 'java-devel' ,etc.
|
||||
- Remove 21u FIPS patch and disable use until we are ready for the 25 version
|
||||
- Adjust CLDR expectations in TestTranslations.java after JDK-8317979 started using tzdata values
|
||||
- Adjust TestTranslations.java to expect the same short name throughout for fr_FR and de_DE (bug?)
|
||||
- Remove references to libsystemconf.so and nss.fips.cfg from the 21u FIPS patch
|
||||
- Include static libraries in the vm_variant subdirectory after JDK-8307858 (libjvm.a)
|
||||
- Flip equals test in TestSecurityProperties.java to handle null values from Security.getProperty
|
||||
- Introduce crypto_policy_active to designate whether we should expect policy adherence in testing
|
||||
- Flip crypto_policy_active to false while the crypto policy & FIPS patch is not present
|
||||
- Handle new libsimdsort.so introduced on x86_64 only by JDK-8309130
|
||||
- Remove lible.so handling following its removal in JDK-8327476: "Upgrade JLine to 3.26.1"
|
||||
- Install jaxp-strict.properties.template added by JDK-8330542: "Template for Creating Strict JAXP Configuration File"
|
||||
- alt-java man page installation is now handled by the OpenJDK build
|
||||
- Adjust TestTranslations.java with updated German translations from CLDR 46 (JDK-8333582) (Mountain->Mountains)
|
||||
- Run javap with the disassembled code (-c) option now required for -l by JDK-8345145
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Remove default.policy and java.policy following JDK-8338411: "Permanently Disable the Security Manager"
|
||||
- Make man page handling dependent on pandoc being available during the portable build
|
||||
- Handle new CDS archive variants (*_coh*) added by Compact Object Headers (JDK-8305895)
|
||||
@ -2763,39 +2721,6 @@ exit 0
|
||||
- Support jnativescan added by JDK-8317611: "Add a tool like jdeprscan to find usage of restricted methods"
|
||||
- Add recent native libraries to _privatelibs (libjsvml.so, libsimdsort.so, libsyslookup.so)
|
||||
- Support libsleef on AArch64 & RISC-V added by JDK-8329816, JDK-8320500 (RISC-V) & JDK-8312425 (AArch64)
|
||||
- Related: RHEL-120553
|
||||
|
||||
* Sat Oct 25 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:23.0.2.0.7-1
|
||||
- Update to jdk-23.0.2+7 (GA)
|
||||
- Update release notes with features of JDK 23
|
||||
- Remove superfluous backslashes that cause two alternative commands to be combined
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Remove lible.so handling following its removal in JDK-8327476: "Upgrade JLine to 3.26.1"
|
||||
- Install jaxp-strict.properties.template added by JDK-8330542: "Template for Creating Strict JAXP Configuration File"
|
||||
- Related: RHEL-120553
|
||||
|
||||
* Tue Sep 23 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:22.0.2.0.9-1
|
||||
- Update to jdk-22.0.2+9 (GA)
|
||||
- Update release notes with features of JDK 22
|
||||
- Remove 21u FIPS patch and disable use until we are ready for the 25 version
|
||||
- Adjust CLDR expectations in TestTranslations.java after JDK-8317979 started using tzdata values
|
||||
- Adjust TestTranslations.java to expect the same short name throughout for fr_FR and de_DE (bug?)
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Remove references to libsystemconf.so and nss.fips.cfg from the 21u FIPS patch
|
||||
- Include static libraries in the vm_variant subdirectory after JDK-8307858 (libjvm.a)
|
||||
- Flip equals test in TestSecurityProperties.java to handle null values from Security.getProperty
|
||||
- Introduce crypto_policy_active to designate whether we should expect policy adherence in testing
|
||||
- Flip crypto_policy_active to false while the crypto policy & FIPS patch is not present
|
||||
- Handle new libsimdsort.so introduced on x86_64 only by JDK-8309130
|
||||
- Related: RHEL-100678
|
||||
|
||||
* Mon Aug 25 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1
|
||||
- Create java-25-openjdk package based on java-21-openjdk
|
||||
- Introduce fakefeaturever to pretend we are java-25-openjdk ahead of time
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Update README file for java-25-openjdk
|
||||
- Make sure this is not the default/system JDK providing 'java', 'jre', 'java-devel' ,etc.
|
||||
- Related: RHEL-100678
|
||||
|
||||
* Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1
|
||||
- Update to jdk-21.0.8+9 (GA)
|
||||
- Related: RHEL-100678
|
||||
- Resolves: RHEL-126022
|
||||
@ -1,7 +0,0 @@
|
||||
# recipients: java-qa
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
@ -1,772 +0,0 @@
|
||||
From 09853461a6896ab1f15469c753c21ca212e7e650 Mon Sep 17 00:00:00 2001
|
||||
From: duke <duke@openjdk.org>
|
||||
Date: Tue, 7 Apr 2026 15:14:53 +0000
|
||||
Subject: [PATCH 1/2] Backport ed70910b0f3e1b19d915ec13ac3434407d01bc5d
|
||||
|
||||
---
|
||||
src/hotspot/share/opto/callnode.cpp | 53 +++++++-
|
||||
src/hotspot/share/opto/callnode.hpp | 29 ++++-
|
||||
src/hotspot/share/opto/classes.hpp | 2 +
|
||||
src/hotspot/share/opto/compile.cpp | 19 +++
|
||||
src/hotspot/share/opto/divnode.cpp | 158 ++++++++++--------------
|
||||
src/hotspot/share/opto/divnode.hpp | 35 +++---
|
||||
src/hotspot/share/opto/graphKit.cpp | 29 +++--
|
||||
src/hotspot/share/opto/graphKit.hpp | 1 +
|
||||
src/hotspot/share/opto/library_call.cpp | 2 +-
|
||||
src/hotspot/share/opto/macro.cpp | 15 +--
|
||||
src/hotspot/share/opto/multnode.cpp | 13 ++
|
||||
src/hotspot/share/opto/multnode.hpp | 46 +++++++
|
||||
src/hotspot/share/opto/node.cpp | 12 +-
|
||||
src/hotspot/share/opto/node.hpp | 5 +-
|
||||
src/hotspot/share/opto/parse2.cpp | 8 +-
|
||||
15 files changed, 282 insertions(+), 145 deletions(-)
|
||||
|
||||
diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
|
||||
index 6f13ce0f809..fc4b0c35dff 100644
|
||||
--- a/src/hotspot/share/opto/callnode.cpp
|
||||
+++ b/src/hotspot/share/opto/callnode.cpp
|
||||
@@ -935,7 +935,7 @@ Node *CallNode::result_cast() {
|
||||
}
|
||||
|
||||
|
||||
-void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts) {
|
||||
+void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts) const {
|
||||
projs->fallthrough_proj = nullptr;
|
||||
projs->fallthrough_catchproj = nullptr;
|
||||
projs->fallthrough_ioproj = nullptr;
|
||||
@@ -1319,6 +1319,57 @@ void CallLeafVectorNode::calling_convention( BasicType* sig_bt, VMRegPair *parm_
|
||||
|
||||
|
||||
//=============================================================================
|
||||
+bool CallLeafPureNode::is_unused() const {
|
||||
+ return proj_out_or_null(TypeFunc::Parms) == nullptr;
|
||||
+}
|
||||
+
|
||||
+bool CallLeafPureNode::is_dead() const {
|
||||
+ return proj_out_or_null(TypeFunc::Control) == nullptr;
|
||||
+}
|
||||
+
|
||||
+/* We make a tuple of the global input state + TOP for the output values.
|
||||
+ * We use this to delete a pure function that is not used: by replacing the call with
|
||||
+ * such a tuple, we let output Proj's idealization pick the corresponding input of the
|
||||
+ * pure call, so jumping over it, and effectively, removing the call from the graph.
|
||||
+ * This avoids doing the graph surgery manually, but leaves that to IGVN
|
||||
+ * that is specialized for doing that right. We need also tuple components for output
|
||||
+ * values of the function to respect the return arity, and in case there is a projection
|
||||
+ * that would pick an output (which shouldn't happen at the moment).
|
||||
+ */
|
||||
+TupleNode* CallLeafPureNode::make_tuple_of_input_state_and_top_return_values(const Compile* C) const {
|
||||
+ // Transparently propagate input state but parameters
|
||||
+ TupleNode* tuple = TupleNode::make(
|
||||
+ tf()->range(),
|
||||
+ in(TypeFunc::Control),
|
||||
+ in(TypeFunc::I_O),
|
||||
+ in(TypeFunc::Memory),
|
||||
+ in(TypeFunc::FramePtr),
|
||||
+ in(TypeFunc::ReturnAdr));
|
||||
+
|
||||
+ // And add TOPs for the return values
|
||||
+ for (uint i = TypeFunc::Parms; i < tf()->range()->cnt(); i++) {
|
||||
+ tuple->set_req(i, C->top());
|
||||
+ }
|
||||
+
|
||||
+ return tuple;
|
||||
+}
|
||||
+
|
||||
+Node* CallLeafPureNode::Ideal(PhaseGVN* phase, bool can_reshape) {
|
||||
+ if (is_dead()) {
|
||||
+ return nullptr;
|
||||
+ }
|
||||
+
|
||||
+ // We need to wait until IGVN because during parsing, usages might still be missing
|
||||
+ // and we would remove the call immediately.
|
||||
+ if (can_reshape && is_unused()) {
|
||||
+ // The result is not used. We remove the call by replacing it with a tuple, that
|
||||
+ // is later disintegrated by the projections.
|
||||
+ return make_tuple_of_input_state_and_top_return_values(phase->C);
|
||||
+ }
|
||||
+
|
||||
+ return CallRuntimeNode::Ideal(phase, can_reshape);
|
||||
+}
|
||||
+
|
||||
#ifndef PRODUCT
|
||||
void CallLeafNode::dump_spec(outputStream *st) const {
|
||||
st->print("# ");
|
||||
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
|
||||
index 213fbda4e89..2462a88143f 100644
|
||||
--- a/src/hotspot/share/opto/callnode.hpp
|
||||
+++ b/src/hotspot/share/opto/callnode.hpp
|
||||
@@ -752,7 +752,7 @@ class CallNode : public SafePointNode {
|
||||
// Collect all the interesting edges from a call for use in
|
||||
// replacing the call by something else. Used by macro expansion
|
||||
// and the late inlining support.
|
||||
- void extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts = true);
|
||||
+ void extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts = true) const;
|
||||
|
||||
virtual uint match_edge(uint idx) const;
|
||||
|
||||
@@ -928,6 +928,33 @@ class CallLeafNode : public CallRuntimeNode {
|
||||
#endif
|
||||
};
|
||||
|
||||
+/* A pure function call, they are assumed not to be safepoints, not to read or write memory,
|
||||
+ * have no exception... They just take parameters, return a value without side effect. It is
|
||||
+ * always correct to create some, or remove them, if the result is not used.
|
||||
+ *
|
||||
+ * They still have control input to allow easy lowering into other kind of calls that require
|
||||
+ * a control, but this is more a technical than a moral constraint.
|
||||
+ *
|
||||
+ * Pure calls must have only control and data input and output: I/O, Memory and so on must be top.
|
||||
+ * Nevertheless, pure calls can typically be expensive math operations so care must be taken
|
||||
+ * when letting the node float.
|
||||
+ */
|
||||
+class CallLeafPureNode : public CallLeafNode {
|
||||
+protected:
|
||||
+ bool is_unused() const;
|
||||
+ bool is_dead() const;
|
||||
+ TupleNode* make_tuple_of_input_state_and_top_return_values(const Compile* C) const;
|
||||
+
|
||||
+public:
|
||||
+ CallLeafPureNode(const TypeFunc* tf, address addr, const char* name,
|
||||
+ const TypePtr* adr_type)
|
||||
+ : CallLeafNode(tf, addr, name, adr_type) {
|
||||
+ init_class_id(Class_CallLeafPure);
|
||||
+ }
|
||||
+ int Opcode() const override;
|
||||
+ Node* Ideal(PhaseGVN* phase, bool can_reshape) override;
|
||||
+};
|
||||
+
|
||||
//------------------------------CallLeafNoFPNode-------------------------------
|
||||
// CallLeafNode, not using floating point or using it in the same manner as
|
||||
// the generated code
|
||||
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
|
||||
index bc259eed2d1..587d5fad8f2 100644
|
||||
--- a/src/hotspot/share/opto/classes.hpp
|
||||
+++ b/src/hotspot/share/opto/classes.hpp
|
||||
@@ -61,6 +61,7 @@ macro(CallDynamicJava)
|
||||
macro(CallJava)
|
||||
macro(CallLeaf)
|
||||
macro(CallLeafNoFP)
|
||||
+macro(CallLeafPure)
|
||||
macro(CallLeafVector)
|
||||
macro(CallRuntime)
|
||||
macro(CallStaticJava)
|
||||
@@ -372,6 +373,7 @@ macro(SubI)
|
||||
macro(SubL)
|
||||
macro(TailCall)
|
||||
macro(TailJump)
|
||||
+macro(Tuple)
|
||||
macro(MacroLogicV)
|
||||
macro(ThreadLocal)
|
||||
macro(Unlock)
|
||||
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
|
||||
index 2b956dcb5d8..9f7f48b9a34 100644
|
||||
--- a/src/hotspot/share/opto/compile.cpp
|
||||
+++ b/src/hotspot/share/opto/compile.cpp
|
||||
@@ -3298,6 +3298,25 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
|
||||
case Op_Opaque1: // Remove Opaque Nodes before matching
|
||||
n->subsume_by(n->in(1), this);
|
||||
break;
|
||||
+ case Op_CallLeafPure: {
|
||||
+ // If the pure call is not supported, then lower to a CallLeaf.
|
||||
+ if (!Matcher::match_rule_supported(Op_CallLeafPure)) {
|
||||
+ CallNode* call = n->as_Call();
|
||||
+ CallNode* new_call = new CallLeafNode(call->tf(), call->entry_point(),
|
||||
+ call->_name, TypeRawPtr::BOTTOM);
|
||||
+ new_call->init_req(TypeFunc::Control, call->in(TypeFunc::Control));
|
||||
+ new_call->init_req(TypeFunc::I_O, C->top());
|
||||
+ new_call->init_req(TypeFunc::Memory, C->top());
|
||||
+ new_call->init_req(TypeFunc::ReturnAdr, C->top());
|
||||
+ new_call->init_req(TypeFunc::FramePtr, C->top());
|
||||
+ for (unsigned int i = TypeFunc::Parms; i < call->tf()->domain()->cnt(); i++) {
|
||||
+ new_call->init_req(i, call->in(i));
|
||||
+ }
|
||||
+ n->subsume_by(new_call, this);
|
||||
+ }
|
||||
+ frc.inc_call_count();
|
||||
+ break;
|
||||
+ }
|
||||
case Op_CallStaticJava:
|
||||
case Op_CallJava:
|
||||
case Op_CallDynamicJava:
|
||||
diff --git a/src/hotspot/share/opto/divnode.cpp b/src/hotspot/share/opto/divnode.cpp
|
||||
index a70194274a7..5dd8be877ff 100644
|
||||
--- a/src/hotspot/share/opto/divnode.cpp
|
||||
+++ b/src/hotspot/share/opto/divnode.cpp
|
||||
@@ -42,19 +42,19 @@
|
||||
|
||||
#include <math.h>
|
||||
|
||||
-ModFloatingNode::ModFloatingNode(Compile* C, const TypeFunc* tf, const char* name) : CallLeafNode(tf, nullptr, name, TypeRawPtr::BOTTOM) {
|
||||
+ModFloatingNode::ModFloatingNode(Compile* C, const TypeFunc* tf, address addr, const char* name) : CallLeafPureNode(tf, addr, name, TypeRawPtr::BOTTOM) {
|
||||
add_flag(Flag_is_macro);
|
||||
C->add_macro_node(this);
|
||||
}
|
||||
|
||||
-ModDNode::ModDNode(Compile* C, Node* a, Node* b) : ModFloatingNode(C, OptoRuntime::Math_DD_D_Type(), "drem") {
|
||||
+ModDNode::ModDNode(Compile* C, Node* a, Node* b) : ModFloatingNode(C, OptoRuntime::Math_DD_D_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::drem), "drem") {
|
||||
init_req(TypeFunc::Parms + 0, a);
|
||||
init_req(TypeFunc::Parms + 1, C->top());
|
||||
init_req(TypeFunc::Parms + 2, b);
|
||||
init_req(TypeFunc::Parms + 3, C->top());
|
||||
}
|
||||
|
||||
-ModFNode::ModFNode(Compile* C, Node* a, Node* b) : ModFloatingNode(C, OptoRuntime::modf_Type(), "frem") {
|
||||
+ModFNode::ModFNode(Compile* C, Node* a, Node* b) : ModFloatingNode(C, OptoRuntime::modf_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::frem), "frem") {
|
||||
init_req(TypeFunc::Parms + 0, a);
|
||||
init_req(TypeFunc::Parms + 1, b);
|
||||
}
|
||||
@@ -1516,137 +1516,109 @@ const Type* UModLNode::Value(PhaseGVN* phase) const {
|
||||
return unsigned_mod_value<TypeLong, julong, jlong>(phase, this);
|
||||
}
|
||||
|
||||
-Node* ModFNode::Ideal(PhaseGVN* phase, bool can_reshape) {
|
||||
- if (!can_reshape) {
|
||||
- return nullptr;
|
||||
- }
|
||||
- PhaseIterGVN* igvn = phase->is_IterGVN();
|
||||
-
|
||||
- bool result_is_unused = proj_out_or_null(TypeFunc::Parms) == nullptr;
|
||||
- bool not_dead = proj_out_or_null(TypeFunc::Control) != nullptr;
|
||||
- if (result_is_unused && not_dead) {
|
||||
- return replace_with_con(igvn, TypeF::make(0.));
|
||||
- }
|
||||
-
|
||||
- // Either input is TOP ==> the result is TOP
|
||||
- const Type* t1 = phase->type(dividend());
|
||||
- const Type* t2 = phase->type(divisor());
|
||||
- if (t1 == Type::TOP || t2 == Type::TOP) {
|
||||
- return phase->C->top();
|
||||
- }
|
||||
-
|
||||
+const Type* ModFNode::get_result_if_constant(const Type* dividend, const Type* divisor) const {
|
||||
// If either number is not a constant, we know nothing.
|
||||
- if ((t1->base() != Type::FloatCon) || (t2->base() != Type::FloatCon)) {
|
||||
+ if ((dividend->base() != Type::FloatCon) || (divisor->base() != Type::FloatCon)) {
|
||||
return nullptr; // note: x%x can be either NaN or 0
|
||||
}
|
||||
|
||||
- float f1 = t1->getf();
|
||||
- float f2 = t2->getf();
|
||||
- jint x1 = jint_cast(f1); // note: *(int*)&f1, not just (int)f1
|
||||
- jint x2 = jint_cast(f2);
|
||||
+ float dividend_f = dividend->getf();
|
||||
+ float divisor_f = divisor->getf();
|
||||
+ jint dividend_i = jint_cast(dividend_f); // note: *(int*)&f1, not just (int)f1
|
||||
+ jint divisor_i = jint_cast(divisor_f);
|
||||
|
||||
// If either is a NaN, return an input NaN
|
||||
- if (g_isnan(f1)) {
|
||||
- return replace_with_con(igvn, t1);
|
||||
+ if (g_isnan(dividend_f)) {
|
||||
+ return dividend;
|
||||
}
|
||||
- if (g_isnan(f2)) {
|
||||
- return replace_with_con(igvn, t2);
|
||||
+ if (g_isnan(divisor_f)) {
|
||||
+ return divisor;
|
||||
}
|
||||
|
||||
// If an operand is infinity or the divisor is +/- zero, punt.
|
||||
- if (!g_isfinite(f1) || !g_isfinite(f2) || x2 == 0 || x2 == min_jint) {
|
||||
+ if (!g_isfinite(dividend_f) || !g_isfinite(divisor_f) || divisor_i == 0 || divisor_i == min_jint) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// We must be modulo'ing 2 float constants.
|
||||
// Make sure that the sign of the fmod is equal to the sign of the dividend
|
||||
- jint xr = jint_cast(fmod(f1, f2));
|
||||
- if ((x1 ^ xr) < 0) {
|
||||
+ jint xr = jint_cast(fmod(dividend_f, divisor_f));
|
||||
+ if ((dividend_i ^ xr) < 0) {
|
||||
xr ^= min_jint;
|
||||
}
|
||||
|
||||
- return replace_with_con(igvn, TypeF::make(jfloat_cast(xr)));
|
||||
+ return TypeF::make(jfloat_cast(xr));
|
||||
}
|
||||
|
||||
-Node* ModDNode::Ideal(PhaseGVN* phase, bool can_reshape) {
|
||||
- if (!can_reshape) {
|
||||
- return nullptr;
|
||||
- }
|
||||
- PhaseIterGVN* igvn = phase->is_IterGVN();
|
||||
-
|
||||
- bool result_is_unused = proj_out_or_null(TypeFunc::Parms) == nullptr;
|
||||
- bool not_dead = proj_out_or_null(TypeFunc::Control) != nullptr;
|
||||
- if (result_is_unused && not_dead) {
|
||||
- return replace_with_con(igvn, TypeD::make(0.));
|
||||
- }
|
||||
-
|
||||
- // Either input is TOP ==> the result is TOP
|
||||
- const Type* t1 = phase->type(dividend());
|
||||
- const Type* t2 = phase->type(divisor());
|
||||
- if (t1 == Type::TOP || t2 == Type::TOP) {
|
||||
- return nullptr;
|
||||
- }
|
||||
-
|
||||
+const Type* ModDNode::get_result_if_constant(const Type* dividend, const Type* divisor) const {
|
||||
// If either number is not a constant, we know nothing.
|
||||
- if ((t1->base() != Type::DoubleCon) || (t2->base() != Type::DoubleCon)) {
|
||||
+ if ((dividend->base() != Type::DoubleCon) || (divisor->base() != Type::DoubleCon)) {
|
||||
return nullptr; // note: x%x can be either NaN or 0
|
||||
}
|
||||
|
||||
- double f1 = t1->getd();
|
||||
- double f2 = t2->getd();
|
||||
- jlong x1 = jlong_cast(f1); // note: *(long*)&f1, not just (long)f1
|
||||
- jlong x2 = jlong_cast(f2);
|
||||
+ double dividend_d = dividend->getd();
|
||||
+ double divisor_d = divisor->getd();
|
||||
+ jlong dividend_l = jlong_cast(dividend_d); // note: *(long*)&f1, not just (long)f1
|
||||
+ jlong divisor_l = jlong_cast(divisor_d);
|
||||
|
||||
// If either is a NaN, return an input NaN
|
||||
- if (g_isnan(f1)) {
|
||||
- return replace_with_con(igvn, t1);
|
||||
+ if (g_isnan(dividend_d)) {
|
||||
+ return dividend;
|
||||
}
|
||||
- if (g_isnan(f2)) {
|
||||
- return replace_with_con(igvn, t2);
|
||||
+ if (g_isnan(divisor_d)) {
|
||||
+ return divisor;
|
||||
}
|
||||
|
||||
// If an operand is infinity or the divisor is +/- zero, punt.
|
||||
- if (!g_isfinite(f1) || !g_isfinite(f2) || x2 == 0 || x2 == min_jlong) {
|
||||
+ if (!g_isfinite(dividend_d) || !g_isfinite(divisor_d) || divisor_l == 0 || divisor_l == min_jlong) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// We must be modulo'ing 2 double constants.
|
||||
// Make sure that the sign of the fmod is equal to the sign of the dividend
|
||||
- jlong xr = jlong_cast(fmod(f1, f2));
|
||||
- if ((x1 ^ xr) < 0) {
|
||||
+ jlong xr = jlong_cast(fmod(dividend_d, divisor_d));
|
||||
+ if ((dividend_l ^ xr) < 0) {
|
||||
xr ^= min_jlong;
|
||||
}
|
||||
|
||||
- return replace_with_con(igvn, TypeD::make(jdouble_cast(xr)));
|
||||
+ return TypeD::make(jdouble_cast(xr));
|
||||
}
|
||||
|
||||
-Node* ModFloatingNode::replace_with_con(PhaseIterGVN* phase, const Type* con) {
|
||||
- Compile* C = phase->C;
|
||||
- Node* con_node = phase->makecon(con);
|
||||
- CallProjections projs;
|
||||
- extract_projections(&projs, false, false);
|
||||
- phase->replace_node(projs.fallthrough_proj, in(TypeFunc::Control));
|
||||
- if (projs.fallthrough_catchproj != nullptr) {
|
||||
- phase->replace_node(projs.fallthrough_catchproj, in(TypeFunc::Control));
|
||||
- }
|
||||
- if (projs.fallthrough_memproj != nullptr) {
|
||||
- phase->replace_node(projs.fallthrough_memproj, in(TypeFunc::Memory));
|
||||
- }
|
||||
- if (projs.catchall_memproj != nullptr) {
|
||||
- phase->replace_node(projs.catchall_memproj, C->top());
|
||||
- }
|
||||
- if (projs.fallthrough_ioproj != nullptr) {
|
||||
- phase->replace_node(projs.fallthrough_ioproj, in(TypeFunc::I_O));
|
||||
- }
|
||||
- assert(projs.catchall_ioproj == nullptr, "no exceptions from floating mod");
|
||||
- assert(projs.catchall_catchproj == nullptr, "no exceptions from floating mod");
|
||||
- if (projs.resproj != nullptr) {
|
||||
- phase->replace_node(projs.resproj, con_node);
|
||||
+Node* ModFloatingNode::Ideal(PhaseGVN* phase, bool can_reshape) {
|
||||
+ if (can_reshape) {
|
||||
+ PhaseIterGVN* igvn = phase->is_IterGVN();
|
||||
+
|
||||
+ // Either input is TOP ==> the result is TOP
|
||||
+ const Type* dividend_type = phase->type(dividend());
|
||||
+ const Type* divisor_type = phase->type(divisor());
|
||||
+ if (dividend_type == Type::TOP || divisor_type == Type::TOP) {
|
||||
+ return phase->C->top();
|
||||
+ }
|
||||
+ const Type* constant_result = get_result_if_constant(dividend_type, divisor_type);
|
||||
+ if (constant_result != nullptr) {
|
||||
+ return make_tuple_of_input_state_and_constant_result(igvn, constant_result);
|
||||
+ }
|
||||
}
|
||||
- phase->replace_node(this, C->top());
|
||||
- C->remove_macro_node(this);
|
||||
- disconnect_inputs(C);
|
||||
- return nullptr;
|
||||
+
|
||||
+ return CallLeafPureNode::Ideal(phase, can_reshape);
|
||||
+}
|
||||
+
|
||||
+/* Give a tuple node for ::Ideal to return, made of the input state (control to return addr)
|
||||
+ * and the given constant result. Idealization of projections will make sure to transparently
|
||||
+ * propagate the input state and replace the result by the said constant.
|
||||
+ */
|
||||
+TupleNode* ModFloatingNode::make_tuple_of_input_state_and_constant_result(PhaseIterGVN* phase, const Type* con) const {
|
||||
+ Node* con_node = phase->makecon(con);
|
||||
+ TupleNode* tuple = TupleNode::make(
|
||||
+ tf()->range(),
|
||||
+ in(TypeFunc::Control),
|
||||
+ in(TypeFunc::I_O),
|
||||
+ in(TypeFunc::Memory),
|
||||
+ in(TypeFunc::FramePtr),
|
||||
+ in(TypeFunc::ReturnAdr),
|
||||
+ con_node);
|
||||
+
|
||||
+ return tuple;
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
diff --git a/src/hotspot/share/opto/divnode.hpp b/src/hotspot/share/opto/divnode.hpp
|
||||
index 127e2431b0b..b13460c89f5 100644
|
||||
--- a/src/hotspot/share/opto/divnode.hpp
|
||||
+++ b/src/hotspot/share/opto/divnode.hpp
|
||||
@@ -156,40 +156,45 @@ class ModLNode : public Node {
|
||||
};
|
||||
|
||||
// Base class for float and double modulus
|
||||
-class ModFloatingNode : public CallLeafNode {
|
||||
+class ModFloatingNode : public CallLeafPureNode {
|
||||
+ TupleNode* make_tuple_of_input_state_and_constant_result(PhaseIterGVN* phase, const Type* con) const;
|
||||
+
|
||||
protected:
|
||||
- Node* replace_with_con(PhaseIterGVN* phase, const Type* con);
|
||||
+ virtual Node* dividend() const = 0;
|
||||
+ virtual Node* divisor() const = 0;
|
||||
+ virtual const Type* get_result_if_constant(const Type* dividend, const Type* divisor) const = 0;
|
||||
|
||||
public:
|
||||
- ModFloatingNode(Compile* C, const TypeFunc* tf, const char *name);
|
||||
+ ModFloatingNode(Compile* C, const TypeFunc* tf, address addr, const char* name);
|
||||
+ Node* Ideal(PhaseGVN* phase, bool can_reshape) override;
|
||||
};
|
||||
|
||||
// Float Modulus
|
||||
class ModFNode : public ModFloatingNode {
|
||||
private:
|
||||
- Node* dividend() const { return in(TypeFunc::Parms + 0); }
|
||||
- Node* divisor() const { return in(TypeFunc::Parms + 1); }
|
||||
+ Node* dividend() const override { return in(TypeFunc::Parms + 0); }
|
||||
+ Node* divisor() const override { return in(TypeFunc::Parms + 1); }
|
||||
+ const Type* get_result_if_constant(const Type* dividend, const Type* divisor) const override;
|
||||
|
||||
public:
|
||||
ModFNode(Compile* C, Node* a, Node* b);
|
||||
- virtual int Opcode() const;
|
||||
- virtual uint ideal_reg() const { return Op_RegF; }
|
||||
- virtual uint size_of() const { return sizeof(*this); }
|
||||
- virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
|
||||
+ int Opcode() const override;
|
||||
+ uint ideal_reg() const override { return Op_RegF; }
|
||||
+ uint size_of() const override { return sizeof(*this); }
|
||||
};
|
||||
|
||||
// Double Modulus
|
||||
class ModDNode : public ModFloatingNode {
|
||||
private:
|
||||
- Node* dividend() const { return in(TypeFunc::Parms + 0); }
|
||||
- Node* divisor() const { return in(TypeFunc::Parms + 2); }
|
||||
+ Node* dividend() const override { return in(TypeFunc::Parms + 0); }
|
||||
+ Node* divisor() const override { return in(TypeFunc::Parms + 2); }
|
||||
+ const Type* get_result_if_constant(const Type* dividend, const Type* divisor) const override;
|
||||
|
||||
public:
|
||||
ModDNode(Compile* C, Node* a, Node* b);
|
||||
- virtual int Opcode() const;
|
||||
- virtual uint ideal_reg() const { return Op_RegD; }
|
||||
- virtual uint size_of() const { return sizeof(*this); }
|
||||
- virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
|
||||
+ int Opcode() const override;
|
||||
+ uint ideal_reg() const override { return Op_RegD; }
|
||||
+ uint size_of() const override { return sizeof(*this); }
|
||||
};
|
||||
|
||||
//------------------------------UModINode---------------------------------------
|
||||
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
|
||||
index 20feca26ede..1b8b7008578 100644
|
||||
--- a/src/hotspot/share/opto/graphKit.cpp
|
||||
+++ b/src/hotspot/share/opto/graphKit.cpp
|
||||
@@ -1880,14 +1880,20 @@ Node* GraphKit::set_results_for_java_call(CallJavaNode* call, bool separate_io_p
|
||||
// after the call, if this call has restricted memory effects.
|
||||
Node* GraphKit::set_predefined_input_for_runtime_call(SafePointNode* call, Node* narrow_mem) {
|
||||
// Set fixed predefined input arguments
|
||||
- Node* memory = reset_memory();
|
||||
- Node* m = narrow_mem == nullptr ? memory : narrow_mem;
|
||||
- call->init_req( TypeFunc::Control, control() );
|
||||
- call->init_req( TypeFunc::I_O, top() ); // does no i/o
|
||||
- call->init_req( TypeFunc::Memory, m ); // may gc ptrs
|
||||
- call->init_req( TypeFunc::FramePtr, frameptr() );
|
||||
- call->init_req( TypeFunc::ReturnAdr, top() );
|
||||
- return memory;
|
||||
+ call->init_req(TypeFunc::Control, control());
|
||||
+ call->init_req(TypeFunc::I_O, top()); // does no i/o
|
||||
+ call->init_req(TypeFunc::ReturnAdr, top());
|
||||
+ if (call->is_CallLeafPure()) {
|
||||
+ call->init_req(TypeFunc::Memory, top());
|
||||
+ call->init_req(TypeFunc::FramePtr, top());
|
||||
+ return nullptr;
|
||||
+ } else {
|
||||
+ Node* memory = reset_memory();
|
||||
+ Node* m = narrow_mem == nullptr ? memory : narrow_mem;
|
||||
+ call->init_req(TypeFunc::Memory, m); // may gc ptrs
|
||||
+ call->init_req(TypeFunc::FramePtr, frameptr());
|
||||
+ return memory;
|
||||
+ }
|
||||
}
|
||||
|
||||
//-------------------set_predefined_output_for_runtime_call--------------------
|
||||
@@ -1905,6 +1911,11 @@ void GraphKit::set_predefined_output_for_runtime_call(Node* call,
|
||||
const TypePtr* hook_mem) {
|
||||
// no i/o
|
||||
set_control(_gvn.transform( new ProjNode(call,TypeFunc::Control) ));
|
||||
+ if (call->is_CallLeafPure()) {
|
||||
+ // Pure function have only control (for now) and data output, in particular
|
||||
+ // they don't touch the memory, so we don't want a memory proj that is set after.
|
||||
+ return;
|
||||
+ }
|
||||
if (keep_mem) {
|
||||
// First clone the existing memory state
|
||||
set_all_memory(keep_mem);
|
||||
@@ -2491,6 +2502,8 @@ Node* GraphKit::make_runtime_call(int flags,
|
||||
} else if (flags & RC_VECTOR){
|
||||
uint num_bits = call_type->range()->field_at(TypeFunc::Parms)->is_vect()->length_in_bytes() * BitsPerByte;
|
||||
call = new CallLeafVectorNode(call_type, call_addr, call_name, adr_type, num_bits);
|
||||
+ } else if (flags & RC_PURE) {
|
||||
+ call = new CallLeafPureNode(call_type, call_addr, call_name, adr_type);
|
||||
} else {
|
||||
call = new CallLeafNode(call_type, call_addr, call_name, adr_type);
|
||||
}
|
||||
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
|
||||
index 28773d75333..806a211d7e2 100644
|
||||
--- a/src/hotspot/share/opto/graphKit.hpp
|
||||
+++ b/src/hotspot/share/opto/graphKit.hpp
|
||||
@@ -784,6 +784,7 @@ class GraphKit : public Phase {
|
||||
RC_NARROW_MEM = 16, // input memory is same as output
|
||||
RC_UNCOMMON = 32, // freq. expected to be like uncommon trap
|
||||
RC_VECTOR = 64, // CallLeafVectorNode
|
||||
+ RC_PURE = 128, // CallLeaf is pure
|
||||
RC_LEAF = 0 // null value: no flags set
|
||||
};
|
||||
|
||||
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
|
||||
index f74af38387c..12960d101a8 100644
|
||||
--- a/src/hotspot/share/opto/library_call.cpp
|
||||
+++ b/src/hotspot/share/opto/library_call.cpp
|
||||
@@ -1802,7 +1802,7 @@ bool LibraryCallKit::runtime_math(const TypeFunc* call_type, address funcAddr, c
|
||||
Node* b = (call_type == OptoRuntime::Math_DD_D_Type()) ? argument(2) : nullptr;
|
||||
|
||||
const TypePtr* no_memory_effects = nullptr;
|
||||
- Node* trig = make_runtime_call(RC_LEAF, call_type, funcAddr, funcName,
|
||||
+ Node* trig = make_runtime_call(RC_LEAF | RC_PURE, call_type, funcAddr, funcName,
|
||||
no_memory_effects,
|
||||
a, top(), b, b ? top() : nullptr);
|
||||
Node* value = _gvn.transform(new ProjNode(trig, TypeFunc::Parms+0));
|
||||
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
|
||||
index acf1dbabf19..aafc5d3c170 100644
|
||||
--- a/src/hotspot/share/opto/macro.cpp
|
||||
+++ b/src/hotspot/share/opto/macro.cpp
|
||||
@@ -2638,17 +2638,14 @@ bool PhaseMacroExpand::expand_macro_nodes() {
|
||||
switch (n->Opcode()) {
|
||||
case Op_ModD:
|
||||
case Op_ModF: {
|
||||
- bool is_drem = n->Opcode() == Op_ModD;
|
||||
CallNode* mod_macro = n->as_Call();
|
||||
- CallNode* call = new CallLeafNode(mod_macro->tf(),
|
||||
- is_drem ? CAST_FROM_FN_PTR(address, SharedRuntime::drem)
|
||||
- : CAST_FROM_FN_PTR(address, SharedRuntime::frem),
|
||||
- is_drem ? "drem" : "frem", TypeRawPtr::BOTTOM);
|
||||
+ CallNode* call = new CallLeafPureNode(mod_macro->tf(), mod_macro->entry_point(),
|
||||
+ mod_macro->_name, TypeRawPtr::BOTTOM);
|
||||
call->init_req(TypeFunc::Control, mod_macro->in(TypeFunc::Control));
|
||||
- call->init_req(TypeFunc::I_O, mod_macro->in(TypeFunc::I_O));
|
||||
- call->init_req(TypeFunc::Memory, mod_macro->in(TypeFunc::Memory));
|
||||
- call->init_req(TypeFunc::ReturnAdr, mod_macro->in(TypeFunc::ReturnAdr));
|
||||
- call->init_req(TypeFunc::FramePtr, mod_macro->in(TypeFunc::FramePtr));
|
||||
+ call->init_req(TypeFunc::I_O, C->top());
|
||||
+ call->init_req(TypeFunc::Memory, C->top());
|
||||
+ call->init_req(TypeFunc::ReturnAdr, C->top());
|
||||
+ call->init_req(TypeFunc::FramePtr, C->top());
|
||||
for (unsigned int i = 0; i < mod_macro->tf()->domain()->cnt() - TypeFunc::Parms; i++) {
|
||||
call->init_req(TypeFunc::Parms + i, mod_macro->in(TypeFunc::Parms + i));
|
||||
}
|
||||
diff --git a/src/hotspot/share/opto/multnode.cpp b/src/hotspot/share/opto/multnode.cpp
|
||||
index 736e84315ee..f429d5daac0 100644
|
||||
--- a/src/hotspot/share/opto/multnode.cpp
|
||||
+++ b/src/hotspot/share/opto/multnode.cpp
|
||||
@@ -120,6 +120,10 @@ const TypePtr *ProjNode::adr_type() const {
|
||||
if (bottom_type() == Type::MEMORY) {
|
||||
// in(0) might be a narrow MemBar; otherwise we will report TypePtr::BOTTOM
|
||||
Node* ctrl = in(0);
|
||||
+ if (ctrl->Opcode() == Op_Tuple) {
|
||||
+ // Jumping over Tuples: the i-th projection of a Tuple is the i-th input of the Tuple.
|
||||
+ ctrl = ctrl->in(_con);
|
||||
+ }
|
||||
if (ctrl == nullptr) return nullptr; // node is dead
|
||||
const TypePtr* adr_type = ctrl->adr_type();
|
||||
#ifdef ASSERT
|
||||
@@ -163,6 +167,15 @@ void ProjNode::check_con() const {
|
||||
assert(_con < t->is_tuple()->cnt(), "ProjNode::_con must be in range");
|
||||
}
|
||||
|
||||
+//------------------------------Identity---------------------------------------
|
||||
+Node* ProjNode::Identity(PhaseGVN* phase) {
|
||||
+ if (in(0) != nullptr && in(0)->Opcode() == Op_Tuple) {
|
||||
+ // Jumping over Tuples: the i-th projection of a Tuple is the i-th input of the Tuple.
|
||||
+ return in(0)->in(_con);
|
||||
+ }
|
||||
+ return this;
|
||||
+}
|
||||
+
|
||||
//------------------------------Value------------------------------------------
|
||||
const Type* ProjNode::Value(PhaseGVN* phase) const {
|
||||
if (in(0) == nullptr) return Type::TOP;
|
||||
diff --git a/src/hotspot/share/opto/multnode.hpp b/src/hotspot/share/opto/multnode.hpp
|
||||
index dff2caed38d..834dcfdca6d 100644
|
||||
--- a/src/hotspot/share/opto/multnode.hpp
|
||||
+++ b/src/hotspot/share/opto/multnode.hpp
|
||||
@@ -82,6 +82,7 @@ class ProjNode : public Node {
|
||||
virtual const Type *bottom_type() const;
|
||||
virtual const TypePtr *adr_type() const;
|
||||
virtual bool pinned() const;
|
||||
+ virtual Node* Identity(PhaseGVN* phase);
|
||||
virtual const Type* Value(PhaseGVN* phase) const;
|
||||
virtual uint ideal_reg() const;
|
||||
virtual const RegMask &out_RegMask() const;
|
||||
@@ -105,4 +106,49 @@ class ProjNode : public Node {
|
||||
ProjNode* other_if_proj() const;
|
||||
};
|
||||
|
||||
+/* Tuples are used to avoid manual graph surgery. When a node with Proj outputs (such as a call)
|
||||
+ * must be removed and its ouputs replaced by its input, or some other value, we can make its
|
||||
+ * ::Ideal return a tuple of what we want for each output: the ::Identity of output Proj will
|
||||
+ * take care to jump over the Tuple and directly pick up the right input of the Tuple.
|
||||
+ *
|
||||
+ * For instance, if a function call is proven to have no side effect and return the constant 0,
|
||||
+ * we can replace it with the 6-tuple:
|
||||
+ * (control input, IO input, memory input, frame ptr input, return addr input, Con:0)
|
||||
+ * all the output projections will pick up the input of the now gone call, except for the result
|
||||
+ * projection that is replaced by 0.
|
||||
+ *
|
||||
+ * Using TupleNode avoid manual graph surgery and leave that to our expert surgeon: IGVN.
|
||||
+ * Since the user of a Tuple are expected to be Proj, when creating a tuple during idealization,
|
||||
+ * the output Proj should be enqueued for IGVN immediately after, and the tuple should not survive
|
||||
+ * after the current IGVN.
|
||||
+ */
|
||||
+class TupleNode : public MultiNode {
|
||||
+ const TypeTuple* _tf;
|
||||
+
|
||||
+ template <typename... NN>
|
||||
+ static void make_helper(TupleNode* tn, uint i, Node* node, NN... nn) {
|
||||
+ tn->set_req(i, node);
|
||||
+ make_helper(tn, i + 1, nn...);
|
||||
+ }
|
||||
+
|
||||
+ static void make_helper(TupleNode*, uint) {}
|
||||
+
|
||||
+public:
|
||||
+ TupleNode(const TypeTuple* tf) : MultiNode(tf->cnt()), _tf(tf) {}
|
||||
+
|
||||
+ int Opcode() const override;
|
||||
+ const Type* bottom_type() const override { return _tf; }
|
||||
+
|
||||
+ /* Give as many `Node*` as you want in the `nn` pack:
|
||||
+ * TupleNode::make(tf, input1)
|
||||
+ * TupleNode::make(tf, input1, input2, input3, input4)
|
||||
+ */
|
||||
+ template <typename... NN>
|
||||
+ static TupleNode* make(const TypeTuple* tf, NN... nn) {
|
||||
+ TupleNode* tn = new TupleNode(tf);
|
||||
+ make_helper(tn, 0, nn...);
|
||||
+ return tn;
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
#endif // SHARE_OPTO_MULTNODE_HPP
|
||||
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
|
||||
index 8f6c67c16f5..5ecc038954d 100644
|
||||
--- a/src/hotspot/share/opto/node.cpp
|
||||
+++ b/src/hotspot/share/opto/node.cpp
|
||||
@@ -2946,23 +2946,13 @@ bool Node::is_dead_loop_safe() const {
|
||||
bool Node::is_div_or_mod(BasicType bt) const { return Opcode() == Op_Div(bt) || Opcode() == Op_Mod(bt) ||
|
||||
Opcode() == Op_UDiv(bt) || Opcode() == Op_UMod(bt); }
|
||||
|
||||
-bool Node::is_pure_function() const {
|
||||
- switch (Opcode()) {
|
||||
- case Op_ModD:
|
||||
- case Op_ModF:
|
||||
- return true;
|
||||
- default:
|
||||
- return false;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
// `maybe_pure_function` is assumed to be the input of `this`. This is a bit redundant,
|
||||
// but we already have and need maybe_pure_function in all the call sites, so
|
||||
// it makes it obvious that the `maybe_pure_function` is the same node as in the caller,
|
||||
// while it takes more thinking to realize that a locally computed in(0) must be equal to
|
||||
// the local in the caller.
|
||||
bool Node::is_data_proj_of_pure_function(const Node* maybe_pure_function) const {
|
||||
- return Opcode() == Op_Proj && as_Proj()->_con == TypeFunc::Parms && maybe_pure_function->is_pure_function();
|
||||
+ return Opcode() == Op_Proj && as_Proj()->_con == TypeFunc::Parms && maybe_pure_function->is_CallLeafPure();
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
|
||||
index 2bbb10879f5..dc0ac474c4b 100644
|
||||
--- a/src/hotspot/share/opto/node.hpp
|
||||
+++ b/src/hotspot/share/opto/node.hpp
|
||||
@@ -54,6 +54,7 @@ class CallDynamicJavaNode;
|
||||
class CallJavaNode;
|
||||
class CallLeafNode;
|
||||
class CallLeafNoFPNode;
|
||||
+class CallLeafPureNode;
|
||||
class CallNode;
|
||||
class CallRuntimeNode;
|
||||
class CallStaticJavaNode;
|
||||
@@ -673,6 +674,7 @@ class Node {
|
||||
DEFINE_CLASS_ID(CallRuntime, Call, 1)
|
||||
DEFINE_CLASS_ID(CallLeaf, CallRuntime, 0)
|
||||
DEFINE_CLASS_ID(CallLeafNoFP, CallLeaf, 0)
|
||||
+ DEFINE_CLASS_ID(CallLeafPure, CallLeaf, 1)
|
||||
DEFINE_CLASS_ID(Allocate, Call, 2)
|
||||
DEFINE_CLASS_ID(AllocateArray, Allocate, 0)
|
||||
DEFINE_CLASS_ID(AbstractLock, Call, 3)
|
||||
@@ -907,6 +909,7 @@ class Node {
|
||||
DEFINE_CLASS_QUERY(CallJava)
|
||||
DEFINE_CLASS_QUERY(CallLeaf)
|
||||
DEFINE_CLASS_QUERY(CallLeafNoFP)
|
||||
+ DEFINE_CLASS_QUERY(CallLeafPure)
|
||||
DEFINE_CLASS_QUERY(CallRuntime)
|
||||
DEFINE_CLASS_QUERY(CallStaticJava)
|
||||
DEFINE_CLASS_QUERY(Catch)
|
||||
@@ -1289,8 +1292,6 @@ class Node {
|
||||
|
||||
bool is_div_or_mod(BasicType bt) const;
|
||||
|
||||
- bool is_pure_function() const;
|
||||
-
|
||||
bool is_data_proj_of_pure_function(const Node* maybe_pure_function) const;
|
||||
|
||||
//----------------- Printing, etc
|
||||
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
|
||||
index 1a4c3c91c4f..04b6e49b620 100644
|
||||
--- a/src/hotspot/share/opto/parse2.cpp
|
||||
+++ b/src/hotspot/share/opto/parse2.cpp
|
||||
@@ -1097,11 +1097,11 @@ void Parse::jump_switch_ranges(Node* key_val, SwitchRange *lo, SwitchRange *hi,
|
||||
|
||||
Node* Parse::floating_point_mod(Node* a, Node* b, BasicType type) {
|
||||
assert(type == BasicType::T_FLOAT || type == BasicType::T_DOUBLE, "only float and double are floating points");
|
||||
- CallNode* mod = type == BasicType::T_DOUBLE ? static_cast<CallNode*>(new ModDNode(C, a, b)) : new ModFNode(C, a, b);
|
||||
+ CallLeafPureNode* mod = type == BasicType::T_DOUBLE ? static_cast<CallLeafPureNode*>(new ModDNode(C, a, b)) : new ModFNode(C, a, b);
|
||||
|
||||
- Node* prev_mem = set_predefined_input_for_runtime_call(mod);
|
||||
- mod = _gvn.transform(mod)->as_Call();
|
||||
- set_predefined_output_for_runtime_call(mod, prev_mem, TypeRawPtr::BOTTOM);
|
||||
+ set_predefined_input_for_runtime_call(mod);
|
||||
+ mod = _gvn.transform(mod)->as_CallLeafPure();
|
||||
+ set_predefined_output_for_runtime_call(mod);
|
||||
Node* result = _gvn.transform(new ProjNode(mod, TypeFunc::Parms + 0));
|
||||
record_for_igvn(mod);
|
||||
return result;
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
From dbbdc1dffd10608195487fa139e77c4a90c80658 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Van=C4=9Bk?= <jvanek@openjdk.org>
|
||||
Date: Wed, 15 Apr 2026 12:54:49 +0000
|
||||
Subject: [PATCH] 8375294: (fs) Files.copy can fail with EOPNOTSUPP when
|
||||
copy_file_range not supported
|
||||
|
||||
Reviewed-by: andrew
|
||||
Backport-of: 30cda00010888b6e9a2bf8cdeaedbb3eb4b6a222
|
||||
---
|
||||
src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c | 5 +++--
|
||||
src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c | 3 ++-
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
|
||||
index efbd0ca5684..54d640b03a4 100644
|
||||
--- a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
|
||||
+++ b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -63,7 +63,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferFrom0(JNIEnv *env, jobject this,
|
||||
if (n < 0) {
|
||||
if (errno == EAGAIN)
|
||||
return IOS_UNAVAILABLE;
|
||||
- if (errno == ENOSYS)
|
||||
+ if (errno == ENOSYS || errno == EOPNOTSUPP)
|
||||
return IOS_UNSUPPORTED_CASE;
|
||||
if ((errno == EBADF || errno == EINVAL || errno == EXDEV) &&
|
||||
((ssize_t)count >= 0))
|
||||
@@ -103,6 +103,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferTo0(JNIEnv *env, jobject this,
|
||||
case EINVAL:
|
||||
case ENOSYS:
|
||||
case EXDEV:
|
||||
+ case EOPNOTSUPP:
|
||||
// ignore and try sendfile()
|
||||
break;
|
||||
default:
|
||||
diff --git a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
|
||||
index c90e99dda07..4677411b0ba 100644
|
||||
--- a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
|
||||
+++ b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -193,6 +193,7 @@ Java_sun_nio_fs_LinuxNativeDispatcher_directCopy0
|
||||
case EINVAL:
|
||||
case ENOSYS:
|
||||
case EXDEV:
|
||||
+ case EOPNOTSUPP:
|
||||
// ignore and try sendfile()
|
||||
break;
|
||||
default:
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@ -1,626 +0,0 @@
|
||||
From 1f61b6754b5abce07db45fd385a19c2cf9296a08 Mon Sep 17 00:00:00 2001
|
||||
From: Kangcheng Xu <kxu@redhat.com>
|
||||
Date: Mon, 27 Apr 2026 10:14:39 -0400
|
||||
Subject: [PATCH 2/2] Backport 7f631ea958e30246b927f3524f0fbf37334422b9
|
||||
|
||||
---
|
||||
src/hotspot/share/opto/callnode.cpp | 175 ++++++++++++++
|
||||
src/hotspot/share/opto/callnode.hpp | 17 ++
|
||||
src/hotspot/share/opto/classes.hpp | 1 +
|
||||
src/hotspot/share/opto/library_call.cpp | 62 +----
|
||||
src/hotspot/share/opto/macro.cpp | 19 +-
|
||||
.../intrinsics/math/PowDNodeTests.java | 218 ++++++++++++++++++
|
||||
.../compiler/lib/ir_framework/IRNode.java | 11 +
|
||||
7 files changed, 437 insertions(+), 66 deletions(-)
|
||||
create mode 100644 test/hotspot/jtreg/compiler/intrinsics/math/PowDNodeTests.java
|
||||
|
||||
diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
|
||||
index fc4b0c35dff..cb6cc2082b3 100644
|
||||
--- a/src/hotspot/share/opto/callnode.cpp
|
||||
+++ b/src/hotspot/share/opto/callnode.cpp
|
||||
@@ -42,6 +42,7 @@
|
||||
#include "opto/rootnode.hpp"
|
||||
#include "opto/runtime.hpp"
|
||||
#include "runtime/sharedRuntime.hpp"
|
||||
+#include "runtime/stubRoutines.hpp"
|
||||
#include "utilities/powerOfTwo.hpp"
|
||||
#include "code/vmreg.hpp"
|
||||
|
||||
@@ -1354,6 +1355,25 @@ TupleNode* CallLeafPureNode::make_tuple_of_input_state_and_top_return_values(con
|
||||
return tuple;
|
||||
}
|
||||
|
||||
+CallLeafPureNode* CallLeafPureNode::inline_call_leaf_pure_node(Node* control) const {
|
||||
+ Node* top = Compile::current()->top();
|
||||
+ if (control == nullptr) {
|
||||
+ control = in(TypeFunc::Control);
|
||||
+ }
|
||||
+
|
||||
+ CallLeafPureNode* call = new CallLeafPureNode(tf(), entry_point(), _name, nullptr);
|
||||
+ call->init_req(TypeFunc::Control, control);
|
||||
+ call->init_req(TypeFunc::I_O, top);
|
||||
+ call->init_req(TypeFunc::Memory, top);
|
||||
+ call->init_req(TypeFunc::ReturnAdr, top);
|
||||
+ call->init_req(TypeFunc::FramePtr, top);
|
||||
+ for (unsigned int i = 0; i < tf()->domain()->cnt() - TypeFunc::Parms; i++) {
|
||||
+ call->init_req(TypeFunc::Parms + i, in(TypeFunc::Parms + i));
|
||||
+ }
|
||||
+
|
||||
+ return call;
|
||||
+}
|
||||
+
|
||||
Node* CallLeafPureNode::Ideal(PhaseGVN* phase, bool can_reshape) {
|
||||
if (is_dead()) {
|
||||
return nullptr;
|
||||
@@ -2424,3 +2444,158 @@ bool CallNode::may_modify_arraycopy_helper(const TypeOopPtr* dest_t, const TypeO
|
||||
|
||||
return true;
|
||||
}
|
||||
+
|
||||
+PowDNode::PowDNode(Compile* C, Node* base, Node* exp)
|
||||
+ : CallLeafPureNode(
|
||||
+ OptoRuntime::Math_DD_D_Type(),
|
||||
+ StubRoutines::dpow() != nullptr ? StubRoutines::dpow() : CAST_FROM_FN_PTR(address, SharedRuntime::dpow),
|
||||
+ "pow",
|
||||
+ nullptr) {
|
||||
+ add_flag(Flag_is_macro);
|
||||
+ C->add_macro_node(this);
|
||||
+
|
||||
+ init_req(TypeFunc::Parms + 0, base);
|
||||
+ init_req(TypeFunc::Parms + 1, C->top()); // double slot padding
|
||||
+ init_req(TypeFunc::Parms + 2, exp);
|
||||
+ init_req(TypeFunc::Parms + 3, C->top()); // double slot padding
|
||||
+}
|
||||
+
|
||||
+const Type* PowDNode::Value(PhaseGVN* phase) const {
|
||||
+ const Type* t_base = phase->type(base());
|
||||
+ const Type* t_exp = phase->type(exp());
|
||||
+
|
||||
+ if (t_base == Type::TOP || t_exp == Type::TOP) {
|
||||
+ return Type::TOP;
|
||||
+ }
|
||||
+
|
||||
+ const TypeD* base_con = t_base->isa_double_constant();
|
||||
+ const TypeD* exp_con = t_exp->isa_double_constant();
|
||||
+ const TypeD* result_t = nullptr;
|
||||
+
|
||||
+ // constant folding: both inputs are constants
|
||||
+ if (base_con != nullptr && exp_con != nullptr) {
|
||||
+ result_t = TypeD::make(SharedRuntime::dpow(base_con->getd(), exp_con->getd()));
|
||||
+ }
|
||||
+
|
||||
+ // Special cases when only the exponent is known:
|
||||
+ if (exp_con != nullptr) {
|
||||
+ double e = exp_con->getd();
|
||||
+
|
||||
+ // If the second argument is positive or negative zero, then the result is 1.0.
|
||||
+ // i.e., pow(x, +/-0.0D) => 1.0
|
||||
+ if (e == 0.0) { // true for both -0.0 and +0.0
|
||||
+ result_t = TypeD::ONE;
|
||||
+ }
|
||||
+
|
||||
+ // If the second argument is NaN, then the result is NaN.
|
||||
+ // i.e., pow(x, NaN) => NaN
|
||||
+ if (g_isnan(e)) {
|
||||
+ result_t = TypeD::make(NAN);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (result_t != nullptr) {
|
||||
+ // We can't simply return a TypeD here, it must be a tuple type to be compatible with call nodes.
|
||||
+ const Type** fields = TypeTuple::fields(2);
|
||||
+ fields[TypeFunc::Parms + 0] = result_t;
|
||||
+ fields[TypeFunc::Parms + 1] = Type::HALF;
|
||||
+ return TypeTuple::make(TypeFunc::Parms + 2, fields);
|
||||
+ }
|
||||
+
|
||||
+ return tf()->range();
|
||||
+}
|
||||
+
|
||||
+Node* PowDNode::Ideal(PhaseGVN* phase, bool can_reshape) {
|
||||
+ if (!can_reshape) {
|
||||
+ return nullptr; // wait for igvn
|
||||
+ }
|
||||
+
|
||||
+ PhaseIterGVN* igvn = phase->is_IterGVN();
|
||||
+ Node* base = this->base();
|
||||
+ Node* exp = this->exp();
|
||||
+
|
||||
+ const Type* t_exp = phase->type(exp);
|
||||
+ const TypeD* exp_con = t_exp->isa_double_constant();
|
||||
+
|
||||
+ // Special cases when only the exponent is known:
|
||||
+ if (exp_con != nullptr) {
|
||||
+ double e = exp_con->getd();
|
||||
+
|
||||
+ // If the second argument is 1.0, then the result is the same as the first argument.
|
||||
+ // i.e., pow(x, 1.0) => x
|
||||
+ if (e == 1.0) {
|
||||
+ return make_tuple_of_input_state_and_result(igvn, base);
|
||||
+ }
|
||||
+
|
||||
+ // If the second argument is 2.0, then strength reduce to multiplications.
|
||||
+ // i.e., pow(x, 2.0) => x * x
|
||||
+ if (e == 2.0) {
|
||||
+ Node* mul = igvn->transform(new MulDNode(base, base));
|
||||
+ return make_tuple_of_input_state_and_result(igvn, mul);
|
||||
+ }
|
||||
+
|
||||
+ // If the second argument is 0.5, the strength reduce to square roots.
|
||||
+ // i.e., pow(x, 0.5) => sqrt(x) iff x > 0
|
||||
+ if (e == 0.5 && Matcher::match_rule_supported(Op_SqrtD)) {
|
||||
+ Node* ctrl = in(TypeFunc::Control);
|
||||
+ Node* zero = igvn->zerocon(T_DOUBLE);
|
||||
+
|
||||
+ // According to the API specs, pow(-0.0, 0.5) = 0.0 and sqrt(-0.0) = -0.0.
|
||||
+ // So pow(-0.0, 0.5) shouldn't be replaced with sqrt(-0.0).
|
||||
+ // -0.0/+0.0 are both excluded since floating-point comparison doesn't distinguish -0.0 from +0.0.
|
||||
+ Node* cmp = igvn->register_new_node_with_optimizer(new CmpDNode(base, zero));
|
||||
+ Node* test = igvn->register_new_node_with_optimizer(new BoolNode(cmp, BoolTest::le));
|
||||
+
|
||||
+ IfNode* iff = new IfNode(ctrl, test, PROB_UNLIKELY_MAG(3), COUNT_UNKNOWN);
|
||||
+ igvn->register_new_node_with_optimizer(iff);
|
||||
+ Node* if_slow = igvn->register_new_node_with_optimizer(new IfTrueNode(iff)); // x <= 0
|
||||
+ Node* if_fast = igvn->register_new_node_with_optimizer(new IfFalseNode(iff)); // x > 0
|
||||
+
|
||||
+ // slow path: call pow(x, 0.5)
|
||||
+ Node* call = igvn->register_new_node_with_optimizer(inline_call_leaf_pure_node(if_slow));
|
||||
+ Node* call_ctrl = igvn->register_new_node_with_optimizer(new ProjNode(call, TypeFunc::Control));
|
||||
+ Node* call_result = igvn->register_new_node_with_optimizer(new ProjNode(call, TypeFunc::Parms + 0));
|
||||
+
|
||||
+ // fast path: sqrt(x)
|
||||
+ Node* sqrt = igvn->register_new_node_with_optimizer(new SqrtDNode(igvn->C, if_fast, base));
|
||||
+
|
||||
+ // merge paths
|
||||
+ RegionNode* region = new RegionNode(3);
|
||||
+ igvn->register_new_node_with_optimizer(region);
|
||||
+ region->init_req(1, call_ctrl); // slow path
|
||||
+ region->init_req(2, if_fast); // fast path
|
||||
+
|
||||
+ PhiNode* phi = new PhiNode(region, Type::DOUBLE);
|
||||
+ igvn->register_new_node_with_optimizer(phi);
|
||||
+ phi->init_req(1, call_result); // slow: pow() result
|
||||
+ phi->init_req(2, sqrt); // fast: sqrt() result
|
||||
+
|
||||
+ igvn->C->set_has_split_ifs(true); // Has chance for split-if optimization
|
||||
+
|
||||
+ return make_tuple_of_input_state_and_result(igvn, phi, region);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return CallLeafPureNode::Ideal(phase, can_reshape);
|
||||
+}
|
||||
+
|
||||
+// We can't simply have Ideal() returning a Con or MulNode since the users are still expecting a Call node, but we could
|
||||
+// produce a tuple that follows the same pattern so users can still get control, io, memory, etc..
|
||||
+TupleNode* PowDNode::make_tuple_of_input_state_and_result(PhaseIterGVN* phase, Node* result, Node* control) {
|
||||
+ if (control == nullptr) {
|
||||
+ control = in(TypeFunc::Control);
|
||||
+ }
|
||||
+
|
||||
+ Compile* C = phase->C;
|
||||
+ C->remove_macro_node(this);
|
||||
+ TupleNode* tuple = TupleNode::make(
|
||||
+ tf()->range(),
|
||||
+ control,
|
||||
+ in(TypeFunc::I_O),
|
||||
+ in(TypeFunc::Memory),
|
||||
+ in(TypeFunc::FramePtr),
|
||||
+ in(TypeFunc::ReturnAdr),
|
||||
+ result,
|
||||
+ C->top());
|
||||
+ return tuple;
|
||||
+}
|
||||
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
|
||||
index 2462a88143f..bb87746a3f6 100644
|
||||
--- a/src/hotspot/share/opto/callnode.hpp
|
||||
+++ b/src/hotspot/share/opto/callnode.hpp
|
||||
@@ -953,6 +953,8 @@ class CallLeafPureNode : public CallLeafNode {
|
||||
}
|
||||
int Opcode() const override;
|
||||
Node* Ideal(PhaseGVN* phase, bool can_reshape) override;
|
||||
+
|
||||
+ CallLeafPureNode* inline_call_leaf_pure_node(Node* control = nullptr) const;
|
||||
};
|
||||
|
||||
//------------------------------CallLeafNoFPNode-------------------------------
|
||||
@@ -1304,4 +1306,19 @@ class UnlockNode : public AbstractLockNode {
|
||||
JVMState* dbg_jvms() const { return nullptr; }
|
||||
#endif
|
||||
};
|
||||
+
|
||||
+//------------------------------PowDNode--------------------------------------
|
||||
+class PowDNode : public CallLeafPureNode {
|
||||
+ TupleNode* make_tuple_of_input_state_and_result(PhaseIterGVN* phase, Node* result, Node* control = nullptr);
|
||||
+
|
||||
+public:
|
||||
+ PowDNode(Compile* C, Node* base, Node* exp);
|
||||
+ int Opcode() const override;
|
||||
+ const Type* Value(PhaseGVN* phase) const override;
|
||||
+ Node* Ideal(PhaseGVN* phase, bool can_reshape) override;
|
||||
+
|
||||
+ Node* base() const { return in(TypeFunc::Parms + 0); }
|
||||
+ Node* exp() const { return in(TypeFunc::Parms + 2); }
|
||||
+};
|
||||
+
|
||||
#endif // SHARE_OPTO_CALLNODE_HPP
|
||||
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
|
||||
index 587d5fad8f2..b7ba16e99a0 100644
|
||||
--- a/src/hotspot/share/opto/classes.hpp
|
||||
+++ b/src/hotspot/share/opto/classes.hpp
|
||||
@@ -283,6 +283,7 @@ macro(OpaqueZeroTripGuard)
|
||||
macro(OpaqueNotNull)
|
||||
macro(OpaqueInitializedAssertionPredicate)
|
||||
macro(OpaqueTemplateAssertionPredicate)
|
||||
+macro(PowD)
|
||||
macro(ProfileBoolean)
|
||||
macro(OrI)
|
||||
macro(OrL)
|
||||
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
|
||||
index 12960d101a8..6c71a61ba75 100644
|
||||
--- a/src/hotspot/share/opto/library_call.cpp
|
||||
+++ b/src/hotspot/share/opto/library_call.cpp
|
||||
@@ -1817,61 +1817,17 @@ bool LibraryCallKit::runtime_math(const TypeFunc* call_type, address funcAddr, c
|
||||
|
||||
//------------------------------inline_math_pow-----------------------------
|
||||
bool LibraryCallKit::inline_math_pow() {
|
||||
+ Node* base = argument(0);
|
||||
Node* exp = argument(2);
|
||||
- const TypeD* d = _gvn.type(exp)->isa_double_constant();
|
||||
- if (d != nullptr) {
|
||||
- if (d->getd() == 2.0) {
|
||||
- // Special case: pow(x, 2.0) => x * x
|
||||
- Node* base = argument(0);
|
||||
- set_result(_gvn.transform(new MulDNode(base, base)));
|
||||
- return true;
|
||||
- } else if (d->getd() == 0.5 && Matcher::match_rule_supported(Op_SqrtD)) {
|
||||
- // Special case: pow(x, 0.5) => sqrt(x)
|
||||
- Node* base = argument(0);
|
||||
- Node* zero = _gvn.zerocon(T_DOUBLE);
|
||||
-
|
||||
- RegionNode* region = new RegionNode(3);
|
||||
- Node* phi = new PhiNode(region, Type::DOUBLE);
|
||||
-
|
||||
- Node* cmp = _gvn.transform(new CmpDNode(base, zero));
|
||||
- // According to the API specs, pow(-0.0, 0.5) = 0.0 and sqrt(-0.0) = -0.0.
|
||||
- // So pow(-0.0, 0.5) shouldn't be replaced with sqrt(-0.0).
|
||||
- // -0.0/+0.0 are both excluded since floating-point comparison doesn't distinguish -0.0 from +0.0.
|
||||
- Node* test = _gvn.transform(new BoolNode(cmp, BoolTest::le));
|
||||
-
|
||||
- Node* if_pow = generate_slow_guard(test, nullptr);
|
||||
- Node* value_sqrt = _gvn.transform(new SqrtDNode(C, control(), base));
|
||||
- phi->init_req(1, value_sqrt);
|
||||
- region->init_req(1, control());
|
||||
-
|
||||
- if (if_pow != nullptr) {
|
||||
- set_control(if_pow);
|
||||
- address target = StubRoutines::dpow() != nullptr ? StubRoutines::dpow() :
|
||||
- CAST_FROM_FN_PTR(address, SharedRuntime::dpow);
|
||||
- const TypePtr* no_memory_effects = nullptr;
|
||||
- Node* trig = make_runtime_call(RC_LEAF, OptoRuntime::Math_DD_D_Type(), target, "POW",
|
||||
- no_memory_effects, base, top(), exp, top());
|
||||
- Node* value_pow = _gvn.transform(new ProjNode(trig, TypeFunc::Parms+0));
|
||||
-#ifdef ASSERT
|
||||
- Node* value_top = _gvn.transform(new ProjNode(trig, TypeFunc::Parms+1));
|
||||
- assert(value_top == top(), "second value must be top");
|
||||
-#endif
|
||||
- phi->init_req(2, value_pow);
|
||||
- region->init_req(2, _gvn.transform(new ProjNode(trig, TypeFunc::Control)));
|
||||
- }
|
||||
-
|
||||
- C->set_has_split_ifs(true); // Has chance for split-if optimization
|
||||
- set_control(_gvn.transform(region));
|
||||
- record_for_igvn(region);
|
||||
- set_result(_gvn.transform(phi));
|
||||
|
||||
- return true;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return StubRoutines::dpow() != nullptr ?
|
||||
- runtime_math(OptoRuntime::Math_DD_D_Type(), StubRoutines::dpow(), "dpow") :
|
||||
- runtime_math(OptoRuntime::Math_DD_D_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::dpow), "POW");
|
||||
+ CallNode* pow = new PowDNode(C, base, exp);
|
||||
+ set_predefined_input_for_runtime_call(pow);
|
||||
+ pow = _gvn.transform(pow)->as_CallLeafPure();
|
||||
+ set_predefined_output_for_runtime_call(pow);
|
||||
+ Node* result = _gvn.transform(new ProjNode(pow, TypeFunc::Parms + 0));
|
||||
+ record_for_igvn(pow);
|
||||
+ set_result(result);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
//------------------------------inline_math_native-----------------------------
|
||||
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
|
||||
index aafc5d3c170..a28043c8d8f 100644
|
||||
--- a/src/hotspot/share/opto/macro.cpp
|
||||
+++ b/src/hotspot/share/opto/macro.cpp
|
||||
@@ -2484,6 +2484,7 @@ void PhaseMacroExpand::eliminate_macro_nodes() {
|
||||
assert(n->Opcode() == Op_LoopLimit ||
|
||||
n->Opcode() == Op_ModD ||
|
||||
n->Opcode() == Op_ModF ||
|
||||
+ n->Opcode() == Op_PowD ||
|
||||
n->is_OpaqueNotNull() ||
|
||||
n->is_OpaqueInitializedAssertionPredicate() ||
|
||||
n->Opcode() == Op_MaxL ||
|
||||
@@ -2637,19 +2638,11 @@ bool PhaseMacroExpand::expand_macro_nodes() {
|
||||
default:
|
||||
switch (n->Opcode()) {
|
||||
case Op_ModD:
|
||||
- case Op_ModF: {
|
||||
- CallNode* mod_macro = n->as_Call();
|
||||
- CallNode* call = new CallLeafPureNode(mod_macro->tf(), mod_macro->entry_point(),
|
||||
- mod_macro->_name, TypeRawPtr::BOTTOM);
|
||||
- call->init_req(TypeFunc::Control, mod_macro->in(TypeFunc::Control));
|
||||
- call->init_req(TypeFunc::I_O, C->top());
|
||||
- call->init_req(TypeFunc::Memory, C->top());
|
||||
- call->init_req(TypeFunc::ReturnAdr, C->top());
|
||||
- call->init_req(TypeFunc::FramePtr, C->top());
|
||||
- for (unsigned int i = 0; i < mod_macro->tf()->domain()->cnt() - TypeFunc::Parms; i++) {
|
||||
- call->init_req(TypeFunc::Parms + i, mod_macro->in(TypeFunc::Parms + i));
|
||||
- }
|
||||
- _igvn.replace_node(mod_macro, call);
|
||||
+ case Op_ModF:
|
||||
+ case Op_PowD: {
|
||||
+ CallLeafPureNode* call_macro = n->as_CallLeafPure();
|
||||
+ CallLeafPureNode* call = call_macro->inline_call_leaf_pure_node();
|
||||
+ _igvn.replace_node(call_macro, call);
|
||||
transform_later(call);
|
||||
break;
|
||||
}
|
||||
diff --git a/test/hotspot/jtreg/compiler/intrinsics/math/PowDNodeTests.java b/test/hotspot/jtreg/compiler/intrinsics/math/PowDNodeTests.java
|
||||
new file mode 100644
|
||||
index 00000000000..e28cc5ab346
|
||||
--- /dev/null
|
||||
+++ b/test/hotspot/jtreg/compiler/intrinsics/math/PowDNodeTests.java
|
||||
@@ -0,0 +1,218 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2026, IBM and/or its affiliates. All rights reserved.
|
||||
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
+ *
|
||||
+ * This code is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License version 2 only, as
|
||||
+ * published by the Free Software Foundation.
|
||||
+ *
|
||||
+ * This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
+ * version 2 for more details (a copy is included in the LICENSE file that
|
||||
+ * accompanied this code).
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License version
|
||||
+ * 2 along with this work; if not, write to the Free Software Foundation,
|
||||
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
+ *
|
||||
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
+ * or visit www.oracle.com if you need additional information or have any
|
||||
+ * questions.
|
||||
+ *
|
||||
+ */
|
||||
+package compiler.intrinsics.math;
|
||||
+
|
||||
+import jdk.test.lib.Asserts;
|
||||
+
|
||||
+import compiler.lib.ir_framework.*;
|
||||
+import compiler.lib.generators.*;
|
||||
+import static compiler.lib.generators.Generators.*;
|
||||
+
|
||||
+import java.util.Random;
|
||||
+
|
||||
+/*
|
||||
+ * @test
|
||||
+ * @bug 8378713
|
||||
+ * @key randomness
|
||||
+ * @summary Math.pow(base, exp) should constant propagate
|
||||
+ * @library /test/lib /
|
||||
+ * @run driver ${test.main.class}
|
||||
+ */
|
||||
+public class PowDNodeTests {
|
||||
+ public static final Generator<Double> UNIFORMS = G.uniformDoubles(); // [0, 1)
|
||||
+
|
||||
+ public static final double B = UNIFORMS.next() * 1000.0d;
|
||||
+ public static final double E = UNIFORMS.next() * 1000.0d + 3.0d; // e >= 3 to avoid strength reduction code
|
||||
+
|
||||
+ public static void main(String[] args) {
|
||||
+ TestFramework.run();
|
||||
+
|
||||
+ testCorrectness();
|
||||
+ }
|
||||
+
|
||||
+ // Test 1: pow(2.0, 10.0) -> 1024.0
|
||||
+ @Test
|
||||
+ @IR(failOn = {IRNode.POW_D})
|
||||
+ public static double constantLiteralFolding() {
|
||||
+ return Math.pow(2.0, 10.0); // should fold to 1024.0
|
||||
+ }
|
||||
+
|
||||
+ // Test 2: pow(final B, final E) -> B^E
|
||||
+ @Test
|
||||
+ @IR(failOn = {IRNode.POW_D})
|
||||
+ public static double constantStaticFolding() {
|
||||
+ return Math.pow(B, E); // should fold to B^E
|
||||
+ }
|
||||
+
|
||||
+ // Test 3: pow(b, 0.0) -> 1.0
|
||||
+ @Test
|
||||
+ @IR(failOn = {IRNode.POW_D})
|
||||
+ @Arguments(values = {Argument.RANDOM_EACH})
|
||||
+ public static double expZero(double b) {
|
||||
+ return Math.pow(b, 0.0);
|
||||
+ }
|
||||
+
|
||||
+ // Test 4: pow(b, 1.0) -> b (identity)
|
||||
+ @Test
|
||||
+ @IR(failOn = {IRNode.POW_D})
|
||||
+ @Arguments(values = {Argument.RANDOM_EACH})
|
||||
+ public static double expOne(double b) {
|
||||
+ return Math.pow(b, 1.0);
|
||||
+ }
|
||||
+
|
||||
+ // Test 5: pow(b, NaN) -> NaN
|
||||
+ @Test
|
||||
+ @IR(failOn = {IRNode.POW_D})
|
||||
+ @Arguments(values = {Argument.RANDOM_EACH})
|
||||
+ public static double expNaN(double b) {
|
||||
+ return Math.pow(b, Double.NaN);
|
||||
+ }
|
||||
+
|
||||
+ // Test 6: pow(b, 2.0) -> b * b
|
||||
+ // More tests in TestPow2Opt.java
|
||||
+ @Test
|
||||
+ @IR(failOn = {IRNode.POW_D})
|
||||
+ @IR(counts = {IRNode.MUL_D, "1"})
|
||||
+ @Arguments(values = {Argument.RANDOM_EACH})
|
||||
+ public static double expTwo(double b) {
|
||||
+ return Math.pow(b, 2.0);
|
||||
+ }
|
||||
+
|
||||
+ // Test 7: pow(b, 0.5) -> b <= 0.0 ? pow(b, 0.5) : sqrt(b)
|
||||
+ // More tests in TestPow0Dot5Opt.java
|
||||
+ @Test
|
||||
+ @IR(counts = {IRNode.IF, "1"})
|
||||
+ @IR(counts = {IRNode.SQRT_D, "1"})
|
||||
+ @IR(counts = {".*CallLeaf.*pow.*", "1"}, phase = CompilePhase.BEFORE_MATCHING)
|
||||
+ @Arguments(values = {Argument.RANDOM_EACH})
|
||||
+ public static double expDot5(double b) {
|
||||
+ return Math.pow(b, 0.5); // expand to: if (b > 0) { sqrt(b) } else { call(b) }
|
||||
+ }
|
||||
+
|
||||
+ // Test 8: non-constant exponent stays as call
|
||||
+ @Test
|
||||
+ @IR(counts = {IRNode.POW_D, "1"})
|
||||
+ @Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
|
||||
+ public static double nonConstant(double b, double e) {
|
||||
+ return Math.pow(b, e);
|
||||
+ }
|
||||
+
|
||||
+ // Test 9: late constant discovery on base (after loop opts)
|
||||
+ @Test
|
||||
+ @IR(counts = {IRNode.POW_D, "1"}, phase = CompilePhase.AFTER_PARSING)
|
||||
+ @IR(failOn = {IRNode.POW_D})
|
||||
+ public static double lateBaseConstant() {
|
||||
+ double base = 0;
|
||||
+ for (int i = 0; i < 4; i++) {
|
||||
+ if ((i % 2) == 0) {
|
||||
+ base = B;
|
||||
+ }
|
||||
+ }
|
||||
+ // After loop opts, base == B (constant), so pow(B, E) folds
|
||||
+ return Math.pow(base, E);
|
||||
+ }
|
||||
+
|
||||
+ // Test 10: late constant discovery on exp (after loop opts)
|
||||
+ @Test
|
||||
+ @IR(counts = {IRNode.POW_D, "1"}, phase = CompilePhase.AFTER_PARSING)
|
||||
+ @IR(failOn = {IRNode.POW_D})
|
||||
+ public static double lateExpConstant() {
|
||||
+ double exp = 0;
|
||||
+ for (int i = 0; i < 4; i++) {
|
||||
+ if ((i % 2) == 0) {
|
||||
+ exp = E;
|
||||
+ }
|
||||
+ }
|
||||
+ // After loop opts, exp == E (constant), so pow(B, E) folds
|
||||
+ return Math.pow(B, exp);
|
||||
+ }
|
||||
+
|
||||
+ // Test 11: late constant discoveries on both base and exp (after loop opts)
|
||||
+ @Test
|
||||
+ @IR(counts = {IRNode.POW_D, "1"}, phase = CompilePhase.AFTER_PARSING)
|
||||
+ @IR(failOn = {IRNode.POW_D})
|
||||
+ public static double lateBothConstant() {
|
||||
+ double base = 0, exp = 0;
|
||||
+ for (int i = 0; i < 4; i++) {
|
||||
+ if ((i % 2) == 0) {
|
||||
+ base = B;
|
||||
+ exp = E;
|
||||
+ }
|
||||
+ }
|
||||
+ // After loop opts, base = B, exp == E, so pow(B, E) folds
|
||||
+ return Math.pow(base, exp);
|
||||
+ }
|
||||
+
|
||||
+ private static void assertEQWithinOneUlp(double expected, double observed) {
|
||||
+ if (Double.isNaN(expected) && Double.isNaN(observed)) return;
|
||||
+
|
||||
+ // Math.pow() requires result must be within 1 ulp of the respective magnitude
|
||||
+ double ulp = Math.max(Math.ulp(expected), Math.ulp(observed));
|
||||
+ if (Math.abs(expected - observed) > ulp) {
|
||||
+ throw new AssertionError(String.format(
|
||||
+ "expect = %x, observed = %x, ulp = %x",
|
||||
+ Double.doubleToRawLongBits(expected), Double.doubleToRawLongBits(observed), Double.doubleToRawLongBits(ulp)
|
||||
+ ));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ private static void testCorrectness() {
|
||||
+ // No need to warm up for intrinsics
|
||||
+ Asserts.assertEQ(1024.0d, constantLiteralFolding());
|
||||
+
|
||||
+ double BE = StrictMath.pow(B, E);
|
||||
+ assertEQWithinOneUlp(BE, constantStaticFolding());
|
||||
+ assertEQWithinOneUlp(BE, lateBaseConstant());
|
||||
+ assertEQWithinOneUlp(BE, lateExpConstant());
|
||||
+ assertEQWithinOneUlp(BE, lateBothConstant());
|
||||
+
|
||||
+ Generator<Double> anyBits = G.anyBitsDouble();
|
||||
+ Generator<Double> largeDoubles = G.uniformDoubles(Long.MAX_VALUE, Double.MAX_VALUE);
|
||||
+ Generator<Double> doubles = G.doubles();
|
||||
+ double[] values = {
|
||||
+ Double.MIN_VALUE, Double.MIN_NORMAL, -42.0d, -1.0d, -0.0d, +0.0d, 0.5d, 1.0d, 2.0d, 123d, Double.MAX_VALUE,
|
||||
+ Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.NaN,
|
||||
+ UNIFORMS.next(), UNIFORMS.next(),
|
||||
+ largeDoubles.next(), -largeDoubles.next(), // some sufficiently large magnitudes
|
||||
+ anyBits.next(), anyBits.next(), // any bits with potentially more NaN representation
|
||||
+ doubles.next(), doubles.next() // a healthy sprinkle of whatever else is possible
|
||||
+ };
|
||||
+
|
||||
+ for (double b : values) {
|
||||
+ // Strength reduced, so we know the bits matches exactly
|
||||
+ Asserts.assertEQ(1.0d, expZero(b));
|
||||
+ Asserts.assertEQ(b, expOne(b));
|
||||
+ Asserts.assertEQ(b * b, expTwo(b));
|
||||
+
|
||||
+ assertEQWithinOneUlp(Double.NaN, expNaN(b));
|
||||
+
|
||||
+ // Runtime calls, so make sure the result is within 1 ulp
|
||||
+ assertEQWithinOneUlp(StrictMath.pow(b, 0.5d), expDot5(b));
|
||||
+
|
||||
+ for (double e : values) {
|
||||
+ assertEQWithinOneUlp(StrictMath.pow(b, e), nonConstant(b, e));
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
|
||||
index 7b751f1a72c..6a95a2b5da7 100644
|
||||
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
|
||||
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
|
||||
@@ -1858,6 +1858,11 @@ public class IRNode {
|
||||
beforeMatchingNameRegex(SQRT_HF, "SqrtHF");
|
||||
}
|
||||
|
||||
+ public static final String SQRT_D = PREFIX + "SQRT_D" + POSTFIX;
|
||||
+ static {
|
||||
+ beforeMatchingNameRegex(SQRT_D, "SqrtD");
|
||||
+ }
|
||||
+
|
||||
public static final String SQRT_F = PREFIX + "SQRT_F" + POSTFIX;
|
||||
static {
|
||||
beforeMatchingNameRegex(SQRT_F, "SqrtF");
|
||||
@@ -2825,6 +2830,12 @@ public class IRNode {
|
||||
macroNodes(MOD_D, regex);
|
||||
}
|
||||
|
||||
+ public static final String POW_D = PREFIX + "POW_D" + POSTFIX;
|
||||
+ static {
|
||||
+ String regex = START + "PowD" + MID + END;
|
||||
+ macroNodes(POW_D, regex);
|
||||
+ }
|
||||
+
|
||||
public static final String BLACKHOLE = PREFIX + "BLACKHOLE" + POSTFIX;
|
||||
static {
|
||||
fromBeforeRemoveUselessToFinalCode(BLACKHOLE, "Blackhole");
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
---
|
||||
inspections:
|
||||
javabytecode: off
|
||||
abidiff: off
|
||||
@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Builds the RPM on CentOS 9 or 10
|
||||
|
||||
centpkg -v build
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck build_centos.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Builds the portable on CentOS
|
||||
|
||||
centpkg -v build --target java-openjdk-portable-build --rhel-target none
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck build_centos_portable_build.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,43 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Builds the RPM on RHEL 10
|
||||
|
||||
NVR=${1}
|
||||
USER=${2}
|
||||
|
||||
if test "${NVR}" = ""; then
|
||||
echo "${0} <NVR> <USER>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${USER}" = ""; then
|
||||
echo "${0} <NVR> <USER>";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
|
||||
rhpkg -v build --target=java-openjdk-rhel-10-build --custom-user-metadata "${METADATA}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck build_rhel_10.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,43 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Builds the RPM on RHEL 9
|
||||
|
||||
NVR=${1}
|
||||
USER=${2}
|
||||
|
||||
if test "${NVR}" = ""; then
|
||||
echo "${0} <NVR> <USER>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${USER}" = ""; then
|
||||
echo "${0} <NVR> <USER>";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
|
||||
rhpkg -v build --target=java-openjdk-rhel-9-build --custom-user-metadata "${METADATA}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck build_rhel_9.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Builds the portable on RHEL 8
|
||||
|
||||
rhpkg -v build --target=java-openjdk-rhel-8-build --skip-nvr-check
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck build_rhel_portable_build.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,47 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Builds a scratch build of vanilla OpenJDK with no local patches
|
||||
|
||||
SEPARATE_ARCHES=${1}
|
||||
CMD=(rhpkg -v build --target java-openjdk-rhel-8-build --skip-nvr-check --nowait);
|
||||
SUPPORTED_ARCHES="aarch64 ppc64le s390x x86_64";
|
||||
|
||||
if [ "${SEPARATE_ARCHES}" = "" ] ; then
|
||||
SEPARATE_ARCHES=0;
|
||||
fi
|
||||
|
||||
if [ "${SEPARATE_ARCHES}" -eq 1 ] ; then
|
||||
for arch in ${SUPPORTED_ARCHES}; do \
|
||||
ARCH_CMD=("${CMD[@]}" --arches "${arch}" --scratch) ;
|
||||
echo "Executing ${ARCH_CMD[*]}";
|
||||
command "${ARCH_CMD[@]}";
|
||||
done
|
||||
else
|
||||
echo "Executing ${CMD[*]}";
|
||||
command "${CMD[@]}";
|
||||
fi
|
||||
brew watch-task --mine
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck build_vanilla.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,77 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Check the signatures (if any) in RHEL RPM buildinfo
|
||||
# This is intended to be run from the tagging scripts
|
||||
|
||||
# Return codes:
|
||||
# - 1 - Buildinfo file not specified
|
||||
# - 2 = Missing buildinfo file
|
||||
# - 3 = No signatures
|
||||
# - 4 = Multiple signature types found
|
||||
# - 5 = PQC signature found
|
||||
# - 6 = Old signature (fd431d51) found
|
||||
# - 7 = Unknown signature found
|
||||
|
||||
BUILDINFO=${1}
|
||||
NEW_SIGNATURE="release4";
|
||||
OLD_SIGNATURE="fd431d51";
|
||||
|
||||
if test "${BUILDINFO}" = ""; then
|
||||
echo "${0} <BUILDINFO>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if ! test -e "${BUILDINFO}" ; then
|
||||
echo "${BUILDINFO} not found.";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
if grep -q "Signatures" < "${BUILDINFO}" ; then
|
||||
signature=$(grep "Signatures" < "${BUILDINFO}" | cut -d ' ' -f 2- | uniq -c | sed 's#^\W*##');
|
||||
uniq_count=$(echo "${signature}" | wc -l);
|
||||
if test "${uniq_count}" -gt 1; then
|
||||
echo "Multiple signature types found:";
|
||||
echo "${signature}";
|
||||
exit 4;
|
||||
fi
|
||||
sig_count=$(echo "${signature}" | cut -d ' ' -f 1);
|
||||
sig_type=$(echo "${signature}" | cut -d ' ' -f 2);
|
||||
echo "${sig_count} signatures of type ${sig_type} found";
|
||||
if echo "${sig_type}" | grep -q "${NEW_SIGNATURE}" ; then
|
||||
echo "PQC signature found.";
|
||||
exit 5;
|
||||
elif echo "${sig_type}" | grep -q "${OLD_SIGNATURE}"; then
|
||||
echo "Old pre-PQC signature found.";
|
||||
exit 6;
|
||||
else
|
||||
echo "Unknown signature found.";
|
||||
exit 7;
|
||||
fi
|
||||
else
|
||||
echo "Build has no signatures.";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck check_signatures.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,63 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Retrieve the results of a gating test using the ID from the JSON
|
||||
# retrieved by query_build_gating.sh
|
||||
|
||||
RESULT_ID=${1}
|
||||
|
||||
if test "${RESULT_ID}" = ""; then
|
||||
echo "No ID specified.";
|
||||
echo "${0} <RESULT_ID>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
CURL=$(command -v curl)
|
||||
JSON_TOOL=$(command -v jq)
|
||||
|
||||
if test "${CURL}" = ""; then
|
||||
echo "curl not found";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
if test "${JSON_TOOL}" = ""; then
|
||||
echo "jq not found";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
URL="https://resultsdb-api.engineering.redhat.com/api/v2.0/results/${RESULT_ID}"
|
||||
JSON_OUT=$(mktemp --tmpdir out.XXXXXX.json)
|
||||
|
||||
CMD=("${CURL}" --silent --show-error "${URL}")
|
||||
|
||||
echo "${CMD[@]}"
|
||||
|
||||
if command "${CMD[@]}" > "${JSON_OUT}" ; then
|
||||
"${JSON_TOOL}" < "${JSON_OUT}"
|
||||
else
|
||||
echo "Failed to obtain JSON";
|
||||
exit 4;
|
||||
fi
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck get_gating_results.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,94 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Retrieve the status of a build's progress through gating
|
||||
|
||||
RHEL_VER=${1}
|
||||
NVR=${2}
|
||||
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
CURL=$(command -v curl)
|
||||
JSON_TOOL=$(command -v jq)
|
||||
JSON_FILE=$(mktemp --tmpdir query.XXXXXX.json)
|
||||
JSON_OUT=$(mktemp --tmpdir out.XXXXXX.json)
|
||||
URL="https://greenwave.engineering.redhat.com/api/v1.0/decision"
|
||||
|
||||
if test "${CURL}" = ""; then
|
||||
echo "curl not found";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
if test "${JSON_TOOL}" = ""; then
|
||||
echo "jq not found";
|
||||
exit 4;
|
||||
fi
|
||||
|
||||
{
|
||||
echo "{";
|
||||
printf "\t\"decision_context\":\"osci_compose_gate\",\n";
|
||||
printf "\t\"product_version\":\"rhel-%d\",\n" "${RHEL_VER}";
|
||||
printf "\t\"subject_type\":\"koji_build\",\n";
|
||||
printf "\t\"subject_identifier\":\"%s\",\n" "${NVR}";
|
||||
printf "\t\"verbose\":false\n";
|
||||
echo "}";
|
||||
} > "${JSON_FILE}"
|
||||
|
||||
echo "Sending the following JSON...";
|
||||
cat "${JSON_FILE}"
|
||||
|
||||
CMD=("${CURL}" --silent --show-error -X POST)
|
||||
|
||||
JSON_COMMAND="--json";
|
||||
# Check --json is available
|
||||
${CURL} ${JSON_COMMAND} 2> /dev/null
|
||||
if [ $? -eq 2 ] ; then
|
||||
echo "--json unsupported; falling back on --data-ascii";
|
||||
CMD=("${CMD[@]}" --header Content-Type:application/json --data-ascii);
|
||||
else
|
||||
CMD=("${CMD[@]}" "${JSON_COMMAND}");
|
||||
fi
|
||||
|
||||
CMD=("${CMD[@]}" "@${JSON_FILE}" "${URL}")
|
||||
|
||||
echo "${CMD[@]}"
|
||||
|
||||
if command "${CMD[@]}" > "${JSON_OUT}" ; then
|
||||
"${JSON_TOOL}" < "${JSON_OUT}"
|
||||
else
|
||||
echo "Failed to obtain JSON";
|
||||
exit 5;
|
||||
fi
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck query_build_gating.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,87 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Tag public RHEL RPMs into gating for all supported streams
|
||||
# This is intended to be run from tag_rhel_<ver>_(public|embargoed).sh
|
||||
|
||||
BUILD="${1}"
|
||||
BUILDLOG="${2}"
|
||||
SUFFIX="${3}"
|
||||
shift 3;
|
||||
SUPPORTED_VERS="$*"
|
||||
|
||||
CMD_SYNTAX="${0} <BUILD> <BUILDLOG> <SUFFIX> <SUPPORTED_VERS>";
|
||||
GATE_SUFFIX="gate"
|
||||
|
||||
if test "${BUILD}" = ""; then
|
||||
echo "${CMD_SYNTAX}";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${BUILDLOG}" = ""; then
|
||||
echo "${CMD_SYNTAX}";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
if test "${SUPPORTED_VERS}" = ""; then
|
||||
echo "${CMD_SYNTAX}";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
buildtags=$(grep "^Tag" "${BUILDLOG}" | cut -d : -f 2-)
|
||||
echo "Build has tags ${buildtags}";
|
||||
|
||||
if [ "${SUFFIX}" = "${GATE_SUFFIX}" ] ; then
|
||||
echo "Gating system can only handle one tag at a time."
|
||||
echo "Script will need to be re-run for subsequent tags once previous tag has moved to -candidate."
|
||||
if echo "${buildtags}" | grep -q "${GATE_SUFFIX}"; then
|
||||
echo "Tag with \"-${GATE_SUFFIX}\" found. Please complete gating before re-running.";
|
||||
exit 1;
|
||||
fi
|
||||
fi
|
||||
|
||||
done=0;
|
||||
for ver in ${SUPPORTED_VERS}; do
|
||||
vertag="rhel-${ver}";
|
||||
proposedtag="${vertag}-${SUFFIX}";
|
||||
echo "Checking if ${BUILD} has been added to ${vertag}...";
|
||||
if echo "${buildtags}" | grep -q "${vertag}" ; then
|
||||
echo "${BUILD} has been tagged into ${proposedtag}";
|
||||
else
|
||||
if [ "${SUFFIX}" = "${GATE_SUFFIX}" ] && [ "${done}" -eq 1 ]; then
|
||||
echo "Already added a tag. Need to tag ${proposedtag} in a future run.";
|
||||
else
|
||||
echo "Tagging ${BUILD} into ${proposedtag}";
|
||||
brew tag-build --nowait "${proposedtag}" "${BUILD}";
|
||||
done=1;
|
||||
fi
|
||||
fi
|
||||
done
|
||||
if [ "${done}" -eq 1 ]; then
|
||||
brew watch-task --mine;
|
||||
else
|
||||
echo "Nothing to do.";
|
||||
fi
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck tag_rhel.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,67 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Tag newer PQC embargoed RHEL 10 RPMs into supported z-streams
|
||||
|
||||
BUILD=${1}
|
||||
|
||||
if test "${BUILD}" = ""; then
|
||||
echo "${0} <BUILD>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
|
||||
SUPPORTED_VERS="10.2-z 10.1-z"
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
EMBARGOED_SUFFIX="nocompose-candidate"
|
||||
|
||||
echo "Obtaining buildinfo for ${BUILD}...";
|
||||
brew buildinfo "${BUILD}" 2>&1 | tee "${BUILDLOG}" > /dev/null
|
||||
|
||||
echo "Checking signatures for ${BUILD}...";
|
||||
"${WORKING_DIR}"/check_signatures.sh "${BUILDLOG}"
|
||||
|
||||
# Return codes:
|
||||
# - 1 - Buildinfo file not specified
|
||||
# - 2 = Missing buildinfo file
|
||||
# - 3 = No signatures
|
||||
# - 4 = Multiple signature types found
|
||||
# - 5 = PQC signature found
|
||||
# - 6 = Old signature (fd431d51) found
|
||||
# - 7 = Unknown signature found
|
||||
ret=$?;
|
||||
if [ "${ret}" -eq 6 ] ; then
|
||||
echo "Build has old signatures which should not be the case for OpenJDK 25";
|
||||
exit 2;
|
||||
elif ! { [ "${ret}" -eq 6 ] || [ "${ret}" -eq 3 ] ; } ; then
|
||||
echo "Signature check failed.";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
echo "Tagging embargoed build for ${SUPPORTED_VERS}...";
|
||||
"${WORKING_DIR}"/tag_rhel.sh "${BUILD}" "${BUILDLOG}" "${EMBARGOED_SUFFIX}" "${SUPPORTED_VERS}"
|
||||
|
||||
rm -f "${BUILDLOG}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck tag_rhel_10_embargoed_pqc.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,67 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Tag newer PQC public RHEL 10 RPMs into gating for all supported streams
|
||||
|
||||
BUILD=${1}
|
||||
|
||||
if test "${BUILD}" = ""; then
|
||||
echo "${0} <BUILD>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
|
||||
SUPPORTED_VERS="10.3 10.2-z 10.1-z"
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
GATE_SUFFIX="gate"
|
||||
|
||||
echo "Obtaining buildinfo for ${BUILD}...";
|
||||
brew buildinfo "${BUILD}" 2>&1 | tee "${BUILDLOG}" > /dev/null
|
||||
|
||||
echo "Checking signatures for ${BUILD}...";
|
||||
"${WORKING_DIR}"/check_signatures.sh "${BUILDLOG}"
|
||||
|
||||
# Return codes:
|
||||
# - 1 - Buildinfo file not specified
|
||||
# - 2 = Missing buildinfo file
|
||||
# - 3 = No signatures
|
||||
# - 4 = Multiple signature types found
|
||||
# - 5 = PQC signature found
|
||||
# - 6 = Old signature (fd431d51) found
|
||||
# - 7 = Unknown signature found
|
||||
ret=$?;
|
||||
if [ "${ret}" -eq 6 ] ; then
|
||||
echo "Build has old signatures which should not be the case for OpenJDK 25";
|
||||
exit 2;
|
||||
elif ! { [ "${ret}" -eq 5 ] || [ "${ret}" -eq 3 ] ; } ; then
|
||||
echo "Signature check failed.";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
echo "Tagging build into gating for ${SUPPORTED_VERS}...";
|
||||
"${WORKING_DIR}"/tag_rhel.sh "${BUILD}" "${BUILDLOG}" "${GATE_SUFFIX}" "${SUPPORTED_VERS}"
|
||||
|
||||
rm -f "${BUILDLOG}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck tag_rhel_10_public_pqc.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,67 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Tag newer PQC embargoed RHEL 9 RPMs into supported z-streams
|
||||
|
||||
BUILD=${1}
|
||||
|
||||
if test "${BUILD}" = ""; then
|
||||
echo "${0} <BUILD>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
|
||||
SUPPORTED_VERS="9.8.0-z 9.7.0-z"
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
EMBARGOED_SUFFIX="nocompose-candidate"
|
||||
|
||||
echo "Obtaining buildinfo for ${BUILD}...";
|
||||
brew buildinfo "${BUILD}" 2>&1 | tee "${BUILDLOG}" > /dev/null
|
||||
|
||||
echo "Checking signatures for ${BUILD}...";
|
||||
"${WORKING_DIR}"/check_signatures.sh "${BUILDLOG}"
|
||||
|
||||
# Return codes:
|
||||
# - 1 - Buildinfo file not specified
|
||||
# - 2 = Missing buildinfo file
|
||||
# - 3 = No signatures
|
||||
# - 4 = Multiple signature types found
|
||||
# - 5 = PQC signature found
|
||||
# - 6 = Old signature (fd431d51) found
|
||||
# - 7 = Unknown signature found
|
||||
ret=$?;
|
||||
if [ "${ret}" -eq 6 ] ; then
|
||||
echo "Build has old signatures which should not be the case for OpenJDK 25";
|
||||
exit 2;
|
||||
elif ! { [ "${ret}" -eq 6 ] || [ "${ret}" -eq 3 ] ; } ; then
|
||||
echo "Signature check failed.";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
echo "Tagging embargoed build for ${SUPPORTED_VERS}...";
|
||||
"${WORKING_DIR}"/tag_rhel.sh "${BUILD}" "${BUILDLOG}" "${EMBARGOED_SUFFIX}" "${SUPPORTED_VERS}"
|
||||
|
||||
rm -f "${BUILDLOG}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck tag_rhel_9_embargoed_pqc.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,67 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Tag newer PQC public RHEL 9 RPMs into gating for all supported streams
|
||||
|
||||
BUILD=${1}
|
||||
|
||||
if test "${BUILD}" = ""; then
|
||||
echo "${0} <BUILD>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
|
||||
SUPPORTED_VERS="9.9.0 9.8.0-z 9.7.0-z"
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
GATE_SUFFIX="gate"
|
||||
|
||||
echo "Obtaining buildinfo for ${BUILD}...";
|
||||
brew buildinfo "${BUILD}" 2>&1 | tee "${BUILDLOG}" > /dev/null
|
||||
|
||||
echo "Checking signatures for ${BUILD}...";
|
||||
"${WORKING_DIR}"/check_signatures.sh "${BUILDLOG}"
|
||||
|
||||
# Return codes:
|
||||
# - 1 - Buildinfo file not specified
|
||||
# - 2 = Missing buildinfo file
|
||||
# - 3 = No signatures
|
||||
# - 4 = Multiple signature types found
|
||||
# - 5 = PQC signature found
|
||||
# - 6 = Old signature (fd431d51) found
|
||||
# - 7 = Unknown signature found
|
||||
ret=$?;
|
||||
if [ "${ret}" -eq 6 ] ; then
|
||||
echo "Build has old signatures which should not be the case for OpenJDK 25";
|
||||
exit 2;
|
||||
elif ! { [ "${ret}" -eq 5 ] || [ "${ret}" -eq 3 ] ; } ; then
|
||||
echo "Signature check failed.";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
echo "Tagging build into gating for ${SUPPORTED_VERS}...";
|
||||
"${WORKING_DIR}"/tag_rhel.sh "${BUILD}" "${BUILDLOG}" "${GATE_SUFFIX}" "${SUPPORTED_VERS}"
|
||||
|
||||
rm -f "${BUILDLOG}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck tag_rhel_9_public_pqc.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,132 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Waive a gating issue
|
||||
|
||||
RHEL_VER=${1}
|
||||
NVR=${2}
|
||||
TESTCASE=${3}
|
||||
COMMENT=${4}
|
||||
|
||||
CURL=$(command -v curl)
|
||||
JSON_TOOL=$(command -v json_verify)
|
||||
JSON_FORMAT=$(command -v jq)
|
||||
JSON_FILE=$(mktemp --tmpdir waive.XXXXXX.json)
|
||||
HEADER_FILE=$(mktemp --tmpdir waive.XXXXXX.headers)
|
||||
JSON_OUT=$(mktemp --tmpdir out.XXXXXX.json)
|
||||
|
||||
CACERT=/etc/ssl/certs/2022-IT-Root-CA.pem
|
||||
CACERT_DIR=$(dirname ${CACERT})
|
||||
URL="https://waiverdb.engineering.redhat.com/api/v1.0/waivers/"
|
||||
|
||||
if test -z "${JSON_TOOL}" -o ! -x "${JSON_TOOL}" ; then
|
||||
echo "JSON verifier not found. Skipping verification.";
|
||||
SKIP_JSON=1;
|
||||
else
|
||||
SKIP_JSON=0;
|
||||
fi
|
||||
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <TESTCASE> <COMMENT>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <TESTCASE> <COMMENT>";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
if test "${TESTCASE}" = ""; then
|
||||
echo "No testcase specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <TESTCASE> <COMMENT>";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
if test "${COMMENT}" = ""; then
|
||||
COMMENT="Gating broken";
|
||||
echo "Setting COMMENT to default of '${COMMENT}'"
|
||||
fi
|
||||
|
||||
if test "${CURL}" = ""; then
|
||||
echo "curl not found";
|
||||
exit 4;
|
||||
fi
|
||||
|
||||
if test "${JSON_FORMAT}" = ""; then
|
||||
echo "jq not found";
|
||||
exit 5;
|
||||
fi
|
||||
|
||||
{
|
||||
echo "{";
|
||||
printf "\t\"subject_type\":\"brew-build\",\n";
|
||||
printf "\t\"subject_identifier\":\"%s\",\n" "${NVR}";
|
||||
printf "\t\"testcase\":\"%s\",\n" "${TESTCASE}";
|
||||
printf "\t\"waived\":true,\n";
|
||||
printf "\t\"product_version\":\"rhel-%d\",\n" "${RHEL_VER}"
|
||||
printf "\t\"comment\":\"%s\"\n" "${COMMENT}";
|
||||
echo "}"
|
||||
} > "${JSON_FILE}"
|
||||
|
||||
if [ "${SKIP_JSON}" -eq 0 ] ; then
|
||||
"${JSON_TOOL}" < "${JSON_FILE}" || exit 6;
|
||||
fi
|
||||
|
||||
CMD=("${CURL}" --silent --show-error --capath "${CACERT_DIR}" --negotiate -u :)
|
||||
|
||||
JSON_COMMAND="--json";
|
||||
# Check --json is available
|
||||
${CURL} ${JSON_COMMAND} 2> /dev/null
|
||||
if [ $? -eq 2 ] ; then
|
||||
echo "--json unsupported; falling back on --data-binary";
|
||||
{
|
||||
echo "Content-Type: application/json";
|
||||
echo "Accept: application/json";
|
||||
} > "${HEADER_FILE}"
|
||||
echo "Header file:";
|
||||
cat "${HEADER_FILE}"
|
||||
CMD=("${CMD[@]}" --header "@${HEADER_FILE}" --data-binary);
|
||||
else
|
||||
CMD=("${CMD[@]}" "${JSON_COMMAND}");
|
||||
fi
|
||||
CMD=("${CMD[@]}" "@${JSON_FILE}" "${URL}")
|
||||
|
||||
echo "Sending the following JSON...";
|
||||
cat "${JSON_FILE}"
|
||||
|
||||
echo "${CMD[@]}"
|
||||
|
||||
if command "${CMD[@]}" > "${JSON_OUT}" ; then
|
||||
"${JSON_FORMAT}" < "${JSON_OUT}"
|
||||
else
|
||||
echo "Failed to file waiver";
|
||||
exit 7;
|
||||
fi
|
||||
|
||||
rm -v "${JSON_FILE}"
|
||||
rm -v "${HEADER_FILE}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck waive_issue.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,46 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Waive the leapp gating test which never seems to work
|
||||
|
||||
RHEL_VER=${1}
|
||||
NVR=${2}
|
||||
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
"${WORKING_DIR}"/waive_issue.sh "${RHEL_VER}" "${NVR}" leapp.brew-build.upgrade.distro "AWOL"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck waive_leapp_issue.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,53 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Waive a rpminspect gating issue
|
||||
|
||||
RHEL_VER=${1}
|
||||
NVR=${2}
|
||||
COMMENT=${3}
|
||||
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <COMMENT>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <COMMENT>";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
if test "${COMMENT}" = ""; then
|
||||
echo "No comment specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <COMMENT>";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
"${WORKING_DIR}"/waive_issue.sh "${RHEL_VER}" "${NVR}" osci.brew-build.rpminspect.static-analysis "${COMMENT}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck waive_rpminspect.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,48 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Waive the recurring rpminspect gating issues
|
||||
# Should be resolved by RHELPLAN-102267
|
||||
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
|
||||
RHEL_VER=${1}
|
||||
NVR=${2}
|
||||
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
"${WORKING_DIR}"/waive_rpminspect.sh "${RHEL_VER}" "${NVR}" \
|
||||
"Usual failures we waived through rpmdiff; slowdebug unoptimised, RPATH and IPv4 functions"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck waive_usual_rpminspect.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,47 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Waive the usual tier0 gating issue
|
||||
# Should be resolved by OPENJDK-4517
|
||||
|
||||
RHEL_VER=${1}
|
||||
NVR=${2}
|
||||
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
"${WORKING_DIR}"/waive_issue.sh "${RHEL_VER}" "${NVR}" osci.brew-build.tier0.functional "Test unable to parse spec file"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck waive_usual_tier0.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,61 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
TREE=${1}
|
||||
|
||||
if test "${TREE}" = ""; then
|
||||
TREE=${PWD}
|
||||
fi
|
||||
|
||||
if [ -e "${TREE}"/nashorn/.hg ] || [ -e "${TREE}"/nashorn/merge.changeset ] ; then
|
||||
NASHORN="nashorn" ;
|
||||
fi
|
||||
|
||||
if [ -e "${TREE}"/corba/.hg ] || [ -e "${TREE}"/corba/merge.changeset ] ; then
|
||||
CORBA="corba";
|
||||
fi
|
||||
|
||||
if [ -e "${TREE}"/jaxp/.hg ] || [ -e "${TREE}"/jaxp/merge.changeset ] ; then
|
||||
JAXP="jaxp";
|
||||
fi
|
||||
|
||||
if [ -e "${TREE}"/jaxws/.hg ] || [ -e "${TREE}"/jaxws/merge.changeset ] ; then
|
||||
JAXWS="jaxws";
|
||||
fi
|
||||
|
||||
if [ -e "${TREE}"/langtools/.hg ] || [ -e "${TREE}"/langtools/merge.changeset ] ; then
|
||||
LANGTOOLS="langtools";
|
||||
fi
|
||||
|
||||
if [ -e "${TREE}"/jdk/.hg ] || [ -e "${TREE}"/jdk/merge.changeset ] ; then
|
||||
JDK="jdk";
|
||||
fi
|
||||
|
||||
if [ -e "${TREE}"/hotspot/.hg ] || [ -e "${TREE}"/hotspot/merge.changeset ] ; then
|
||||
HOTSPOT="hotspot";
|
||||
fi
|
||||
|
||||
SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
|
||||
echo "${SUBTREES}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck discover_trees.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,294 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
# Thomas Fitzsimmons <fitzsim@redhat.com>
|
||||
# Jiri Vanek <jvanek@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Generates the source tarball for OpenJDK projects.
|
||||
#
|
||||
# There are multiple ways to specify the source code location and version:
|
||||
#
|
||||
# 1. Specify the version (VERSION), the location of the Git repository
|
||||
# (REPO_ROOT) and the root of the output tarball name (FILE_NAME_ROOT)
|
||||
# 2. Specify the version (VERSION) along with an upstream project name
|
||||
# (PROJECT_NAME) and repository name (REPO_NAME) that can be used
|
||||
# to construct the URL of the upstream OpenJDK repository.
|
||||
# 3. Specify OPENJDK_LATEST=1 and allow the script to obtain the JDK
|
||||
# feature version from the spec file, which is then used to
|
||||
# obtain the latest build promotion from the upstream repository.
|
||||
#
|
||||
# An appropriate bootstrap JDK is also required for when ./configure
|
||||
# is run within the checked out repository to generate the .src-rev.
|
||||
# file. This can be specified by setting BOOT_JDK.
|
||||
#
|
||||
# Example 1:
|
||||
# This will check out the specified version from the specified
|
||||
# repository and construct a tarball called openjdk-17.0.3+5.tar.xz:
|
||||
#
|
||||
# $ VERSION=jdk-17.0.3+5 FILE_NAME_ROOT=open${VERSION} \
|
||||
# REPO_ROOT=$HOME/projects/openjdk/upstream/17u \
|
||||
# BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
|
||||
#
|
||||
# Example 2:
|
||||
# This will check out the same version as example 1, but from the
|
||||
# upstream repository:
|
||||
#
|
||||
# $ VERSION=jdk-17.0.3+5 PROJECT_NAME=openjdk REPO_NAME=jdk17u \
|
||||
# BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
|
||||
#
|
||||
# Example 3:
|
||||
# This will read the OpenJDK feature version from the spec file, then create a
|
||||
# tarball from the most recent tag for that version in the upstream Git
|
||||
# repository.
|
||||
#
|
||||
# $ OPENJDK_LATEST=1 \
|
||||
# BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
|
||||
#
|
||||
|
||||
set -e
|
||||
|
||||
OPENJDK_URL_DEFAULT=https://github.com
|
||||
COMPRESSION_DEFAULT=xz
|
||||
|
||||
if [ "$1" = "help" ] ; then
|
||||
echo "Behaviour may be specified by setting the following variables:"
|
||||
echo
|
||||
echo "VERSION - the version of the specified OpenJDK project"
|
||||
echo " (required unless OPENJDK_LATEST is set)"
|
||||
echo "PROJECT_NAME - the name of the OpenJDK project being archived"
|
||||
echo " (needed to compute REPO_ROOT and/or"
|
||||
echo " FILE_NAME_ROOT automatically;"
|
||||
echo " optional if they are set explicitly)"
|
||||
echo "REPO_NAME - the name of the OpenJDK repository"
|
||||
echo " (needed to compute REPO_ROOT automatically;"
|
||||
echo " optional if REPO_ROOT is set explicitly)"
|
||||
echo "OPENJDK_URL - the URL to retrieve code from"
|
||||
echo " (defaults to ${OPENJDK_URL_DEFAULT})"
|
||||
echo "COMPRESSION - the compression type to use"
|
||||
echo " (defaults to ${COMPRESSION_DEFAULT})"
|
||||
echo "FILE_NAME_ROOT - name of the archive, minus extensions"
|
||||
echo " (defaults to PROJECT_NAME-VERSION)"
|
||||
echo "REPO_ROOT - the location of the Git repository to archive"
|
||||
echo " (defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
|
||||
echo "TO_COMPRESS - what part of clone to pack"
|
||||
echo " (defaults to ${VERSION})"
|
||||
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
|
||||
echo " (defaults to packaged JDK version)"
|
||||
echo "WITH_TEMP - run in a temporary directory"
|
||||
echo " (defaults to disabled)"
|
||||
echo "OPENJDK_LATEST - deduce VERSION from most recent upstream tag"
|
||||
echo " (implies WITH_TEMP, computes everything else"
|
||||
echo " automatically; Note: accesses network to read"
|
||||
echo " tag list from remote Git repository)"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if [ "$OPENJDK_LATEST" != "" ] ; then
|
||||
FEATURE_VERSION=$(echo '%featurever' \
|
||||
| rpmspec --shell ./*.spec 2>/dev/null \
|
||||
| grep --after-context 1 featurever \
|
||||
| tail --lines 1)
|
||||
PROJECT_NAME=openjdk
|
||||
REPO_NAME=jdk"${FEATURE_VERSION}"u
|
||||
# Skip -ga tags since those are the same as the most recent non-ga tag, and
|
||||
# the non-ga tag is the one that is used to generated the official source
|
||||
# tarball. For example:
|
||||
# ca760c86642aa2e0d9b571aaabac054c0239fbdc refs/tags/jdk-17.0.10-ga^{}
|
||||
# 25a2e6c20c9a96853714284cabc6b456eb095070 refs/tags/jdk-17.0.10-ga
|
||||
# ca760c86642aa2e0d9b571aaabac054c0239fbdc refs/tags/jdk-17.0.10+7^{}
|
||||
# e49c5749b10f3e90274b72e9279f794fdd191d27 refs/tags/jdk-17.0.10+7
|
||||
VERSION=$(git ls-remote --tags --refs --sort=-version:refname \
|
||||
"${OPENJDK_URL_DEFAULT}/${PROJECT_NAME}/${REPO_NAME}.git" \
|
||||
"jdk-${FEATURE_VERSION}*" \
|
||||
| grep --invert-match '\-ga$' \
|
||||
| head --lines 1 | cut --characters 52-)
|
||||
FILE_NAME_ROOT=open${VERSION}
|
||||
WITH_TEMP=1
|
||||
fi
|
||||
|
||||
if [ "$WITH_TEMP" != "" ] ; then
|
||||
pushd "$(mktemp --directory --tmpdir temp-generated-source-tarball-XXX)"
|
||||
fi
|
||||
|
||||
if [ "$VERSION" = "" ] ; then
|
||||
echo "No VERSION specified"
|
||||
exit 2
|
||||
fi
|
||||
echo "Version: ${VERSION}"
|
||||
|
||||
NUM_VER=${VERSION##jdk-}
|
||||
RELEASE_VER=${NUM_VER%%+*}
|
||||
BUILD_VER=${NUM_VER##*+}
|
||||
MAJOR_VER=${RELEASE_VER%%.*}
|
||||
echo "Major version is ${MAJOR_VER}, release ${RELEASE_VER}, build ${BUILD_VER}"
|
||||
|
||||
if [ "$BOOT_JDK" = "" ] ; then
|
||||
echo "No boot JDK specified".
|
||||
BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
|
||||
echo -n "Checking for ${BOOT_JDK}...";
|
||||
if [ -d "${BOOT_JDK}" ] && [ -x "${BOOT_JDK}"/bin/java ] ; then
|
||||
echo "Boot JDK found at ${BOOT_JDK}";
|
||||
else
|
||||
echo "Not found";
|
||||
PREV_VER=$((MAJOR_VER - 1));
|
||||
BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
|
||||
echo -n "Checking for ${BOOT_JDK}...";
|
||||
if [ -d ${BOOT_JDK} ] && [ -x ${BOOT_JDK}/bin/java ] ; then
|
||||
echo "Boot JDK found at ${BOOT_JDK}";
|
||||
else
|
||||
echo "Not found";
|
||||
exit 4;
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo "Boot JDK: ${BOOT_JDK}";
|
||||
fi
|
||||
|
||||
if [ "$OPENJDK_URL" = "" ] ; then
|
||||
OPENJDK_URL=${OPENJDK_URL_DEFAULT}
|
||||
echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
|
||||
else
|
||||
echo "OpenJDK URL: ${OPENJDK_URL}"
|
||||
fi
|
||||
|
||||
if [ "$COMPRESSION" = "" ] ; then
|
||||
# rhel 5 needs tar.gz
|
||||
COMPRESSION=${COMPRESSION_DEFAULT}
|
||||
fi
|
||||
echo "Creating a tar.${COMPRESSION} archive"
|
||||
|
||||
if [ "$FILE_NAME_ROOT" = "" ] ; then
|
||||
if [ "$PROJECT_NAME" = "" ] ; then
|
||||
echo "No PROJECT_NAME specified, needed by FILE_NAME_ROOT"
|
||||
exit 1
|
||||
fi
|
||||
FILE_NAME_ROOT=${PROJECT_NAME}-${VERSION}
|
||||
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
|
||||
fi
|
||||
if [ "$REPO_ROOT" = "" ] ; then
|
||||
if [ "$PROJECT_NAME" = "" ] ; then
|
||||
echo "No PROJECT_NAME specified, needed by REPO_ROOT"
|
||||
exit 1
|
||||
fi
|
||||
if [ "$REPO_NAME" = "" ] ; then
|
||||
echo "No REPO_NAME specified, needed by REPO_ROOT"
|
||||
exit 3
|
||||
fi
|
||||
REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
|
||||
echo "No repository root specified; default to ${REPO_ROOT}"
|
||||
fi;
|
||||
|
||||
if [ "$TO_COMPRESS" = "" ] ; then
|
||||
TO_COMPRESS="${VERSION}"
|
||||
echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
|
||||
fi;
|
||||
|
||||
echo -e "Settings:"
|
||||
echo -e "\tVERSION: ${VERSION}"
|
||||
echo -e "\tPROJECT_NAME: ${PROJECT_NAME}"
|
||||
echo -e "\tREPO_NAME: ${REPO_NAME}"
|
||||
echo -e "\tOPENJDK_URL: ${OPENJDK_URL}"
|
||||
echo -e "\tCOMPRESSION: ${COMPRESSION}"
|
||||
echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
|
||||
echo -e "\tREPO_ROOT: ${REPO_ROOT}"
|
||||
echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
|
||||
echo -e "\tBOOT_JDK: ${BOOT_JDK}"
|
||||
echo -e "\tWITH_TEMP: ${WITH_TEMP}"
|
||||
echo -e "\tOPENJDK_LATEST: ${OPENJDK_LATEST}"
|
||||
|
||||
if [ -d "${FILE_NAME_ROOT}" ] ; then
|
||||
echo "Reusing existing ${FILE_NAME_ROOT}"
|
||||
STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
|
||||
TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
|
||||
else
|
||||
mkdir "${FILE_NAME_ROOT}"
|
||||
pushd "${FILE_NAME_ROOT}"
|
||||
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
|
||||
if realpath -q "${REPO_ROOT}"; then
|
||||
echo "Local path detected; not adding depth argument";
|
||||
DEPTH="--";
|
||||
else
|
||||
DEPTH="--depth=1";
|
||||
echo "Remote repository detected; adding ${DEPTH}";
|
||||
fi
|
||||
git clone -b "${VERSION}" "${DEPTH}" "${REPO_ROOT}" "${VERSION}"
|
||||
pushd "${VERSION}"
|
||||
TAR_TIME="$(git log --max-count 1 --format=%cI)"
|
||||
popd
|
||||
popd
|
||||
fi
|
||||
pushd "${FILE_NAME_ROOT}"
|
||||
# Generate .src-rev so build has knowledge of the revision the tarball was
|
||||
# created from
|
||||
mkdir build
|
||||
pushd build
|
||||
sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
|
||||
make store-source-revision
|
||||
popd
|
||||
rm -rf build
|
||||
|
||||
# Remove commit checks
|
||||
echo "Removing $(find "${VERSION}" -name '.jcheck' -print)"
|
||||
find "${VERSION}" -name '.jcheck' -print0 | xargs -0 rm -r
|
||||
|
||||
# Remove history and GHA
|
||||
echo "find ${VERSION} -name '.hgtags'"
|
||||
find "${VERSION}" -name '.hgtags' -exec rm -v '{}' '+'
|
||||
echo "find ${VERSION} -name '.hgignore'"
|
||||
find "${VERSION}" -name '.hgignore' -exec rm -v '{}' '+'
|
||||
echo "find ${VERSION} -name '.gitattributes'"
|
||||
find "${VERSION}" -name '.gitattributes' -exec rm -v '{}' '+'
|
||||
echo "find ${VERSION} -name '.gitignore'"
|
||||
find "${VERSION}" -name '.gitignore' -exec rm -v '{}' '+'
|
||||
# Work around some Git objects not having write permissions.
|
||||
echo "chmod --recursive u+w ${VERSION}/.git"
|
||||
chmod --recursive u+w "${VERSION}"/.git
|
||||
echo "find ${VERSION} -name '.git'"
|
||||
find "${VERSION}" -name '.git' -exec rm -rv '{}' '+'
|
||||
echo "find ${VERSION} -name '.github'"
|
||||
find "${VERSION}" -name '.github' -exec rm -rv '{}' '+'
|
||||
|
||||
echo "Compressing remaining forest"
|
||||
if [ "$COMPRESSION" = "xz" ] ; then
|
||||
SWITCH=cJf
|
||||
else
|
||||
SWITCH=czf
|
||||
fi
|
||||
EA_PART="$(awk -F= \
|
||||
'/^DEFAULT_PROMOTED_VERSION_PRE/ { if ($2) print "-"$2 }' \
|
||||
"${VERSION}"/make/conf/version-numbers.conf)"
|
||||
TARBALL_NAME=${FILE_NAME_ROOT}${EA_PART}.tar.${COMPRESSION}
|
||||
XZ_OPT=${XZ_OPT-"-T0"} \
|
||||
tar --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \
|
||||
--exclude-vcs -$SWITCH "${TARBALL_NAME}" "${TO_COMPRESS}"
|
||||
mv "${TARBALL_NAME}" ..
|
||||
popd
|
||||
if [ "$WITH_TEMP" != "" ] ; then
|
||||
echo "Tarball is: $(realpath .)/${TARBALL_NAME}"
|
||||
popd
|
||||
else
|
||||
echo -n "Done. You may want to remove the uncompressed version"
|
||||
echo " - $FILE_NAME_ROOT"
|
||||
fi
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck generate_source_tarball.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,172 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
# Copyright (C) 2025 Red Hat, Inc.
|
||||
# Original written by Antonio Vieiro <avieirov@redhat.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
if [ $# -ne 1 ]; then
|
||||
echo "Usage: $0 openjdk-root-directory"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
JDKROOT=$1
|
||||
|
||||
if [ ! -d "${JDKROOT}" ] ; then
|
||||
echo "${JDKROOT} is not a directory.";
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# Work out the OpenJDK version
|
||||
# OpenJDK >= 10 has its version in the build machinery
|
||||
# OpenJDK >= 17 stores it in a new location (JDK-8258246)
|
||||
VERSION_FILE="${JDKROOT}"/make/conf/version-numbers.conf
|
||||
printf "Checking for %s..." "${VERSION_FILE}";
|
||||
if [ ! -f "${VERSION_FILE}" ] ; then
|
||||
VERSION_FILE="${JDKROOT}"/make/autoconf/version-numbers
|
||||
echo "Not found; using old version file ${VERSION_FILE}";
|
||||
else
|
||||
echo "found.";
|
||||
fi
|
||||
if [ -e "${VERSION_FILE}" ] ; then
|
||||
openjdk_version=$(grep '^DEFAULT_VERSION_FEATURE' "${VERSION_FILE}" | cut -d '=' -f 2)
|
||||
elif [ -e "${JDKROOT}"/jdk/src/java.base/share/classes/java/lang/Object.java ] ; then
|
||||
openjdk_version=9;
|
||||
elif [ -e "${JDKROOT}"/common/autoconf ] ; then
|
||||
openjdk_version=8;
|
||||
else
|
||||
openjdk_version=7;
|
||||
fi
|
||||
echo "OpenJDK version: ${openjdk_version}";
|
||||
|
||||
#
|
||||
# Freetype
|
||||
#
|
||||
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||
FREETYPE=src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
|
||||
ABS_FREETYPE="${JDKROOT}"/"${FREETYPE}"
|
||||
if [ ! -f "${ABS_FREETYPE}" ]; then
|
||||
echo "Freetype header not found!"
|
||||
exit 2
|
||||
fi
|
||||
FREETYPE_VERSION=$(awk '/#define FREETYPE_MAJOR/ {MAJOR=$3} /#define FREETYPE_MINOR/ {MINOR=$3} /#define FREETYPE_PATCH/ {PATCH=$3} END {printf "%s.%s.%s", MAJOR, MINOR, PATCH}' "${ABS_FREETYPE}")
|
||||
else
|
||||
echo "No bundled FreeType on ${openjdk_version}";
|
||||
fi
|
||||
|
||||
# giflib
|
||||
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||
GIFLIB=src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
||||
else
|
||||
GIFLIB=jdk/src/share/native/sun/awt/giflib/gif_lib.h
|
||||
fi
|
||||
ABS_GIFLIB="${JDKROOT}"/"${GIFLIB}"
|
||||
if [ ! -f "${ABS_GIFLIB}" ]; then
|
||||
echo "giflib header not found!"
|
||||
exit 3
|
||||
fi
|
||||
GIFLIB_VERSION=$(awk '/#define GIFLIB_MAJOR/ {MAJOR=$3} /#define GIFLIB_MINOR/ {MINOR=$3} /#define GIFLIB_RELEASE/ {PATCH=$3} END {printf "%s.%s.%s", MAJOR, MINOR, PATCH}' "${ABS_GIFLIB}")
|
||||
|
||||
# harfbuzz
|
||||
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||
HARFBUZZ=src/java.desktop/share/native/libharfbuzz/hb-version.h
|
||||
ABS_HARFBUZZ="${JDKROOT}/${HARFBUZZ}"
|
||||
if [ ! -f "${ABS_HARFBUZZ}" ]; then
|
||||
echo "HarfBuzz header not found!"
|
||||
exit 4
|
||||
fi
|
||||
HARFBUZZ_VERSION=$(awk '/#define HB_VERSION_MAJOR/ {MAJOR=$3} /#define HB_VERSION_MINOR/ {MINOR=$3} /#define HB_VERSION_MICRO/ {PATCH=$3} END {printf "%s.%s.%s", MAJOR, MINOR, PATCH}' "${ABS_HARFBUZZ}")
|
||||
else
|
||||
echo "No HarfBuzz on ${openjdk_version}";
|
||||
fi
|
||||
|
||||
# lcms
|
||||
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||
LCMS=src/java.desktop/share/native/liblcms/lcms2.h
|
||||
else
|
||||
LCMS=jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
|
||||
fi
|
||||
ABS_LCMS="${JDKROOT}"/"${LCMS}"
|
||||
if [ ! -f "${ABS_LCMS}" ]; then
|
||||
echo "lcms header not found!"
|
||||
exit 5
|
||||
fi
|
||||
LCMS_VERSION=$(awk '/#define LCMS_VERSION/ { MAJOR=int($3 / 1000); REST=$3 % 1000; MINOR=int(REST / 10); PATCH=REST % 10; } END {printf "%s.%s.%s", MAJOR, MINOR, PATCH}' "${ABS_LCMS}")
|
||||
|
||||
# jpeg
|
||||
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||
JPEG=src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
||||
else
|
||||
JPEG=jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
|
||||
fi
|
||||
ABS_JPEG="${JDKROOT}"/"${JPEG}"
|
||||
if [ ! -f "${ABS_JPEG}" ]; then
|
||||
echo "jpeg header not found!"
|
||||
exit 6
|
||||
fi
|
||||
JPEG_VERSION=$(awk '/#define JPEG_LIB_VERSION/ { VERSION=$3; MAJOR=int(VERSION / 10); MINOR=VERSION%10; } END {printf "%s%c", MAJOR, (MINOR+96)}' "${ABS_JPEG}")
|
||||
|
||||
# png
|
||||
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||
PNG=src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
||||
else
|
||||
PNG=jdk/src/share/native/sun/awt/libpng/png.h
|
||||
fi
|
||||
ABS_PNG="${JDKROOT}"/"${PNG}"
|
||||
if [ ! -f "${ABS_PNG}" ]; then
|
||||
echo "png header not found!"
|
||||
exit 7
|
||||
fi
|
||||
PNG_VERSION=$(awk '/#define PNG_LIBPNG_VER_STRING/ { VERSION=$3; gsub("\"", "", VERSION) } END {print VERSION}' "${ABS_PNG}")
|
||||
|
||||
# zlib
|
||||
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||
ZLIB=src/java.base/share/native/libzip/zlib/zlib.h
|
||||
else
|
||||
ZLIB=jdk/src/share/native/java/util/zip/zlib/zlib.h
|
||||
fi
|
||||
ABS_ZLIB="${JDKROOT}"/"${ZLIB}"
|
||||
if [ ! -f "${ABS_ZLIB}" ]; then
|
||||
echo "zlib header not found!"
|
||||
exit 8
|
||||
fi
|
||||
ZLIB_VERSION=$(awk '/#define ZLIB_VERSION/ { VERSION=$3; gsub("\"", "", VERSION) } END {print VERSION}' "${ABS_ZLIB}")
|
||||
|
||||
# Print output
|
||||
printf "\nRPM definitions:\n"
|
||||
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||
echo "# Version in ${FREETYPE}"
|
||||
echo "Provides: bundled(freetype) = ${FREETYPE_VERSION}"
|
||||
fi
|
||||
echo "# Version in ${GIFLIB}"
|
||||
echo "Provides: bundled(giflib) = ${GIFLIB_VERSION}"
|
||||
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||
echo "# Version in ${HARFBUZZ}"
|
||||
echo "Provides: bundled(harfbuzz) = ${HARFBUZZ_VERSION}"
|
||||
fi
|
||||
echo "# Version in ${LCMS}"
|
||||
echo "Provides: bundled(lcms2) = ${LCMS_VERSION}"
|
||||
echo "# Version in ${JPEG}"
|
||||
echo "Provides: bundled(libjpeg) = ${JPEG_VERSION}"
|
||||
echo "# Version in ${PNG}"
|
||||
echo "Provides: bundled(libpng) = ${PNG_VERSION}"
|
||||
echo "# Version in ${ZLIB}"
|
||||
echo "Provides: bundled(zlib) = ${ZLIB_VERSION}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck get_bundle_versions.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,198 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
ICEDTEA_USE_VCS=true
|
||||
|
||||
ICEDTEA_VERSION=3.15.0
|
||||
ICEDTEA_URL=https://icedtea.classpath.org/download/source
|
||||
ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
|
||||
|
||||
ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
|
||||
set -e
|
||||
|
||||
RPM_DIR=${PWD}
|
||||
if [ ! -f "${RPM_DIR}/jconsole.desktop.in" ] ; then
|
||||
echo "Not in RPM source tree.";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "${TMPDIR}" = ""; then
|
||||
TMPDIR=/tmp;
|
||||
fi
|
||||
WORKDIR=${TMPDIR}/it.sync
|
||||
|
||||
echo "Using working directory ${WORKDIR}"
|
||||
mkdir "${WORKDIR}"
|
||||
pushd "${WORKDIR}"
|
||||
|
||||
if test "${WGET}" = ""; then
|
||||
WGET=$(which wget);
|
||||
if test "${WGET}" = ""; then
|
||||
echo "wget not found";
|
||||
exit 1;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "${TAR}" = ""; then
|
||||
TAR=$(which tar)
|
||||
if test "${TAR}" = ""; then
|
||||
echo "tar not found";
|
||||
exit 2;
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Dependencies:";
|
||||
echo -e "\tWGET: ${WGET}";
|
||||
echo -e "\tTAR: ${TAR}\n";
|
||||
|
||||
if test "${ICEDTEA_USE_VCS}" = "true"; then
|
||||
echo "Mode: Using VCS";
|
||||
|
||||
if test "${GREP}" = ""; then
|
||||
GREP=$(which grep);
|
||||
if test "${GREP}" = ""; then
|
||||
echo "grep not found";
|
||||
exit 3;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "${CUT}" = ""; then
|
||||
CUT=$(which cut);
|
||||
if test "${CUT}" = ""; then
|
||||
echo "cut not found";
|
||||
exit 4;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "${TR}" = ""; then
|
||||
TR=$(which tr);
|
||||
if test "${TR}" = ""; then
|
||||
echo "tr not found";
|
||||
exit 5;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "${HG}" = ""; then
|
||||
HG=$(which hg);
|
||||
if test "${HG}" = ""; then
|
||||
echo "hg not found";
|
||||
exit 6;
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Dependencies:";
|
||||
echo -e "\tGREP: ${GREP}";
|
||||
echo -e "\tCUT: ${CUT}";
|
||||
echo -e "\tTR: ${TR}";
|
||||
echo -e "\tHG: ${HG}";
|
||||
|
||||
echo "Checking out repository from VCS...";
|
||||
${HG} clone ${ICEDTEA_HG_URL} icedtea
|
||||
|
||||
echo "Obtaining version from configure.ac...";
|
||||
ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
|
||||
echo "Root version from configure: ${ROOT_VER}";
|
||||
|
||||
VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
|
||||
echo "VCS revision: ${VCS_REV}";
|
||||
|
||||
ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
|
||||
echo "Creating icedtea-${ICEDTEA_VERSION}";
|
||||
mkdir "icedtea-${ICEDTEA_VERSION}"
|
||||
echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
|
||||
# Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
|
||||
#cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
|
||||
cp -a "${RPM_DIR}/jconsole.desktop.in" "icedtea-${ICEDTEA_VERSION}"
|
||||
cp -a icedtea/tapset "icedtea-${ICEDTEA_VERSION}"
|
||||
|
||||
rm -rf icedtea
|
||||
else
|
||||
echo "Mode: Using tarball";
|
||||
|
||||
if test "${ICEDTEA_VERSION}" = ""; then
|
||||
echo "No IcedTea version specified for tarball download.";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
if test "${CHECKSUM}" = ""; then
|
||||
CHECKSUM=$(which sha256sum)
|
||||
if test "${CHECKSUM}" = ""; then
|
||||
echo "sha256sum not found";
|
||||
exit 4;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "${PGP}" = ""; then
|
||||
PGP=$(which gpg)
|
||||
if test "${PGP}" = ""; then
|
||||
echo "gpg not found";
|
||||
exit 5;
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Dependencies:";
|
||||
echo -e "\tCHECKSUM: ${CHECKSUM}";
|
||||
echo -e "\tPGP: ${PGP}\n";
|
||||
|
||||
echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
|
||||
if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
|
||||
echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
|
||||
exit 6;
|
||||
fi
|
||||
|
||||
echo "Downloading IcedTea release tarball...";
|
||||
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
|
||||
echo "Downloading IcedTea tarball signature...";
|
||||
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||
echo "Downloading IcedTea tarball checksums...";
|
||||
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
|
||||
|
||||
echo "Verifying checksums...";
|
||||
${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
|
||||
|
||||
echo "Checking signature...";
|
||||
${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||
|
||||
echo "Extracting files...";
|
||||
${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
|
||||
icedtea-${ICEDTEA_VERSION}/tapset \
|
||||
icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
|
||||
|
||||
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
|
||||
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||
rm -vf icedtea-${ICEDTEA_VERSION}.sha256
|
||||
fi
|
||||
|
||||
echo "Replacing desktop files...";
|
||||
mv -v "icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in" "${RPM_DIR}"
|
||||
|
||||
echo "Creating new tapset tarball...";
|
||||
mv -v "icedtea-${ICEDTEA_VERSION}" openjdk
|
||||
${TAR} cJf "${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz" openjdk
|
||||
|
||||
rm -rvf openjdk
|
||||
|
||||
popd
|
||||
rm -rf "${WORKDIR}"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck icedtea_sync.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
@ -1,114 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>, 2012-2022
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
OLD_RELEASE=$1
|
||||
NEW_RELEASE=$2
|
||||
REPO=$3
|
||||
SUBDIR=$4
|
||||
SCRIPT_DIR=$(dirname "${0}")
|
||||
|
||||
if test "${SUBDIR}" = ""; then
|
||||
echo "No subdirectory specified; using .";
|
||||
SUBDIR=".";
|
||||
fi
|
||||
|
||||
if test "$REPO" = ""; then
|
||||
echo "No repository specified; using ${PWD}"
|
||||
REPO=${PWD}
|
||||
fi
|
||||
|
||||
if test "${TMPDIR}" = ""; then
|
||||
TMPDIR=/tmp;
|
||||
fi
|
||||
|
||||
echo "Repository: ${REPO}"
|
||||
|
||||
if [ -e "${REPO}/.git" ] ; then
|
||||
TYPE=git;
|
||||
elif [ -e "${REPO}/.hg" ] ; then
|
||||
TYPE=hg;
|
||||
else
|
||||
echo "No Mercurial or Git repository detected.";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "$OLD_RELEASE" = "" || test "$NEW_RELEASE" = ""; then
|
||||
echo "ERROR: Need to specify old and new release";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
echo "Listing fixes between $OLD_RELEASE and $NEW_RELEASE in $REPO"
|
||||
rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" "${TMPDIR}/fixes"
|
||||
for repos in . $("${SCRIPT_DIR}/discover_trees.sh" "${REPO}");
|
||||
do
|
||||
if test "$TYPE" = "hg"; then
|
||||
hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R "$REPO/$repos" -G -M "${REPO}/${SUBDIR}" | \
|
||||
grep -E '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])# - JDK-\1#'| \
|
||||
sed 's#^[o:| ]*summary:\W*# - #' >> "${TMPDIR}/fixes2";
|
||||
hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R "$REPO/$repos" -G -M "${REPO}/${SUBDIR}" | \
|
||||
grep -E '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})# - JDK-\1#' >> "${TMPDIR}/fixes3";
|
||||
else
|
||||
git -C "${REPO}" log --no-merges --pretty=format:%B "${NEW_RELEASE}...${OLD_RELEASE}" -- "${SUBDIR}" |grep -E '^[0-9]{7}' | \
|
||||
sed -r 's#^([0-9])# - JDK-\1#' >> "${TMPDIR}/fixes2";
|
||||
touch "${TMPDIR}/fixes3" ; # unused
|
||||
fi
|
||||
done
|
||||
|
||||
sort "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" > "${TMPDIR}/fixes4"
|
||||
uniq "${TMPDIR}/fixes4" > "${TMPDIR}/fixes"
|
||||
rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3"
|
||||
|
||||
if ! [ -s "${TMPDIR}/fixes" ] ; then
|
||||
echo "Failed to obtain fixes.";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
echo "In ${TMPDIR}/fixes:"
|
||||
cat "${TMPDIR}/fixes"
|
||||
|
||||
printf "\nChecking for duplicates...";
|
||||
if uniq -d "${TMPDIR}/fixes4" | grep 'JDK' > "${TMPDIR}/dupes"; then
|
||||
printf "found.\nWARNING: Review the following duplicates:\n";
|
||||
cat "${TMPDIR}/dupes";
|
||||
else
|
||||
echo "No apparent duplicates.";
|
||||
fi
|
||||
rm -f "${TMPDIR}/fixes4";
|
||||
|
||||
printf "\nChecking for backouts...";
|
||||
if grep -i 'backout' "${TMPDIR}/fixes" > "${TMPDIR}/backouts"; then
|
||||
printf "found.\nWARNING: Review the following backouts:\n"
|
||||
cat "${TMPDIR}/backouts";
|
||||
else
|
||||
echo "No apparent backouts.";
|
||||
fi
|
||||
printf "\nChecking for bundled library updates...";
|
||||
if grep -iE ':( \(tz\))? (update|upgrade).*(freetype|gif|harfbuzz|lcms|jpeg|png|timezone|zlib)' "${TMPDIR}/fixes" > "${TMPDIR}/bundles"; then
|
||||
printf "found.\nWARNING: Review the following with respect to bundled provides:\n";
|
||||
cat "${TMPDIR}/bundles";
|
||||
echo "Compare the output of $(dirname "${0}")/get_bundle_versions.sh with the RPM using the JDK source tree"
|
||||
else
|
||||
echo "No apparent library updates.";
|
||||
fi
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck openjdk_news.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
3
sources
3
sources
@ -1,3 +0,0 @@
|
||||
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
||||
SHA512 (nssadapter-0.1.1.tar.xz) = 2b4675cfbfa2ccb6c9a4870a4b58ae555267f5b8c9bdb0cf37b075483e6e9ea929561c05070453cf0d67b0b029de5408274555bf2ff50e9533219e898b2717f9
|
||||
SHA512 (openjdk-25.0.3+9.tar.xz) = 382dcf42ede35c7e48e0f9403d30172e6bc6367517e0c49211ab9d2e43373c3d7e586969c27795f0bfd17ae5c9f00702e955495a31d7ea757f54f06e8a4cf113
|
||||
@ -1,21 +0,0 @@
|
||||
---
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-source
|
||||
tags:
|
||||
- always
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
- atomic
|
||||
required_packages:
|
||||
- java-21-openjdk-devel
|
||||
tests:
|
||||
- javaVersion1:
|
||||
dir: ~
|
||||
run: set -ex; useradd franta1; su franta1 -c 'java -version';
|
||||
run: set -ex; useradd franta4; su franta4 -c 'javac -version';
|
||||
run: ls -l /usr/lib/jvm;
|
||||
- javaVersion2:
|
||||
dir: ~
|
||||
run: set -ex; useradd franta2; su franta2 -c 'java --version'
|
||||
Loading…
Reference in New Issue
Block a user