From e6140de0aae55206a4951478135d55d821838fb9 Mon Sep 17 00:00:00 2001 From: David Zbarsky Date: Fri, 29 May 2026 17:55:20 -0400 Subject: [PATCH] Repro things --- MODULE.bazel | 2 + third_party/patches/BUILD.bazel | 1 + .../linux_bzl_tools_docker_repro.patch | 45 +++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 third_party/patches/linux_bzl_tools_docker_repro.patch diff --git a/MODULE.bazel b/MODULE.bazel index 994bfb3..c1f9f8c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -52,6 +52,8 @@ http_archive( archive_override( module_name = "linux.bzl", integrity = "sha256-yPhL0CYmmsOZK8TgRDFlMF2t8QJ4kSLi0HXk1eevkA0=", + patch_strip = 1, + patches = ["//third_party/patches:linux_bzl_tools_docker_repro.patch"], strip_prefix = "linux.bzl-999522d71d920e6b825b8615eee81bdf1a749ebc", urls = ["https://github.com/hermeticbuild/linux.bzl/archive/999522d71d920e6b825b8615eee81bdf1a749ebc.tar.gz"], ) diff --git a/third_party/patches/BUILD.bazel b/third_party/patches/BUILD.bazel index 483d513..04aa50f 100644 --- a/third_party/patches/BUILD.bazel +++ b/third_party/patches/BUILD.bazel @@ -1,4 +1,5 @@ exports_files([ + "linux_bzl_tools_docker_repro.patch", "llvm_musl_root_package_copy.patch", "zstd_no_pthread.patch", ]) diff --git a/third_party/patches/linux_bzl_tools_docker_repro.patch b/third_party/patches/linux_bzl_tools_docker_repro.patch new file mode 100644 index 0000000..c95fbfb --- /dev/null +++ b/third_party/patches/linux_bzl_tools_docker_repro.patch @@ -0,0 +1,45 @@ +diff --git a/linux.bzl b/linux.bzl +index 9448f1c..04b2c0f 100644 +--- a/linux.bzl ++++ b/linux.bzl +@@ -163,7 +163,6 @@ _LINUX_ARCHIVE_EXCLUDES = [ + "samples/", + "samples/*", + "samples/**", +- "tools/docker/**", + "*/Build", + ] + +diff --git a/source_repo.BUILD.bazel b/source_repo.BUILD.bazel +index 6f6fbe5..b0e7e8d 100644 +--- a/source_repo.BUILD.bazel ++++ b/source_repo.BUILD.bazel +@@ -35,15 +35,6 @@ filegroup( + ], allow_empty = True), + ) + +-filegroup( +- name = "tools_files", +- srcs = glob([ +- "tools/**", +- ], exclude = [ +- "tools/docker/**", +- ], allow_empty = True), +-) +- + filegroup( + name = "all_files", + srcs = glob( +@@ -51,12 +42,10 @@ filegroup( + exclude = [ + "Documentation", + "samples", +- "tools", + ], + exclude_directories = 0, + ) + [ + ":source_tree_lookup_files", +- ":tools_files", + ], + ) +