Merge pull request #29 from sailfishos/jb61808

[sb2] Fix ldconfig use at build time. JB#61808
sailfishos · Mar 28, 2024 · 9fb02fd · 9fb02fd
2 parents e32c40b + 04b140a
commit 9fb02fd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/modes/obs-deb-build/sb2rc b/modes/obs-deb-build/sb2rc
@@ -39,6 +39,14 @@ case "$sb2rc_mode" in
 		SBOX_WRAPPERS="gdb ldconfig pwd fakeroot"
 		;;
 
+	ldconfig)
+		# When ldconfig is used at build time, then it must be the case
+		# that it is used on the build artefacts (with the help of the
+		# '-n' option), so locking it to the target root would not be
+		# desired.
+		sbox_ldconfig_root=/
+		;;
+
 	*)
 		# Default.
 		;;

diff --git a/modes/obs-rpm-build+pp/sb2rc b/modes/obs-rpm-build+pp/sb2rc
@@ -39,6 +39,14 @@ case "$sb2rc_mode" in
 		SBOX_WRAPPERS="gdb ldconfig pwd fakeroot"
 		;;
 
+	ldconfig)
+		# When ldconfig is used at build time, then it must be the case
+		# that it is used on the build artefacts (with the help of the
+		# '-n' option), so locking it to the target root would not be
+		# desired.
+		sbox_ldconfig_root=/
+		;;
+
 	*)
 		# Default.
 		;;

diff --git a/modes/obs-rpm-build/sb2rc b/modes/obs-rpm-build/sb2rc
@@ -39,6 +39,14 @@ case "$sb2rc_mode" in
 		SBOX_WRAPPERS="gdb ldconfig pwd fakeroot"
 		;;
 
+	ldconfig)
+		# When ldconfig is used at build time, then it must be the case
+		# that it is used on the build artefacts (with the help of the
+		# '-n' option), so locking it to the target root would not be
+		# desired.
+		sbox_ldconfig_root=/
+		;;
+
 	*)
 		# Default.
 		;;