From 6f359b17dc1047a9e6cc5cf278744c8c84fa2d11 Mon Sep 17 00:00:00 2001
From: Alex Zurhake <alex.zurhake@checkmk.com>
Date: Tue, 22 Oct 2024 12:45:41 +0200
Subject: [PATCH] Fix apache skel packaging

Fixing dependency issues. This should be rebuilt if any file within the folder cahnges,
not only if the folder itself changes

Change-Id: Iddb0488576472b948b2028d3f8190e91f538ec80
---
 omd/packages/apache-omd/BUILD                 | 20 +++++++++++++++----
 .../apache-omd/BUILD.apache_omd.bazel         | 19 ------------------
 .../apache-omd/skel/etc/rc.d/85-apache        |  1 -
 3 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 omd/packages/apache-omd/BUILD.apache_omd.bazel
 delete mode 120000 omd/packages/apache-omd/skel/etc/rc.d/85-apache

diff --git a/omd/packages/apache-omd/BUILD b/omd/packages/apache-omd/BUILD
index 21e2d83d5e1..80184a3f6a9 100644
--- a/omd/packages/apache-omd/BUILD
+++ b/omd/packages/apache-omd/BUILD
@@ -1,3 +1,6 @@
+load("@rules_pkg//pkg:mappings.bzl", "pkg_mklink")
+load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
+
 genrule(
     name = "apache-omd",
     srcs = [
@@ -107,10 +110,19 @@ genrule(
     visibility = ["//visibility:public"],
 )
 
-genrule(
+pkg_mklink(
+    name = "85-apache-symlink",
+    link_name = "skel/etc/rc.d/85-apache",
+    target = "../init.d/apache",
+)
+
+pkg_tar(
     name = "skel_dir",
-    srcs = ["@omd_packages//omd/packages/apache-omd:skel"],
-    outs = ["apache-skel.tar.gz"],
-    cmd = "tar -czf $@ -C $(location //omd/packages/apache-omd:skel)/.. skel",
+    srcs = glob(
+        include = ["skel/**/*"],
+    ) + ["85-apache-symlink"],
+    extension = "tar.gz",
+    package_file_name = "apache-skel.tar.gz",
+    strip_prefix = ".",
     visibility = ["//visibility:public"],
 )
diff --git a/omd/packages/apache-omd/BUILD.apache_omd.bazel b/omd/packages/apache-omd/BUILD.apache_omd.bazel
deleted file mode 100644
index 3ece724e03c..00000000000
--- a/omd/packages/apache-omd/BUILD.apache_omd.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-genrule(
-    name = "skel",
-    srcs = ["@omd_packages//omd/packages/apache-omd/skel"],
-    outs = [
-        "skel/etc/apache/conf.d/security.conf",
-        "skel/etc/apache/conf.d/site.conf",
-        "skel/etc/apache/conf.d/stats.conf",
-        "skel/etc/apache/apache.conf",
-        "skel/etc/apache/magic",
-        "skel/etc/apache/php-wrapper",
-        "skel/etc/cron.d/php-sessions",
-        "skel/etc/init.d/apache",
-        "skel/etc/logrotate.d/apache-stats",
-        "skel/etc/rc.d/85-apache",
-    ],
-    cmd = """
-        cp -r --dereference $(execpath @omd_packages//omd/packages/apache-omd/skel)) $$(realpath $(RULEDIR))
-    """,
-)
diff --git a/omd/packages/apache-omd/skel/etc/rc.d/85-apache b/omd/packages/apache-omd/skel/etc/rc.d/85-apache
deleted file mode 120000
index 840fd3a5dc9..00000000000
--- a/omd/packages/apache-omd/skel/etc/rc.d/85-apache
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/apache
\ No newline at end of file