summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2025-07-14 13:59:52 -0700
committerKhem Raj <raj.khem@gmail.com>2025-07-15 00:25:32 -0700
commit804abb58c60d23acbbbf0eee735e870d4231f9d1 (patch)
tree4cb017ca77724523700632d6e3f9cab60a677c11
parentbe3c11c82d701dd3221ab1c5ec9180c3de556f2a (diff)
downloadmeta-openembedded-804abb58c60d23acbbbf0eee735e870d4231f9d1.tar.gz
openwsman: Upgrade to 2.8.1 release
Fixes build with cmake4+ Drop upstreamed patches Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch71
-rw-r--r--meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch5
-rw-r--r--meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch19
-rw-r--r--meta-oe/recipes-extended/openwsman/openwsman_2.8.1.bb (renamed from meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb)7
4 files changed, 2 insertions, 100 deletions
diff --git a/meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch b/meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch
deleted file mode 100644
index 2f47261588..0000000000
--- a/meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 09101da4efaa5584b7f3f3f3bfa5dbb4d1e26948 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 24 Jul 2023 22:09:21 -0700
4Subject: [PATCH] Link with libm for floor() function
5
6LLD linker finds this missing symbol
7
8arm-yoe-linux-gnueabi-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: floor
9>>> referenced by src/lib/libwsman.so.1.0.0
10
11Upstream-Status: Submitted [https://github.com/Openwsman/openwsman/pull/195]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 CMakeLists.txt | 10 ++++++++++
15 configure.ac | 3 ++-
16 src/lib/CMakeLists.txt | 4 ++++
17 3 files changed, 16 insertions(+), 1 deletion(-)
18
19diff --git a/CMakeLists.txt b/CMakeLists.txt
20index 6e54c66b..507ee633 100644
21--- a/CMakeLists.txt
22+++ b/CMakeLists.txt
23@@ -297,6 +297,16 @@ ELSE(HAVE_LIBDL)
24 SET(HAVE_LIBDL 0)
25 ENDIF(HAVE_LIBDL)
26
27+# m
28+
29+FIND_LIBRARY( HAVE_LIBM "m" )
30+IF(HAVE_LIBM)
31+ SET(M_LIBRARIES ${HAVE_LIBM})
32+ SET(HAVE_LIBM 1)
33+ELSE(HAVE_LIBM)
34+ SET(HAVE_LIBM 0)
35+ENDIF(HAVE_LIBM)
36+
37 # crypt
38
39 FIND_LIBRARY( HAVE_LIBCRYPT "crypt" )
40diff --git a/configure.ac b/configure.ac
41index 125564da..010fa0b6 100644
42--- a/configure.ac
43+++ b/configure.ac
44@@ -128,7 +128,8 @@ daemon \
45 va_copy \
46 memmove \
47 bcopy \
48-gmtime_r
49+gmtime_r \
50+floor
51 )
52 AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
53 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
54diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
55index 5c51781f..496fd672 100644
56--- a/src/lib/CMakeLists.txt
57+++ b/src/lib/CMakeLists.txt
58@@ -36,6 +36,10 @@ if( HAVE_LIBDL )
59 TARGET_LINK_LIBRARIES(wsman ${DL_LIBRARIES})
60 endif( HAVE_LIBDL )
61
62+if( HAVE_LIBM )
63+TARGET_LINK_LIBRARIES(wsman ${M_LIBRARIES})
64+endif( HAVE_LIBM )
65+
66 IF( ENABLE_EVENTING_SUPPORT )
67 TARGET_LINK_LIBRARIES( wsman ${WSMAN_CLIENT_PKG} )
68 ENDIF( ENABLE_EVENTING_SUPPORT )
69--
702.41.0
71
diff --git a/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch b/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch
index 0e2349e303..8440793b89 100644
--- a/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch
+++ b/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch
@@ -13,8 +13,6 @@ Upstream-Status: Pending
13 src/lib/u/lock.c | 2 +- 13 src/lib/u/lock.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/lib/u/lock.c b/src/lib/u/lock.c
17index 025eea4c..b31c77b5 100644
18--- a/src/lib/u/lock.c 16--- a/src/lib/u/lock.c
19+++ b/src/lib/u/lock.c 17+++ b/src/lib/u/lock.c
20@@ -50,7 +50,7 @@ 18@@ -50,7 +50,7 @@
@@ -26,6 +24,3 @@ index 025eea4c..b31c77b5 100644
26 #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE 24 #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
27 #endif 25 #endif
28 26
29--
302.14.1
31
diff --git a/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch b/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch
deleted file mode 100644
index 71f3d90a81..0000000000
--- a/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Upstream-Status: Pending
2
3libssl is required by wsman_client_transport if ENABLE_EVENTING_SUPPORT enabled.
4
5Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
6
7diff -Nurp openwsman-2.4.12.orig/src/lib/CMakeLists.txt openwsman-2.4.12/src/lib/CMakeLists.txt
8--- openwsman-2.4.12.orig/src/lib/CMakeLists.txt 2014-10-28 23:04:47.000000000 +0800
9+++ openwsman-2.4.12/src/lib/CMakeLists.txt 2014-12-31 11:09:20.340428523 +0800
10@@ -56,6 +56,9 @@ TARGET_LINK_LIBRARIES( ${WSMAN_CLIENT_TR
11 SET_TARGET_PROPERTIES( ${WSMAN_CLIENT_TRANSPORT_PKG} PROPERTIES VERSION 1.0.0 SOVERSION 1)
12 INSTALL(TARGETS ${WSMAN_CLIENT_TRANSPORT_PKG} DESTINATION ${LIB_INSTALL_DIR})
13
14+IF( ENABLE_EVENTING_SUPPORT )
15+TARGET_LINK_LIBRARIES( ${WSMAN_CLIENT_TRANSPORT_PKG} ${OPENSSL_LIBRARIES} )
16+ENDIF( ENABLE_EVENTING_SUPPORT )
17
18 ############### wsman_client ###############
19
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.8.1.bb
index 970d7fb5fc..5abe06d07b 100644
--- a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
+++ b/meta-oe/recipes-extended/openwsman/openwsman_2.8.1.bb
@@ -15,16 +15,13 @@ DEPENDS = "curl libxml2 openssl libpam"
15inherit features_check 15inherit features_check
16REQUIRED_DISTRO_FEATURES = "pam" 16REQUIRED_DISTRO_FEATURES = "pam"
17 17
18SRCREV = "0120e256faa255d997d9a49d5207662c0b73d430" 18SRCREV = "20efbccaf804a5a27a914eb8802b806416c03ece"
19 19
20SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https \ 20SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https;tag=v${PV} \
21 file://libssl-is-required-if-eventint-supported.patch \
22 file://openwsmand.service \ 21 file://openwsmand.service \
23 file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ 22 file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \
24 file://0001-Link-with-libm-for-floor-function.patch \
25 " 23 "
26 24
27
28LICENSE = "BSD-3-Clause" 25LICENSE = "BSD-3-Clause"
29LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba" 26LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba"
30 27