From e8c9125d9f58a3d508543df5ddef17675a2ff1f1 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Mon, 17 Aug 2015 15:14:48 +0200 Subject: [PATCH] Pseudo target for vfs_jitterentropy Run script depending on VFS plugins (i.e., shared objects) like vfs_jitterentropy.lib.so have to state this dependency rather the actual binaries linked against libc. The latter introduces a library dependency that is just not there. For example, the dependency on vfs_jitterentropy is a result from the config node for libc which automatically loads the plugin. --- repos/dde_linux/lib/mk/wpa_supplicant.mk | 2 +- repos/dde_linux/run/wifi.run | 1 + repos/libports/src/lib/vfs/jitterentropy/target.mk | 1 + repos/ports/run/netperf.inc | 1 + repos/ports/src/app/openvpn/target.mk | 1 - 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 repos/libports/src/lib/vfs/jitterentropy/target.mk diff --git a/repos/dde_linux/lib/mk/wpa_supplicant.mk b/repos/dde_linux/lib/mk/wpa_supplicant.mk index aaa32fea1d..ed6ddb1575 100644 --- a/repos/dde_linux/lib/mk/wpa_supplicant.mk +++ b/repos/dde_linux/lib/mk/wpa_supplicant.mk @@ -1,7 +1,7 @@ WS_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/app/wpa_supplicant WS_DIR := $(REP_DIR)/src/lib/wpa_supplicant -LIBS += libc libcrypto libssl wpa_driver_nl80211 vfs_jitterentropy +LIBS += libc libcrypto libssl wpa_driver_nl80211 SHARED_LIB = yes LD_OPT += --version-script=$(WS_DIR)/symbol.map diff --git a/repos/dde_linux/run/wifi.run b/repos/dde_linux/run/wifi.run index 0b496c5307..7da3b7dea9 100644 --- a/repos/dde_linux/run/wifi.run +++ b/repos/dde_linux/run/wifi.run @@ -10,6 +10,7 @@ set build_components { server/ram_fs server/fs_rom test/lwip/http_srv + lib/vfs/jitterentropy } lappend_if [have_spec gpio] build_components drivers/gpio diff --git a/repos/libports/src/lib/vfs/jitterentropy/target.mk b/repos/libports/src/lib/vfs/jitterentropy/target.mk new file mode 100644 index 0000000000..cb7f747377 --- /dev/null +++ b/repos/libports/src/lib/vfs/jitterentropy/target.mk @@ -0,0 +1 @@ +LIBS = vfs_jitterentropy diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 31a0772657..af2a9673cb 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -79,6 +79,7 @@ append_if $use_wifi_driver build_components { server/fs_rom server/ram_fs server/report_rom + lib/vfs/jitterentropy } source ${genode_dir}/repos/base/run/platform_drv.inc diff --git a/repos/ports/src/app/openvpn/target.mk b/repos/ports/src/app/openvpn/target.mk index 25587678d7..f712af644a 100644 --- a/repos/ports/src/app/openvpn/target.mk +++ b/repos/ports/src/app/openvpn/target.mk @@ -1,7 +1,6 @@ TARGET = openvpn LIBS += libc libc_lock_pipe libc_lwip_nic_dhcp \ - vfs_jitterentropy \ libcrypto libssl config_args server OPENVPN_PORT_DIR := $(call select_from_ports,openvpn)