commit 8fd51cd0cb06584bdfe2e7884662276d0c7bfe9b
author Tim Windelschmidt <tim@monogon.tech> Sun Jun 29 02:20:17 2025 +0200
committer Tim Windelschmidt <tim@monogon.tech> Mon Jun 30 00:02:45 2025 +0000
tree 88aecf3fc0a34f63eea2d9f761c41ce60cb49686
parent 3259f9a5381cb2b79582e73db1fa2da24772698b

treewide: remove bzlmod dependency workaround

Closes #487 #486 #485 #484 #483

Change-Id: I2de434dab96743f9051b8c2064fb9f7d05d548aa
Reviewed-on: https://review.monogon.dev/c/monogon/+/4350
Tested-by: Jenkins CI
Reviewed-by: Leopold Schabel <leo@monogon.tech>

third_party/chrony/BUILD.bazel

diff --git a/third_party/chrony/BUILD.bazel b/third_party/chrony/BUILD.bazel
index 700f7de..e69de29 100644
--- a/third_party/chrony/BUILD.bazel
+++ b/third_party/chrony/BUILD.bazel
@@ -1 +0,0 @@
-exports_files(["config.h.in"])

third_party/chrony/chrony.bzl

diff --git a/third_party/chrony/chrony.bzl b/third_party/chrony/chrony.bzl
index 812d536..f72c059 100644
--- a/third_party/chrony/chrony.bzl
+++ b/third_party/chrony/chrony.bzl
@@ -1,9 +1,39 @@
-load("@@//build/utils:template_file.bzl", "template_file")
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
 
-template_file(
-    name = "config.h",
-    src = "@@//third_party/chrony:config.h.in",
+write_file(
+    name = "config.h_template",
+    out = "config.h.in",
+    content = ["""\
+#define LINUX
+#define DEBUG 0
+#define USE_PTHREAD_ASYNCDNS
+
+#define CHRONY_VERSION "%CHRONY_VERSION%"
+#define CHRONYD_FEATURES "NTP RTC SCFILTER ASYNCDNS"
+#define FEAT_NTP
+#define FEAT_RTC
+#define FEAT_SCFILTER
+#define FEAT_ASYNCDNS
+#define FEAT_PRIVDROP
+#define CAP_IS_SUPPORTED
+
+#define DEFAULT_COMMAND_SOCKET "/todo/chronyd.sock"
+#define DEFAULT_CONF_FILE "/todo/chrony.conf"
+#define DEFAULT_HWCLOCK_FILE ""
+#define DEFAULT_PID_FILE "/todo/chronyd.pid"
+#define DEFAULT_RTC_DEVICE "/dev/rtc"
+#define DEFAULT_USER "root"
+
+#define MAIL_PROGRAM "/todo/sendmail"
+"""],
+)
+
+expand_template(
+    name = "config.h_expanded",
+    template = ":config.h.in",
+    out = "config.h",
     substitutions = {
         # ONCHANGE(//build/bazel:third_party.MODULE.bazel): version needs to be kept in sync
         "%CHRONY_VERSION%": "4.1-monogon",
@@ -14,7 +44,7 @@
 cc_library(
     name = "common_hdrs",
     srcs = [
-        ":config.h",
+        ":config.h_expanded",
 
         # Headers corresponding to .c files in :common.
         "addrfilt.h",

third_party/chrony/config.h.in

diff --git a/third_party/chrony/config.h.in b/third_party/chrony/config.h.in
deleted file mode 100644
index 09694b3..0000000
--- a/third_party/chrony/config.h.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#define LINUX
-#define DEBUG 0
-#define USE_PTHREAD_ASYNCDNS
-
-#define CHRONY_VERSION "%CHRONY_VERSION%"
-#define CHRONYD_FEATURES "NTP RTC SCFILTER ASYNCDNS"
-#define FEAT_NTP
-#define FEAT_RTC
-#define FEAT_SCFILTER
-#define FEAT_ASYNCDNS
-#define FEAT_PRIVDROP
-#define CAP_IS_SUPPORTED
-
-#define DEFAULT_COMMAND_SOCKET "/todo/chronyd.sock"
-#define DEFAULT_CONF_FILE "/todo/chrony.conf"
-#define DEFAULT_HWCLOCK_FILE ""
-#define DEFAULT_PID_FILE "/todo/chronyd.pid"
-#define DEFAULT_RTC_DEVICE "/dev/rtc"
-#define DEFAULT_USER "root"
-
-#define MAIL_PROGRAM "/todo/sendmail"