Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

Commit

Permalink
build,stage1: include systemd dir when checking libs
Browse files Browse the repository at this point in the history
In the src flavor, we have some code to copy missing libraries from the
host to stage1 if they're not already present after building systemd.

In systemd v231, libshared was converted into a private shared library
living in `/usr/lib/systemd` (systemd/systemd#3516).

However, the logic that detects if a library is present or not was not
taking into account `$ROOTFS/usr/lib/systemd`, only `$ROOTFS/usr/lib`.
So the host's library overwrote the `libsystemd-shared-231.so` generated
by the systemd build, causing general madness.

Add the systemd directory to the list of paths to check.
  • Loading branch information
iaguis committed Sep 14, 2016
1 parent 70b5545 commit 2cd16d6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions stage1/stdlibdirs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ifeq ($(SLD_INCLUDED),)

SLD_INCLUDED := x
SLD_LOCATIONS := $(shell ld --verbose | grep SEARCH_DIR | sed -e 's/SEARCH_DIR("=*\([^"]*\)");*/\1/g')
SLD_LOCATIONS += $(foreach l,$(SLD_LOCATIONS),$l/systemd)

endif

Expand Down

0 comments on commit 2cd16d6

Please sign in to comment.