Merge branch 'branches/rudder/8.3'

Normation · Jan 17, 2025 · 11d76d4 · 11d76d4
2 parents 769da63 + e21a5d1
commit 11d76d4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/rudder-agent/SOURCES/Makefile.in b/rudder-agent/SOURCES/Makefile.in
@@ -201,7 +201,9 @@ ifneq (false,$(USE_APT))
 CARGO_FEATURES_SU="apt"
 endif
 
-build-agent: rudder-sources
+MODULE_DEPS = $(shell set -x; ../../build-caching get dependencies/ $(DEPS_CACHE_PARAMETERS) || echo @augeas_DEP@  )
+
+build-agent: $(MODULE_DEPS) rudder-sources
 ifneq (false,$(USE_RUST))
 	# The deps versions are in the Cargo.lock in the repo root
 	DEPS_SOURCE_SHA=$$(ls -1 rudder-sources/rudder/Cargo.* | sort | xargs openssl dgst -sha256 | openssl dgst -sha256 | awk '{print $$2}') ;\

diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec
@@ -59,8 +59,6 @@
 %if 0%{?rhel} && 0%{?rhel} <= 6
 # PIE and PIC incompatible on old gcc
 %define enable_pie false
-# no augeas or augeas too old
-%define with_augeas true
 # no rust
 %define enable_rust false
 %endif
@@ -70,6 +68,8 @@
 %define with_openssl true
 %endif
 %if 0%{?rhel} && 0%{?rhel} <= 8
+# no augeas or augeas too old
+%define with_augeas true
 # need pcre2 for rhel < 8
 %define with_pcre2 true
 %endif
@@ -93,6 +93,10 @@
 # no rust
 %define enable_rust false
 %endif
+%if 0%{?suse_version}
+# augeas too old on all sles  for augeas module
+%define with_augeas true
+%endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
 # augeas too old on suse < 15
 %define with_augeas true

diff --git a/rudder-agent/debian/rules b/rudder-agent/debian/rules
@@ -49,12 +49,12 @@ STRIP_OPT = --no-automatic-dbgsym
 endif
 # Ubuntu 18.04
 ifeq (bionic,$(OS_CODENAME))
-WITH = --with-openssl --with-libcurl --with-lmdb --with-pcre2
+WITH = --with-openssl --with-libcurl --with-lmdb --with-pcre2 --with-augeas
 STRIP_OPT = --no-automatic-dbgsym
 endif
 # Ubuntu 20.04
 ifeq (focal,$(OS_CODENAME))
-WITH = --with-lmdb --with-libcurl --with-pcre2
+WITH = --with-lmdb --with-libcurl --with-pcre2 --with-augeas
 STRIP_OPT = --no-automatic-dbgsym
 endif
 # Ubuntu 22.04
@@ -93,12 +93,12 @@ STRIP_OPT = --no-automatic-dbgsym
 endif
 # Debian 10
 ifeq (buster,$(OS_CODENAME))
-WITH = --with-lmdb --with-libcurl --with-pcre2
+WITH = --with-lmdb --with-libcurl --with-pcre2 --with-augeas
 STRIP_OPT = --no-automatic-dbgsym
 endif
 # Debian 11
 ifeq (bullseye,$(OS_CODENAME))
-WITH = --with-lmdb --with-libcurl
+WITH = --with-lmdb --with-libcurl --with-augeas
 STRIP_OPT = --no-automatic-dbgsym
 endif
 # Debian 12