From 4a55539a8b896761e9d70cb660a2d87f9aca916f Mon Sep 17 00:00:00 2001 From: Dan Voiculeasa Date: Tue, 12 Apr 2022 10:31:12 +0300 Subject: [PATCH] debian: Fix fm-common binaries location Keep the same binary location as on CentOS. An fm component was updated to produce binaries to correct location, but fm-common component was missed. Alarms could not be raised by sm. Tests: PASS: bootstrap PASS: unlock PASS: alarms are raised by sm Story: 2009101 Task: 44321 Signed-off-by: Dan Voiculeasa Change-Id: I56eb2a5cd69c643d477fba20a7344cd51be5444d --- fm-common/debian/deb_folder/fm-common.install | 3 +-- fm-common/debian/deb_folder/rules | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fm-common/debian/deb_folder/fm-common.install b/fm-common/debian/deb_folder/fm-common.install index 440e713d..83d4b1c8 100644 --- a/fm-common/debian/deb_folder/fm-common.install +++ b/fm-common/debian/deb_folder/fm-common.install @@ -1,4 +1,3 @@ -usr/bin/fmClientCli usr/bin -usr/bin/*.py usr/bin usr/lib/*.so.* usr/lib/python*/dist-packages/* +usr/local/bin/* diff --git a/fm-common/debian/deb_folder/rules b/fm-common/debian/deb_folder/rules index dd4d61c6..2979b6c0 100755 --- a/fm-common/debian/deb_folder/rules +++ b/fm-common/debian/deb_folder/rules @@ -12,10 +12,10 @@ override_dh_auto_build: override_dh_auto_install: make DESTDIR=$(ROOT) \ - BINDIR=/usr/bin \ LIBDIR=/usr/lib \ INCDIR=/usr/include \ CGCS_DOC_DEPLOY=/opt/deploy/cgcs_doc install python3 setup.py install --install-layout=deb --root $(ROOT) - +override_dh_usrlocal: + # do nothing