From 084691a29a7055b1478d4a42c40974d50a30985e Mon Sep 17 00:00:00 2001 From: Andreas Gnau Date: Mon, 25 Mar 2024 17:18:23 +0100 Subject: [PATCH] voicemngr: Do not manually specify BCM lib paths Do not explicitly specify BCM libary search paths. All binaries have a correct RUNPATH set via feeds/broadcom/bcmkernel/bcm-toolchain.mk and the Makefile has been updated to respect LDFLAGS. Setting LD_LIBARY_PATH and specifiying custome library search paths is thus no longer necessary. Signed-off-by: Andreas Gnau --- voicemngr/Makefile | 5 ++--- voicemngr/files/etc/init.d/voicemngr | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/voicemngr/Makefile b/voicemngr/Makefile index cba1936e5..f0c7beff3 100644 --- a/voicemngr/Makefile +++ b/voicemngr/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=voicemngr PKG_RELEASE:=1 -PKG_VERSION:=1.1.10 +PKG_VERSION:=1.1.11 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE @@ -48,7 +48,7 @@ define Package/$(PKG_NAME) ifeq ($(CONFIG_TARGET_brcmbca),y) include $(TOPDIR)/feeds/broadcom/bcmkernel/bcm-toolchain.mk - TARGET_CFLAGS := -I$(STAGING_DIR)/usr/include/bcm963xx/ -L$(STAGING_DIR)/root-brcmbca/usr/lib/broadcom -L$(STAGING_DIR)/usr/lib/broadcom + TARGET_CFLAGS := -I$(STAGING_DIR)/usr/include/bcm963xx/ TARGET_CPPFLAGS := TARGET_CXXFLAGS := EXTRA_CFLAGS := @@ -89,4 +89,3 @@ define Package/$(PKG_NAME)/install $(CP) $(PKG_BUILD_DIR)/libvoice/libvoice.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,$(PKG_NAME))) - diff --git a/voicemngr/files/etc/init.d/voicemngr b/voicemngr/files/etc/init.d/voicemngr index 1b71b354c..0d9ddb9d2 100755 --- a/voicemngr/files/etc/init.d/voicemngr +++ b/voicemngr/files/etc/init.d/voicemngr @@ -9,12 +9,10 @@ NAME=voicemngr start_service() { [ "$(db -q get hw.board.hasVoice)" = "1" ] || return - [ -d "/usr/lib/broadcom" ] && BCM_LIBS=LD_LIBRARY_PATH=/lib/broadcom:/usr/lib/broadcom - procd_open_instance procd_set_param env hw_board_hasDect="$(db get hw.board.hasDect)" \ hw_board_VoicePortNames="$(db get hw.board.VoicePortNames)" \ - $BCM_LIBS + procd_set_param command $NAME procd_set_param respawn "5" "0" "3" procd_set_param nice -12