Skip to contentSkip to conversation

Makefile: drop ldconfig handling

PATCH New Thomas Petazzoni 3 participants 3 messages Jan 1, 2016 – Jan 3, 2016 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 Makefile: drop ldconfig handling

The ldconfig handling in the main Makefile is utterly broken, as it calls the build machine ldconfig to generate the ld.so.cache of the target. Unfortunately, the format of the ld.so.cache is architecture specific, and therefore the build machine ldconfig cannot be used as-is.

This patch therefore simply drops using ldconfig entirely, and removes /etc/ld.so.conf.d/ from the target skeleton. The idea is that all libraries that should be loaded by the dynamic linker must be installed in paths where the dynamic linker searches them by default (typically /lib or /usr/lib).

This might potentially break a few packages, but the only way to know is to actually stop handling ldconfig.

In order to be notified of such cases, we add a check in target-finalize to verify that there is no /etc/ld.so.conf file as well as no /etc/ld.so.conf.d directory.

---
Changes from v2:
- Move back the checks *before* the rootfs overlay and post-build scripts are applied. As indicated by Yann, this potentially leaves the possibility for a user to use ld.so configuration in its overlay/post-build script, as long as (s)he also takes care of the ldconfig mess.

Changes from v1:
- Add check for /etc/ld.so.conf.d suggested by Yann
- Move the checks after copying the rootfs overlays and running the post build scripts, in order to catch cases where the ld.so configuration would be added by an overlay or a post-build script. This was suggested by Arnout.

---
 Makefile                                | 17 ++++-------------
 system/skeleton/etc/ld.so.conf.d/.empty |  0
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 system/skeleton/etc/ld.so.conf.d/.empty
Makefile +4 -13
index 80e94a2..0883175 100644
@@ -604,20 +604,11 @@ endif
 # debugging symbols.
 	find $(TARGET_DIR)/lib -type f -name 'ld-*.so*' | \
 		xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG)
-
+	test -f $(TARGET_DIR)/etc/ld.so.conf && \
+		{ echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true
+	test -d $(TARGET_DIR)/etc/ld.so.conf.d && \
+		{ echo "ERROR: we shouldn't have a /etc/ld.so.conf.d directory"; exit 1; } || true
 	mkdir -p $(TARGET_DIR)/etc
-	# Mandatory configuration file and auxiliary cache directory
-	# for recent versions of ldconfig
-	touch $(TARGET_DIR)/etc/ld.so.conf
-	mkdir -p $(TARGET_DIR)/var/cache/ldconfig
-	if [ -x "$(TARGET_CROSS)ldconfig" ]; \
-	then \
-		$(TARGET_CROSS)ldconfig -r $(TARGET_DIR) \
-					-f $(TARGET_DIR)/etc/ld.so.conf; \
-	else \
-		/sbin/ldconfig -r $(TARGET_DIR) \
-			       -f $(TARGET_DIR)/etc/ld.so.conf; \
-	fi
 	( \
 		echo "NAME=Buildroot"; \
 		echo "VERSION=$(BR2_VERSION_FULL)"; \
system/skeleton/etc/ld.so.conf.d/.empty deleted +0 -0
deleted file mode 100644
index e69de29..0000000
Signature · 1 line
2.6.4
#1 lore raw

PATCH v3 1/1 Makefile: drop ldconfig handling

Thomas, All,

On 2016-01-01 22:23 +0100, Thomas Petazzoni spake thusly:

Quoted 12 lines

The ldconfig handling in the main Makefile is utterly broken, as it calls the build machine ldconfig to generate the ld.so.cache of the target. Unfortunately, the format of the ld.so.cache is architecture specific, and therefore the build machine ldconfig cannot be used as-is.

This patch therefore simply drops using ldconfig entirely, and removes /etc/ld.so.conf.d/ from the target skeleton. The idea is that all libraries that should be loaded by the dynamic linker must be installed in paths where the dynamic linker searches them by default (typically /lib or /usr/lib).

Quoted 8 lines

This might potentially break a few packages, but the only way to know is to actually stop handling ldconfig.

In order to be notified of such cases, we add a check in target-finalize to verify that there is no /etc/ld.so.conf file as well as no /etc/ld.so.conf.d directory.

Regards,
Yann E. MORIN.

Quoted 55 lines

---
Changes from v2:
- Move back the checks *before* the rootfs overlay and post-build scripts are applied. As indicated by Yann, this potentially leaves the possibility for a user to use ld.so configuration in its overlay/post-build script, as long as (s)he also takes care of the ldconfig mess.

Changes from v1:
- Add check for /etc/ld.so.conf.d suggested by Yann
- Move the checks after copying the rootfs overlays and running the post build scripts, in order to catch cases where the ld.so configuration would be added by an overlay or a post-build script. This was suggested by Arnout.

---
 Makefile                                | 17 ++++-------------
 system/skeleton/etc/ld.so.conf.d/.empty |  0
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 system/skeleton/etc/ld.so.conf.d/.empty
Makefile +4 -13
index 80e94a2..0883175 100644
@@ -604,20 +604,11 @@ endif
 # debugging symbols.
 	find $(TARGET_DIR)/lib -type f -name 'ld-*.so*' | \
 		xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG)
-
+	test -f $(TARGET_DIR)/etc/ld.so.conf && \
+		{ echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true
+	test -d $(TARGET_DIR)/etc/ld.so.conf.d && \
+		{ echo "ERROR: we shouldn't have a /etc/ld.so.conf.d directory"; exit 1; } || true
 	mkdir -p $(TARGET_DIR)/etc
-	# Mandatory configuration file and auxiliary cache directory
-	# for recent versions of ldconfig
-	touch $(TARGET_DIR)/etc/ld.so.conf
-	mkdir -p $(TARGET_DIR)/var/cache/ldconfig
-	if [ -x "$(TARGET_CROSS)ldconfig" ]; \
-	then \
-		$(TARGET_CROSS)ldconfig -r $(TARGET_DIR) \
-					-f $(TARGET_DIR)/etc/ld.so.conf; \
-	else \
-		/sbin/ldconfig -r $(TARGET_DIR) \
-			       -f $(TARGET_DIR)/etc/ld.so.conf; \
-	fi
 	( \
 		echo "NAME=Buildroot"; \
 		echo "VERSION=$(BR2_VERSION_FULL)"; \
system/skeleton/etc/ld.so.conf.d/.empty deleted +0 -0
deleted file mode 100644
index e69de29..0000000
Signature · 1 line
2.6.4
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH v3 1/1 Makefile: drop ldconfig handling

In reply to Thomas Petazzoni
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

The ldconfig handling in the main Makefile is utterly broken, as it calls the build machine ldconfig to generate the ld.so.cache of the target. Unfortunately, the format of the ld.so.cache is architecture specific, and therefore the build machine ldconfig cannot be used as-is.

This patch therefore simply drops using ldconfig entirely, and removes /etc/ld.so.conf.d/ from the target skeleton. The idea is that all libraries that should be loaded by the dynamic linker must be installed in paths where the dynamic linker searches them by default (typically /lib or /usr/lib).

Quoted 8 lines

This might potentially break a few packages, but the only way to know is to actually stop handling ldconfig.

In order to be notified of such cases, we add a check in target-finalize to verify that there is no /etc/ld.so.conf file as well as no /etc/ld.so.conf.d directory.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard