feat(rpm): add RPM debuginfo support on Ubuntu

Author: rdesgroppes

.bazelci/tests.yml

@@ -29,16 +29,6 @@ default_tests: &default_tests
     - "//pkg/..."
     - "//tests/..."
     - "//toolchains/..."
-    - "-//tests/rpm/..."
-    - "-//pkg/legacy/tests/rpm/..."
-
-default_tests_with_rpm: &default_tests_with_rpm
-  test_targets:
-    - "//pkg/..."
-    - "//tests/..."
-    - "//toolchains/..."
-    # This has started to fail, even on CentOS.
-    - "-//tests/rpm:test_golden_debuginfo_rpm_contents"
 
 win_tests: &win_tests
   test_flags:
@@ -67,11 +57,14 @@ ubuntu2204: &ubuntu
   platform: ubuntu2204
   <<: *common
   <<: *default_tests
+  shell_commands:
+    - sudo apt-get update
+    - sudo apt-get install -y rpm elfutils # rpmbuild, eu-strip
 
 centos7: &centos
   platform: centos7_java11_devtoolset10
   <<: *common
-  <<: *default_tests_with_rpm
+  <<: *default_tests
 
 macos: &macos
   platform: macos

.bazelrc

@@ -1 +1,2 @@
 # Intentionally blank
+common --test_output=errors

pkg/rpm_pfg.bzl

@@ -604,6 +604,11 @@ def _pkg_rpm_impl(ctx):
     if ctx.attr.architecture:
         preamble_pieces.append("BuildArch: " + ctx.attr.architecture)
 
+    # Tune debuginfo package generation if requested
+    if ctx.attr.debuginfo:
+        preamble_pieces.append("%{{!?_enable_debug_packages:%debug_package}}")  # absent by default on Ubuntu
+        preamble_pieces.append("%undefine _unique_debug_names")  # set by default on Rocky, Ubuntu
+
     preamble_file = ctx.actions.declare_file(
         "{}.spec.preamble".format(rpm_name),
     )

toolchains/rpm/rpmbuild_configure.bzl

@@ -81,15 +81,6 @@ def _build_repo_for_rpmbuild_toolchain_impl(rctx):
     if rctx.attr.debuginfo_type not in DEBUGINFO_VALID_VALUES:
         fail("debuginfo_type must be one of", DEBUGINFO_VALID_VALUES)
 
-    debuginfo_type = rctx.attr.debuginfo_type
-    if debuginfo_type == DEBUGINFO_TYPE_AUTODETECT:
-        if rctx.path(RELEASE_PATH).exists:
-            rctx.watch(RELEASE_PATH)
-            os_name, _ = _parse_release_info(rctx.read(RELEASE_PATH))
-            debuginfo_type = DEBUGINFO_TYPE_BY_OS_RELEASE.get(os_name, debuginfo_type)
-        else:
-            debuginfo_type = DEBUGINFO_TYPE_NONE
-
     rpmbuild_path = rctx.which("rpmbuild")
     if rctx.attr.verbose:
         if rpmbuild_path:
@@ -106,6 +97,24 @@ def _build_repo_for_rpmbuild_toolchain_impl(rctx):
             if parts[0] == "RPM" and parts[1] == "version":
                 version = parts[2]
 
+    debuginfo_type = rctx.attr.debuginfo_type
+    if debuginfo_type == DEBUGINFO_TYPE_AUTODETECT:
+        version_parts = version.split(".")
+        if len(version_parts) > 1 and version_parts[0].isdigit() and version_parts[1].isdigit():
+            major = int(version_parts[0])
+            minor = int(version_parts[1])
+            if major < 4 or (major == 4 and minor < 18):
+                debuginfo_type = DEBUGINFO_TYPE_CENTOS
+            else:
+                # https://rpm.org/wiki/Releases/4.18.0: Make %{buildsubdir} settable outside %setup
+                debuginfo_type = DEBUGINFO_TYPE_FEDORA
+        elif rctx.path(RELEASE_PATH).exists:
+            rctx.watch(RELEASE_PATH)
+            os_name, _ = _parse_release_info(rctx.read(RELEASE_PATH))
+            debuginfo_type = DEBUGINFO_TYPE_BY_OS_RELEASE.get(os_name, debuginfo_type)
+        else:
+            debuginfo_type = DEBUGINFO_TYPE_NONE
+
     _write_build(
         rctx = rctx,
         path = rpmbuild_path,