diff options
| author | Simon Rettberg | 2013-06-14 13:32:45 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-14 13:32:45 +0200 |
| commit | d61ad95c7690155a18b2abd39bf8df37e9a02908 (patch) | |
| tree | 0494b3ce833e79d73c169fd93f80fdd1d685c6b2 | |
| parent | [kdm] shutdown and reboot immediately (diff) | |
| download | tm-scripts-d61ad95c7690155a18b2abd39bf8df37e9a02908.tar.gz tm-scripts-d61ad95c7690155a18b2abd39bf8df37e9a02908.tar.xz tm-scripts-d61ad95c7690155a18b2abd39bf8df37e9a02908.zip | |
ldconfig: Include system's default paths
| -rw-r--r-- | remote/rootfs/rootfs-stage31/rootfs-stage31.conf | 8 | ||||
| -rwxr-xr-x | remote/setup_target | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf index b493c370..47f77c0a 100644 --- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf +++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf @@ -55,7 +55,7 @@ REQUIRED_FIRMWARE=" 3com/ RTL8192SE/ rtl_nic/ tigon/" -REQUIRED_FILES=" /etc/netconfig - /etc/networks - /etc/protocols - /etc/services" +REQUIRED_FILES=" + /etc/protocols + /etc/services +" diff --git a/remote/setup_target b/remote/setup_target index b0565550..54ed0cb0 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -314,7 +314,12 @@ post_process_target() { rm -r "${TARGET_BUILD_DIR}/lib/systemd" fi - ldconfig -r "${TARGET_BUILD_DIR}" + # figure out all relevant ld-paths + local LDTEMP="$TARGET_BUILD_DIR/ldconf-temp" + grep -h '^\s*/' /etc/ld.so.conf /etc/ld.so.conf.d/* > "$LDTEMP" + # TODO: Echo other stuff to $LDTEMP (but figure out if first or last match wins) + ldconfig -v -r "${TARGET_BUILD_DIR}" -f "/ldconf-temp" + unlink "$LDTEMP" } |