Merge ~vpa1977/ubuntu/+source/openjdk-20:05_pack_external_symbols into ubuntu/+source/openjdk-20:ubuntu/devel

[Vladimir Petko]

This is a final merge proposal of the series [1][2][3][4][5]

Summary of changes:

Following google test fail due to absence of debug symbols:
[ FAILED ] 3 tests, listed below:
[ FAILED ] os_linux.decoder_get_source_info_valid_vm
[ FAILED ] os_linux.decoder_get_source_info_valid_overflow_vm
[ FAILED ] os_linux.decoder_get_source_info_valid_overflow_minimal_vm

Add external debug symbols and package them in /usr/lib/debug.
Remove #ifdef to ensure that build fails when debug symbols are not produced.

PPA: ppa:vpa1977/openjdk-20-testng75 [6]

Testing:

JTREG tests during build should pass (this depends on integrating merge proposals [3][4][5])
-----------------------------cut----------------------------------------
BEGIN jtreg-summary-hotspot
cat jtreg-test-output/jtreg-summary-hotspot.log
--------------- jtreg console summary for jdk ---------------

(xfwm4:264332): dbind-WARNING **: 11:21:30.264: AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files

(xfwm4:264332): xfwm4-WARNING **: 11:21:30.765: Another compositing manager is running on screen 0

(xfwm4:264332): xfwm4-WARNING **: 11:21:30.766: Failed to connect to session manager: Failed to connect to the session manager: SESSION_MANAGER environment variable not defined
Test results: passed: 6,217
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
Killed
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 2,825
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for langtools ---------------
Test results: passed: 4,359
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jaxp ---------------
Test results: passed: 470
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
END jtreg-summary-hotspot
-----------------------------cut----------------------------------------
[7]

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/440200
[2] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/440201
[3] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/440202
[4] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/440203
[5] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/440204
[6] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-20-testng75
[7] https://launchpadlibrarian.net/658949748/buildlog_ubuntu-lunar-amd64.openjdk-20_20+36~us1-0ubuntu1~ppa25_BUILDING.txt.gz

[Vladimir Petko (vpa1977)]

JTREG test results - all pass:

AMD64:
===== END check-jdk =====
for i in hotspot langtools jaxp jdk; do \
  echo "--------------- jtreg console summary for $i ---------------"; \
  egrep -v '^(Passed:|Directory|Re[a-z]+\ written\ to)' jtreg-test-output/check-$i.log; \
done | tee jtreg-test-output/jtreg-summary.log
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 2,825
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for langtools ---------------
Test results: passed: 4,359
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jaxp ---------------
Test results: passed: 470
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jdk ---------------

(xfwm4:1388051): dbind-WARNING **: 07:39:10.085: AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files

(xfwm4:1388051): xfwm4-WARNING **: 07:39:10.616: Another compositing manager is running on screen 0

(xfwm4:1388051): xfwm4-WARNING **: 07:39:10.618: Failed to connect to session manager: Failed to connect to the session manager: SESSION_MANAGER environment variable not defined
Test results: passed: 6,218
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.

ARM64:
===== END check-jdk =====
for i in hotspot langtools jaxp jdk; do \
  echo "--------------- jtreg console summary for $i ---------------"; \
  egrep -v '^(Passed:|Directory|Re[a-z]+\ written\ to)' jtreg-test-output/check-$i.log; \
done | tee jtreg-test-output/jtreg-summary.log
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 2,808
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/arm64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-arm64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for langtools ---------------
Test results: passed: 4,359
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/arm64.
Reason: '/usr/share/doc/openjdk-20-jre-headless//test-arm64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jaxp ---------------
Test results: passed: 470
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compar...

[Graham Inggs (ginggs)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c510486..8f5197c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openjdk-20 (20+36~us1-0ubuntu1) UNRELEASED; urgency=medium
+openjdk-20 (20+36~us1-0ubuntu1) lunar; urgency=medium
 
   * OpenJDK 20 release, build 36. See:
     https://mail.openjdk.org/pipermail/jdk-dev/2023-March/007517.html
@@ -20,6 +20,7 @@ openjdk-20 (20+36~us1-0ubuntu1) UNRELEASED; urgency=medium
     - ldap-timeout-test-use-ip.patch, test-use-ip-address.patch: Ubuntu-specific
       patches to workaround missing DNS resolver on the build machines.
     - exclude_broken_tests.patch: quarantine failing tests.
+  * d/rules: package external debug symbols (LP: #2015835).
 
  -- Vladimir Petko <[e-mail]>  Mon, 03 Apr 2023 11:27:49 +1200
 
diff --git a/debian/rules b/debian/rules
index 117afc8..fa7c9f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -518,7 +518,7 @@ COMMON_CONFIGURE_ARGS += \
 
 COMMON_CONFIGURE_ARGS += \
 	--with-debug-level=release \
-	--with-native-debug-symbols=none \
+	--with-native-debug-symbols=external \
 	--enable-unlimited-crypto \
 	--with-zlib=system \
 	--with-giflib=system \
@@ -1532,12 +1532,16 @@ ifneq (,$(wildcard $(builddir)/$(sdkimg)/lib/*.diz))
 	  echo '$(basedir)/lib/*/*.diz'; \
 	) > debian/$(p_dbg).install
 endif
-ifneq (,$(wildcard $(builddir)/$(sdkimg)/lib/*.debuginfo))
+
+# *.debuginfo should be located in /usr/lib/debug/ move files
+	mkdir -p $(d)/usr/lib/debug
+	(cd $(d) && find . -path './$(basedir)/*' -name '*.debuginfo' | cpio -pdm usr/lib/debug/)
+	find $(d)/$(basedir)/ -name '*.debuginfo' -exec rm {} \;
 	( \
-	  echo '$(basedir)/lib/*.debuginfo'; \
-	  echo '$(basedir)/lib/*/*.debuginfo'; \
+	  echo 'usr/lib/debug/$(basedir)/bin/*.debuginfo'; \
+	  echo 'usr/lib/debug/$(basedir)/lib/*.debuginfo'; \
+	  echo 'usr/lib/debug/$(basedir)/lib/*/*.debuginfo'; \
 	) > debian/$(p_dbg).install
-endif
 
 #	: # FIXME: the targets are not installed ...
 #	rm -rfv $(d)/$(basedir)/lib/jfr