Skip to content

Commit

Permalink
webos: packagegroup-webos-diagnostics=r3 packagegroup-webos-extended=…
Browse files Browse the repository at this point in the history
…r48 com.webos.service.memorymanager=60-r11 pmtrace=17 bootd=21

:Release Notes:
Add systemd-analyze and guider
Fix coverity issues

:Detailed Notes:
packagegroup-webos-diagnostics: r2..r3
Add systemd-analyze and guider

packagegroup-webos-extended: r47..r48
Remove systemd-analyze

com.webos.service.memorymanager: 58..60
791e2c2 Remove memorymanager.service file
80a627a Fix coverity issues

pmtrace: 16..17
c905c90 Fix coverity issue

bootd: 20..21
a06a140 Fix coverity issue

:Testing Performed:
See the CCC jira ticket

:QA Notes:

:Issues Addressed:
[WRQ-3953] CCC: packagegroup-webos-diagnostics=r3 packagegroup-webos-extended=r48 com.webos.service.memorymanager=60-r11 pmtrace=17 bootd=21
[WRQ-1948] [RP] Fix static analysis #1

Cherry-picked-from-commit: 77333c3
Cherry-picked-from-branch:
  • Loading branch information
hongsukil authored and ywbyun0815 committed Dec 1, 2023
1 parent 19652bb commit 5bd3f17
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,25 @@ DESCRIPTION = "Components for diagnostics added to webOS"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"

PR = "r2"
PR = "r3"

inherit packagegroup
inherit features_check
inherit webos_machine_impl_dep
inherit webos_prerelease_dep

REQUIRED_DISTRO_FEATURES = "webos-diagnostics"

VIRTUAL-RUNTIME_event-monitor-network ?= "event-monitor-network"
VIRTUAL-RUNTIME_systemd-analyze ?= "${@oe.utils.conditional('WEBOS_DISTRO_PRERELEASE', '', '', 'systemd-analyze', d)}"

RDEPENDS:${PN} = " \
com.palm.service.devmode \
${@'' if '${WEBOS_DISTRO_PRERELEASE}' == '' else 'guider'} \
pmklogd \
pmlogctl \
pmlogdaemon \
${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager', 'systemd', '${VIRTUAL-RUNTIME_systemd-analyze}', '', d)} \
webos-fluentbit-plugins \
${VIRTUAL-RUNTIME_event-monitor-network} \
"
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DESCRIPTION = "meta-webos components used in webOS OSE"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"

PR = "r47"
PR = "r48"

PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
Expand Down Expand Up @@ -130,7 +130,6 @@ WEBOS_FOSS_MISSING_FROM_RDEPENDS = " \
openssl \
psmisc \
sqlite3 \
${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'systemd-analyze', 'sysvinit-pidof', d)} \
"

# These packages that are installed in the qemux86 image only.
Expand Down
2 changes: 1 addition & 1 deletion meta-webos/recipes-webos/bootd/bootd.bb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \

DEPENDS = "luna-service2 libpbnjson pmloglib glib-2.0 boost"

WEBOS_VERSION = "2.0.0-20_553e4db9d08eebde7583e303db19d0cbb9f41342"
WEBOS_VERSION = "2.0.0-21_7e47e2b3527b3ec9680f5ee61c985885f8688dc3"
PR = "r17"

inherit webos_component
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \

DEPENDS = "glib-2.0 glib-2.0-native luna-service2 libpbnjson pmloglib"

WEBOS_VERSION = "1.0.0-58_060dc9e5237fa4fd8649b249d4d19d7b4e142387"
PR = "r10"
WEBOS_VERSION = "1.0.0-60_9b116bc67517d30e7868a003bb44f9cc2c7495db"
PR = "r11"

inherit webos_component
inherit webos_cmake
Expand All @@ -31,10 +31,3 @@ S = "${WORKDIR}/git"
inherit webos_systemd
WEBOS_SYSTEMD_SERVICE = "memorymanager.service.in"

# All service files will be managed in meta-lg-webos.
# The service file in the repository is not used, so please delete it.
# See the page below for more details.
# http://collab.lge.com/main/pages/viewpage.action?pageId=2031668745
do_install:append() {
rm ${D}${sysconfdir}/systemd/system/memorymanager.service
}
2 changes: 1 addition & 1 deletion meta-webos/recipes-webos/pmtrace/pmtrace.bb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RDEPENDS:${PN} += " \
lttng-modules \
"

WEBOS_VERSION = "1.0.0-16_78c4ba75091dbc9a7e3a3169f7ac892ff2427f89"
WEBOS_VERSION = "1.0.0-17_f6d4399f296df2b4bead4dda7f3e56090634fd6b"
PR = "r13"

inherit webos_component
Expand Down

0 comments on commit 5bd3f17

Please sign in to comment.