From f28d80d9031813a404670622ae71f0bab40a6399 Mon Sep 17 00:00:00 2001 From: "manjuraehmad.momin" Date: Wed, 26 Apr 2023 02:33:07 +0900 Subject: [PATCH] ose: settingsservice=18 jemalloc=6-r5 :Release Notes: Fix static analysis issues :Detailed Notes: settingsservice: submissions/17..submissions/18 3f3e6aa Fix coverity issues jemalloc: submissions/5..submissions/6 8ae7a30 Fix build with glibc-2.32 c4d0023 Fix static issues :Testing Performed: Please check CCC ticket [WRP-11330] for details. :QA Notes: :Issues Addressed: [WRP-11330] CCC: settingsservice=18 jemalloc=6-r5 [WRP-10344] Fix static issues in settings service component [WRP-9423] Fix jemalloc static issues Cherry-picked-from-commit: 0c27f7e359ea1a7ebadff32591b2d3d69ea94273 Cherry-picked-from-branch: --- meta-webos/recipes-webos/jemalloc/jemalloc.bb | 6 ++--- .../0001-Fix-build-with-glibc-2.32.patch | 27 ------------------- .../settingsservice/settingsservice.bb | 2 +- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 meta-webos/recipes-webos/jemalloc/jemalloc/0001-Fix-build-with-glibc-2.32.patch diff --git a/meta-webos/recipes-webos/jemalloc/jemalloc.bb b/meta-webos/recipes-webos/jemalloc/jemalloc.bb index 7cd43011f..b989b9caf 100644 --- a/meta-webos/recipes-webos/jemalloc/jemalloc.bb +++ b/meta-webos/recipes-webos/jemalloc/jemalloc.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = " \ file://oss-pkg-info.yaml;md5=a062b932da63efa0c8ac4060de1864cf \ " -WEBOS_VERSION = "0.20080828a-0webos9-5_959943d029e341cef3839f6b2e8cba04825a852d" -PR = "r4" +WEBOS_VERSION = "0.20080828a-0webos9-6_f527e94e1facd3a9c801bf181d5e7cba287d04bb" +PR = "r5" inherit webos_upstream_from_repo inherit webos_public_repo @@ -21,5 +21,3 @@ inherit webos_library SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE}" S = "${WORKDIR}/git" - -SRC_URI += "file://0001-Fix-build-with-glibc-2.32.patch" diff --git a/meta-webos/recipes-webos/jemalloc/jemalloc/0001-Fix-build-with-glibc-2.32.patch b/meta-webos/recipes-webos/jemalloc/jemalloc/0001-Fix-build-with-glibc-2.32.patch deleted file mode 100644 index 63b41438a..000000000 --- a/meta-webos/recipes-webos/jemalloc/jemalloc/0001-Fix-build-with-glibc-2.32.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4dca490c554b51dc49a657827d51bd9d2588521b Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 17 Aug 2020 07:49:36 -0700 -Subject: [PATCH] Fix build with glibc-2.32 - -* sysctl.h was removed in glibc-2.32 - https://sourceware.org/git/?p=glibc.git;a=commit;h=076f09afbac1aa57756faa7a8feadb7936a724e4 - -Signed-off-by: Martin Jansa ---- - src/jemalloc_linux.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/jemalloc_linux.c b/src/jemalloc_linux.c -index 4e2cb2f..40af38c 100644 ---- a/src/jemalloc_linux.c -+++ b/src/jemalloc_linux.c -@@ -178,7 +178,9 @@ - #include - #include - #include -+#if ! ( (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 32) ) - #include -+#endif - #include - - #include diff --git a/meta-webos/recipes-webos/settingsservice/settingsservice.bb b/meta-webos/recipes-webos/settingsservice/settingsservice.bb index 243431c91..4de31e35a 100644 --- a/meta-webos/recipes-webos/settingsservice/settingsservice.bb +++ b/meta-webos/recipes-webos/settingsservice/settingsservice.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "glib-2.0 glibmm luna-service2 libpbnjson pmloglib openssl libbson boost" RDEPENDS:${PN} = "settingsservice-conf" -WEBOS_VERSION = "1.0.22-17_ec43a793ccf3541c5053b6e4e998d49c9897eb42" +WEBOS_VERSION = "1.0.22-18_f759435b2c12ab714a5ed6d8e8bed478f4e47e3a" PR = "r24" inherit webos_component