From 38271a8ac002d0b7330876d7237bf22aee82edce Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Tue, 19 Jan 2021 10:59:40 +0900 Subject: [PATCH] pass: Remove hal-api-common dependency /etc/ld.so.conf.d/libhal-api.conf contains the '/usr/lib/hal and /usr/lib64/hal' path for loading the shard library. So that PASS daemon doesn't need to specify the dependency of hal-api-common. Change-Id: I56a254f9d4baa3c5f252c99fdf4f4e7bdb0f5307 Signed-off-by: Chanwoo Choi --- CMakeLists.txt | 1 - packaging/pass.spec | 1 - systemd/pass.service.in | 1 - unittest/CMakeLists.txt | 1 - 4 files changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8f2591..9f5c08a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,6 @@ SET(PKG_MODULES gio-unix-2.0 libudev libsystemd - hal-api-common hal-api-power ) diff --git a/packaging/pass.spec b/packaging/pass.spec index 9e16a7a..b822c33 100644 --- a/packaging/pass.spec +++ b/packaging/pass.spec @@ -22,7 +22,6 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmock) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(hal-api-common) BuildRequires: pkgconfig(hal-api-power) %description diff --git a/systemd/pass.service.in b/systemd/pass.service.in index a774f5f..13b8bcf 100644 --- a/systemd/pass.service.in +++ b/systemd/pass.service.in @@ -10,7 +10,6 @@ RestartSec=0 KillSignal=SIGUSR1 User=system_fw Group=system_fw -Environment=LD_LIBRARY_PATH=@LIBDIR@/hal [Install] WantedBy=delayed.target diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 7aeae05..e2d13d4 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -17,7 +17,6 @@ pkg_check_modules(gtest_pkgs REQUIRED gio-2.0 gmock dlog - hal-api-common hal-api-power ) -- 2.7.4