starlingx/meta-starlingx
Code Issues Proposed changes

libsm-common: add missing dependency in Makefile for libsm_watchdog_nfs

Browse Source 
Add missing dependency on libsm_common.so in Makefile for
libsm_watchdog_nfs to avoid race condition issue:

| ../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/8.3.0/ld: cannot
|  find -lsm_common
| collect2: error: ld returned 1 exit status
| make: *** [libsm_watchdog_nfs.so.0] Error 1

Story: 2008204
Task: 40988

Change-Id: I5b72ef9cdcb00487939f3643c777a1d634a2f4f5
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
This commit is contained in:
Jackie Huang 2020-09-27 10:05:50 +08:00
parent abbadaaff1
commit 7438b9cfd1
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta-stx-flock/stx-ha/files/0001-libsm_watchdog_nfs-add-missing-dependency-on-libsm_c.patch Normal file
View File

@ -0,0 +1,35 @@
From 0374eb585bc3e47e914c7f523f904923a447d2f7 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Sat, 27 Jun 2020 10:26:58 +0800
Subject: [PATCH] libsm_watchdog_nfs: add missing dependency on libsm_common.so
Add missing dependency on libsm_common.so in Makefile for libsm_watchdog_nfs
to avoid race condition issue:
| ../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/8.3.0/ld: cannot
| find -lsm_common
| collect2: error: ld returned 1 exit status
| make: *** [libsm_watchdog_nfs.so.0] Error 1
Upstream-Status: Submitted [https://review.opendev.org/759787]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
service-mgmt/sm-common/src/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/service-mgmt/sm-common/src/Makefile b/service-mgmt/sm-common/src/Makefile
index 7d138f9..487dfa0 100644
--- a/service-mgmt/sm-common/src/Makefile
+++ b/service-mgmt/sm-common/src/Makefile
@@ -53,7 +53,7 @@ libsm_watchdog_nfs.so: libsm_watchdog_nfs.so.$(VER_MJR)
libsm_watchdog_nfs.so.$(VER_MJR): libsm_watchdog_nfs.so.$(VER)
ln -sf $^ $@
-libsm_watchdog_nfs.so.$(VER): libsm_common.so.$(VER)
+libsm_watchdog_nfs.so.$(VER): libsm_common.so.$(VER) libsm_common.so
$(CXX) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) sm_watchdog_nfs.c ${LDFLAGS} $(LDLIBS) -L./ -lsm_common -Wl,-soname,libsm_watchdog_nfs.so.$(VER_MJR) -o $@
sm_watchdog: libsm_common.so
--
2.7.4

5
meta-stx-flock/stx-ha/libsm-common.bb
View File

@ -8,7 +8,10 @@ SUBPATH0 = "service-mgmt/sm-common"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI += "file://0001-stx-ha-fix-hardcoded-path-for-sm.patch;striplevel=3"
SRC_URI += " \
file://0001-stx-ha-fix-hardcoded-path-for-sm.patch;striplevel=3 \
file://0001-libsm_watchdog_nfs-add-missing-dependency-on-libsm_c.patch;striplevel=3 \
"
DEPENDS_append = " \
glib-2.0 \