Use universal binaries in rpm.builder for macOS

Summary:
The fb-eden rpm.builder Mac configuration was producing single-arch (x86_64) binaries because it just built each target for the default platform. This resulted in .noarch RPMs with Intel-only binaries being rolled out via conveyor/slowroll to all Mac users.

Fix by defining universal binary targets (using rust_universal_binary, which works for both C++ and Rust executables) and using select() in make_rpm_features() to pick the universal binary on macOS. This mirrors the approach used by fb-sapling packaging. There exists a C++ cxx_universal_executable target, but that cannot be run on linux (where rpm.builder is required to run), so just use rust_universal_binary even though some of the binaries aren't Rust.

Also add edenfs_config_manager_rust to the Sandcastle signing command, which was missing since D91632819.

Reviewed By: genevievehelsel, MichaelCuevas

Differential Revision: D102232257

fbshipit-source-id: 1cbc3a758ed02904555c00b21a4c6ca992c9432a

Author: muirdm

eden/fs/BUCK

@@ -7,6 +7,7 @@ load(
 load("@fbcode//registry:defs.bzl", "rpm")
 load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
 load("@fbcode_macros//build_defs:python_binary.bzl", "python_binary")
+load("@fbcode_macros//build_defs:rust_universal_binary.bzl", "rust_universal_binary")
 
 oncall("scm_client_infra")
 
@@ -18,6 +19,54 @@ cpp_library(
     ],
 )
 
+# Universal (x86_64 + arm64) binary targets for macOS packaging.
+# rust_universal_binary works for both Rust and C++ executables.
+
+rust_universal_binary(
+    name = "edenfs_universal",
+    source = "//eden/fs/service:edenfs",
+)
+
+rust_universal_binary(
+    name = "edenfs_privhelper_universal",
+    source = "//eden/fs/service:edenfs_privhelper",
+)
+
+rust_universal_binary(
+    name = "eden-fb303-collector_universal",
+    source = "//eden/fs/facebook:eden-fb303-collector",
+)
+
+rust_universal_binary(
+    name = "eden_fsck_universal",
+    source = "//eden/fs/inodes/fscatalog:eden_fsck",
+)
+
+rust_universal_binary(
+    name = "trace_stream_universal",
+    source = "//eden/fs/cli/trace:trace_stream",
+)
+
+rust_universal_binary(
+    name = "edenfsctl_universal",
+    source = "//eden/fs/cli_rs/edenfsctl:edenfsctl",
+)
+
+rust_universal_binary(
+    name = "edenfs_config_manager_rust_universal",
+    source = "//eden/fs/config/facebook/config_manager_rs:edenfs_config_manager_rust",
+)
+
+rust_universal_binary(
+    name = "edenfs_monitor_universal",
+    source = "//eden/fs/monitor:edenfs_monitor",
+)
+
+rust_universal_binary(
+    name = "eden_apfs_mount_helper_universal",
+    source = "//eden/scm/exec/eden_apfs_mount_helper:eden_apfs_mount_helper",
+)
+
 rpm.builder(
     name = "fb-eden",
     # We are setting up conveyor+slowroll after which we can much lower this

eden/fs/build_targets.bzl

@@ -26,6 +26,21 @@ EDENFS_TARGETS = {
     "//eden/fs/service:edenfs_privhelper": "/usr/local/libexec/eden/edenfs_privhelper",
 }
 
+# Targets that have universal (x86_64 + arm64) binary variants for macOS.
+# Maps the default target to its universal binary target in //eden/fs:BUCK.
+# Python targets (edenfsctl PAR, edenfs_restarter, edenfs_config_manager) are
+# Intel-only and not included here.
+UNIVERSAL_BINARY_TARGETS = {
+    "//eden/fs/cli/trace:trace_stream": "//eden/fs:trace_stream_universal",
+    "//eden/fs/cli_rs/edenfsctl:edenfsctl": "//eden/fs:edenfsctl_universal",
+    "//eden/fs/config/facebook/config_manager_rs:edenfs_config_manager_rust": "//eden/fs:edenfs_config_manager_rust_universal",
+    "//eden/fs/facebook:eden-fb303-collector": "//eden/fs:eden-fb303-collector_universal",
+    "//eden/fs/inodes/fscatalog:eden_fsck": "//eden/fs:eden_fsck_universal",
+    "//eden/fs/monitor:edenfs_monitor": "//eden/fs:edenfs_monitor_universal",
+    "//eden/fs/service:edenfs": "//eden/fs:edenfs_universal",
+    "//eden/fs/service:edenfs_privhelper": "//eden/fs:edenfs_privhelper_universal",
+}
+
 SYMLINKS = {
     "/usr/local/bin/edenfsctl": "/usr/local/bin/eden",
 }
@@ -82,13 +97,24 @@ MAC_TARGETS = {
     "//eden/scm/exec/eden_apfs_mount_helper:eden_apfs_mount_helper": "/usr/local/libexec/eden/eden_apfs_mount_helper",
 }
 
+MAC_UNIVERSAL_BINARY_TARGETS = {
+    "//eden/scm/exec/eden_apfs_mount_helper:eden_apfs_mount_helper": "//eden/fs:eden_apfs_mount_helper_universal",
+}
+
 def make_rpm_features():
     features = []
     for target, install_path in EDENFS_TARGETS.items():
+        if target in UNIVERSAL_BINARY_TARGETS:
+            src = select({
+                "DEFAULT": "fbcode" + target,
+                "ovr_config//os:macos": "fbcode" + UNIVERSAL_BINARY_TARGETS[target],
+            })
+        else:
+            src = "fbcode" + target
         if target in TARGET_MODES:
-            features.append(rpm.install(src = "fbcode" + target, dst = install_path, mode = TARGET_MODES.get(target)))
+            features.append(rpm.install(src = src, dst = install_path, mode = TARGET_MODES.get(target)))
         else:
-            features.append(rpm.install(src = "fbcode" + target, dst = install_path))
+            features.append(rpm.install(src = src, dst = install_path))
         if install_path in SYMLINKS:
             features.append(rpm.file_symlink(link = SYMLINKS.get(install_path), target = install_path))
     for dir in DIRS:
@@ -114,10 +140,14 @@ def make_rpm_features():
     mac_features = []
 
     for target, install_path in MAC_TARGETS.items():
+        if target in MAC_UNIVERSAL_BINARY_TARGETS:
+            src = "fbcode" + MAC_UNIVERSAL_BINARY_TARGETS[target]
+        else:
+            src = "fbcode" + target
         if target in TARGET_MODES:
-            mac_features.append(rpm.install(src = "fbcode" + target, dst = install_path, mode = TARGET_MODES.get(target)))
+            mac_features.append(rpm.install(src = src, dst = install_path, mode = TARGET_MODES.get(target)))
         else:
-            mac_features.append(rpm.install(src = "fbcode" + target, dst = install_path))
+            mac_features.append(rpm.install(src = src, dst = install_path))
     for mac_feature in mac_features:
         features.append(
             select({