From 5755f3d41fd438ab893090f9f0b2b04202c92694 Mon Sep 17 00:00:00 2001 From: Volkan Date: Fri, 8 Nov 2024 13:23:18 +0100 Subject: [PATCH 1/3] Updating for R5 --- .../thunder-clientlibraries/thunder-clientlibraries.inc | 4 +--- .../thunder-clientlibraries/thunder-clientlibraries_5.0.0.bb | 3 +++ .../thunder-interfaces/thunder-interfaces_5.0.0.bb | 3 +++ recipes-thunder/thunder-libraries/thunder-libraries_5.0.0.bb | 3 +++ recipes-thunder/thunder-tools/thunder-tools-native_5.0.0.bb | 3 +++ recipes-thunder/thunder-ui/thunder-ui_5.0.0.bb | 3 +++ recipes-thunder/thunder/thunder_5.0.0.bb | 3 +++ recipes-thunder/thunder/thunder_5.0.1.bb | 3 +++ 8 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.0.0.bb create mode 100644 recipes-thunder/thunder-interfaces/thunder-interfaces_5.0.0.bb create mode 100644 recipes-thunder/thunder-libraries/thunder-libraries_5.0.0.bb create mode 100644 recipes-thunder/thunder-tools/thunder-tools-native_5.0.0.bb create mode 100644 recipes-thunder/thunder-ui/thunder-ui_5.0.0.bb create mode 100644 recipes-thunder/thunder/thunder_5.0.0.bb create mode 100644 recipes-thunder/thunder/thunder_5.0.1.bb diff --git a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries.inc b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries.inc index 4d69a24..f513e92 100644 --- a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries.inc +++ b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries.inc @@ -11,9 +11,7 @@ DEPENDS += "thunder-interfaces" require ../include/thunder.inc require ../include/version.inc -SRC_URI = "git://github.com/rdkcentral/ThunderClientLibraries.git;protocol=https;branch=${RECIPE_BRANCH};protocol=https \ - file://0001-Fix-Weston-Compositor.patch \ - " +SRC_URI = "git://github.com/rdkcentral/ThunderClientLibraries.git;protocol=https;branch=${RECIPE_BRANCH}" inherit python3native WPE_CDMI_ADAPTER_IMPL ??= "${@bb.utils.contains('DISTRO_FEATURES', 'nexus_svp', 'opencdmi_brcm_svp', 'opencdm_gst', d)}" diff --git a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.0.0.bb b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.0.0.bb new file mode 100644 index 0000000..f05739e --- /dev/null +++ b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.0.0.bb @@ -0,0 +1,3 @@ +require ./thunder-clientlibraries.inc + +SRCREV = "aded8f779779289145085db5b1cc4c3da2a6cb9b" diff --git a/recipes-thunder/thunder-interfaces/thunder-interfaces_5.0.0.bb b/recipes-thunder/thunder-interfaces/thunder-interfaces_5.0.0.bb new file mode 100644 index 0000000..d6b3ef2 --- /dev/null +++ b/recipes-thunder/thunder-interfaces/thunder-interfaces_5.0.0.bb @@ -0,0 +1,3 @@ +require ./thunder-interfaces.inc + +SRCREV = "227976cc2fa9e7167414aa6e924d3767ae9cf2b0" diff --git a/recipes-thunder/thunder-libraries/thunder-libraries_5.0.0.bb b/recipes-thunder/thunder-libraries/thunder-libraries_5.0.0.bb new file mode 100644 index 0000000..586cb26 --- /dev/null +++ b/recipes-thunder/thunder-libraries/thunder-libraries_5.0.0.bb @@ -0,0 +1,3 @@ +require ./thunder-libraries.inc + +SRCREV = "0b92c2d84f0b77c20e0ce935604ea05326f5cc31" diff --git a/recipes-thunder/thunder-tools/thunder-tools-native_5.0.0.bb b/recipes-thunder/thunder-tools/thunder-tools-native_5.0.0.bb new file mode 100644 index 0000000..666c765 --- /dev/null +++ b/recipes-thunder/thunder-tools/thunder-tools-native_5.0.0.bb @@ -0,0 +1,3 @@ +require ./thunder-tools.inc + +SRCREV = "701c686d08b90f5033f29f6d733a71d5d742c66e" diff --git a/recipes-thunder/thunder-ui/thunder-ui_5.0.0.bb b/recipes-thunder/thunder-ui/thunder-ui_5.0.0.bb new file mode 100644 index 0000000..0278a4b --- /dev/null +++ b/recipes-thunder/thunder-ui/thunder-ui_5.0.0.bb @@ -0,0 +1,3 @@ +require ./thunder-ui.inc + +SRCREV = "ceb5e69d83ab077d13d6ae4391e62be126230a2a" diff --git a/recipes-thunder/thunder/thunder_5.0.0.bb b/recipes-thunder/thunder/thunder_5.0.0.bb new file mode 100644 index 0000000..284760f --- /dev/null +++ b/recipes-thunder/thunder/thunder_5.0.0.bb @@ -0,0 +1,3 @@ +require ./thunder.inc + +SRCREV = "f3132aff41c144983135a6c43c34289e9b7581f7" diff --git a/recipes-thunder/thunder/thunder_5.0.1.bb b/recipes-thunder/thunder/thunder_5.0.1.bb new file mode 100644 index 0000000..a94fda3 --- /dev/null +++ b/recipes-thunder/thunder/thunder_5.0.1.bb @@ -0,0 +1,3 @@ +require ./thunder.inc + +SRCREV = "c63cae7f190f388341bea8df8bd24872c9760590" From 6e8c346a1b92bf20f74c45a88e93824747b82f14 Mon Sep 17 00:00:00 2001 From: Bram Oosterhuis Date: Mon, 11 Nov 2024 11:51:46 +0100 Subject: [PATCH 2/3] Packagegroup-thunder: Remove thunder-libraries runtime dependency This component should come in by the components that accually depend on thunder-libraries in their bb recipes. --- recipes-core/packagegroups/packagegroup-thunder.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-core/packagegroups/packagegroup-thunder.bb b/recipes-core/packagegroups/packagegroup-thunder.bb index fe421ad..7bf9e7a 100644 --- a/recipes-core/packagegroups/packagegroup-thunder.bb +++ b/recipes-core/packagegroups/packagegroup-thunder.bb @@ -14,7 +14,6 @@ RDEPENDS:${PN} = "\ thunder \ thunder-clientlibraries \ thunder-interfaces \ - thunder-libraries \ thunder-ui \ " From bd51a2c834406564ccc719171da3907f48ed053c Mon Sep 17 00:00:00 2001 From: Volkan Date: Wed, 13 Nov 2024 11:56:19 +0100 Subject: [PATCH 3/3] R5_1 --- conf/distro/include/thunder_generic.conf | 1 - .../packagegroups/packagegroup-thunder.bb | 3 +- .../thunder-clientlibraries.inc | 2 - .../thunder-clientlibraries_4.2.1.bb | 5 -- .../thunder-clientlibraries_4.2.bb | 5 -- .../thunder-clientlibraries_4.4.2.bb | 3 -- .../thunder-clientlibraries_5.0.0.bb | 3 -- .../thunder-clientlibraries_5.1.0.bb | 3 ++ .../thunder-interfaces/thunder-interfaces.inc | 2 - .../thunder-interfaces_4.2.1.bb | 3 -- .../thunder-interfaces_4.2.bb | 3 -- .../thunder-interfaces_4.4.3.bb | 3 -- .../thunder-interfaces_5.0.0.bb | 3 -- .../thunder-interfaces_5.1.0.bb | 3 ++ .../thunder-libraries/thunder-libraries.inc | 28 ----------- .../thunder-libraries_4.2.1.bb | 3 -- .../thunder-libraries_4.2.bb | 3 -- .../thunder-libraries_4.4.1.bb | 3 -- .../thunder-libraries_5.0.0.bb | 3 -- .../thunder-tools-native_4.2.1.bb | 10 ---- .../thunder-tools/thunder-tools-native_4.2.bb | 10 ---- .../thunder-tools-native_4.4.3.bb | 3 -- .../thunder-tools-native_5.0.0.bb | 3 -- .../thunder-tools-native_5.1.0.bb | 3 ++ .../thunder-tools/thunder-tools.inc | 2 - recipes-thunder/thunder-ui/thunder-ui.inc | 2 - .../thunder-ui/thunder-ui_4.2.1.bb | 3 -- recipes-thunder/thunder-ui/thunder-ui_4.2.bb | 3 -- .../thunder-ui/thunder-ui_4.4.1.bb | 3 -- .../thunder-ui/thunder-ui_5.0.0.bb | 3 -- .../thunder-ui/thunder-ui_5.1.0.bb | 3 ++ ...-variable-added-for-Tools-cmake-path.patch | 48 ------------------- recipes-thunder/thunder/thunder.inc | 8 ++-- recipes-thunder/thunder/thunder_4.2.1.bb | 5 -- recipes-thunder/thunder/thunder_4.2.bb | 20 -------- recipes-thunder/thunder/thunder_4.4.3.bb | 3 -- recipes-thunder/thunder/thunder_5.0.0.bb | 3 -- recipes-thunder/thunder/thunder_5.0.1.bb | 3 -- recipes-thunder/thunder/thunder_5.1.0.bb | 3 ++ recipes-thunder/thunder/thunder_5.1.1.bb | 3 ++ 40 files changed, 22 insertions(+), 204 deletions(-) delete mode 100644 recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.2.1.bb delete mode 100644 recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.2.bb delete mode 100644 recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.4.2.bb delete mode 100644 recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.0.0.bb create mode 100644 recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.1.0.bb delete mode 100644 recipes-thunder/thunder-interfaces/thunder-interfaces_4.2.1.bb delete mode 100644 recipes-thunder/thunder-interfaces/thunder-interfaces_4.2.bb delete mode 100644 recipes-thunder/thunder-interfaces/thunder-interfaces_4.4.3.bb delete mode 100644 recipes-thunder/thunder-interfaces/thunder-interfaces_5.0.0.bb create mode 100644 recipes-thunder/thunder-interfaces/thunder-interfaces_5.1.0.bb delete mode 100644 recipes-thunder/thunder-libraries/thunder-libraries.inc delete mode 100644 recipes-thunder/thunder-libraries/thunder-libraries_4.2.1.bb delete mode 100644 recipes-thunder/thunder-libraries/thunder-libraries_4.2.bb delete mode 100644 recipes-thunder/thunder-libraries/thunder-libraries_4.4.1.bb delete mode 100644 recipes-thunder/thunder-libraries/thunder-libraries_5.0.0.bb delete mode 100644 recipes-thunder/thunder-tools/thunder-tools-native_4.2.1.bb delete mode 100644 recipes-thunder/thunder-tools/thunder-tools-native_4.2.bb delete mode 100644 recipes-thunder/thunder-tools/thunder-tools-native_4.4.3.bb delete mode 100644 recipes-thunder/thunder-tools/thunder-tools-native_5.0.0.bb create mode 100644 recipes-thunder/thunder-tools/thunder-tools-native_5.1.0.bb delete mode 100644 recipes-thunder/thunder-ui/thunder-ui_4.2.1.bb delete mode 100644 recipes-thunder/thunder-ui/thunder-ui_4.2.bb delete mode 100644 recipes-thunder/thunder-ui/thunder-ui_4.4.1.bb delete mode 100644 recipes-thunder/thunder-ui/thunder-ui_5.0.0.bb create mode 100644 recipes-thunder/thunder-ui/thunder-ui_5.1.0.bb delete mode 100644 recipes-thunder/thunder/thunder-4.2.1/ThunderTools-path-variable-added-for-Tools-cmake-path.patch delete mode 100644 recipes-thunder/thunder/thunder_4.2.1.bb delete mode 100644 recipes-thunder/thunder/thunder_4.2.bb delete mode 100644 recipes-thunder/thunder/thunder_4.4.3.bb delete mode 100644 recipes-thunder/thunder/thunder_5.0.0.bb delete mode 100644 recipes-thunder/thunder/thunder_5.0.1.bb create mode 100644 recipes-thunder/thunder/thunder_5.1.0.bb create mode 100644 recipes-thunder/thunder/thunder_5.1.1.bb diff --git a/conf/distro/include/thunder_generic.conf b/conf/distro/include/thunder_generic.conf index 1ef5707..b77fecf 100644 --- a/conf/distro/include/thunder_generic.conf +++ b/conf/distro/include/thunder_generic.conf @@ -5,7 +5,6 @@ DISTRO_FEATURES:append = " ${THUNDER_BUILDTYPE}" DISTROOVERRIDES .= ":${DISTRO_CODENAME}" DISTROOVERRIDES .= ":${DISTRO}" -DISTROOVERRIDES .= "${@bb.utils.contains("DISTRO_FEATURES", "wpeframework", ":wpeframework", "", d)}" # Set thunder permissions based on moudule requirements require thunder_permissions.inc diff --git a/recipes-core/packagegroups/packagegroup-thunder.bb b/recipes-core/packagegroups/packagegroup-thunder.bb index 7bf9e7a..f97e5ec 100644 --- a/recipes-core/packagegroups/packagegroup-thunder.bb +++ b/recipes-core/packagegroups/packagegroup-thunder.bb @@ -18,6 +18,5 @@ RDEPENDS:${PN} = "\ " PROVIDES:append = " \ - packagegroup-wpeframework \ packagegroup-thunder \ -" \ No newline at end of file +" diff --git a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries.inc b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries.inc index f513e92..d7b7e97 100644 --- a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries.inc +++ b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries.inc @@ -4,8 +4,6 @@ HOMEPAGE = "https://github.com/rdkcentral/ThunderClientLibraries" SECTION = "thunder" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=847677038847363222ffb66cfa6406c2" -PROVIDES += "wpeframework-clientlibraries" -RPROVIDES:${PN} += "wpeframework-clientlibraries" DEPENDS += "thunder-interfaces" require ../include/thunder.inc diff --git a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.2.1.bb b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.2.1.bb deleted file mode 100644 index a702267..0000000 --- a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ./thunder-clientlibraries.inc - -SRCREV = "09689520670fcb3d34ba4703e6f823b87e64fa43" - -SRC_URI += "file://0001-Simplify-FindGLESv2.patch" diff --git a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.2.bb b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.2.bb deleted file mode 100644 index e5fbaf7..0000000 --- a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ./thunder-clientlibraries.inc - -SRCREV = "a98c4a0b28edd62f4e14cfb29c217a024b99f19c" - -SRC_URI += "file://0001-Simplify-FindGLESv2.patch" diff --git a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.4.2.bb b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.4.2.bb deleted file mode 100644 index 4853b28..0000000 --- a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_4.4.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-clientlibraries.inc - -SRCREV = "09a75a85e1263e0520f182dea6dc19c673e070a1" diff --git a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.0.0.bb b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.0.0.bb deleted file mode 100644 index f05739e..0000000 --- a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.0.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-clientlibraries.inc - -SRCREV = "aded8f779779289145085db5b1cc4c3da2a6cb9b" diff --git a/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.1.0.bb b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.1.0.bb new file mode 100644 index 0000000..88b9bbf --- /dev/null +++ b/recipes-thunder/thunder-clientlibraries/thunder-clientlibraries_5.1.0.bb @@ -0,0 +1,3 @@ +require ./thunder-clientlibraries.inc + +SRCREV = "910022d1aada134cdf63b9c5bf8021f1a9c928ed" diff --git a/recipes-thunder/thunder-interfaces/thunder-interfaces.inc b/recipes-thunder/thunder-interfaces/thunder-interfaces.inc index 3c1055a..1bc0442 100644 --- a/recipes-thunder/thunder-interfaces/thunder-interfaces.inc +++ b/recipes-thunder/thunder-interfaces/thunder-interfaces.inc @@ -4,8 +4,6 @@ HOMEPAGE = "https://github.com/rdkcentral/ThunderInterfaces" SECTION = "thunder" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2f6c18f99faffa0e5d4ff478705c53f8" -PROVIDES += "wpeframework-interfaces" -RPROVIDES:${PN} += "wpeframework-interfaces" DEPENDS += "thunder" require ../include/thunder.inc diff --git a/recipes-thunder/thunder-interfaces/thunder-interfaces_4.2.1.bb b/recipes-thunder/thunder-interfaces/thunder-interfaces_4.2.1.bb deleted file mode 100644 index 6caae2e..0000000 --- a/recipes-thunder/thunder-interfaces/thunder-interfaces_4.2.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-interfaces.inc - -SRCREV = "7680dc5c0b248e26ba61972e59c63dc064c2be05" diff --git a/recipes-thunder/thunder-interfaces/thunder-interfaces_4.2.bb b/recipes-thunder/thunder-interfaces/thunder-interfaces_4.2.bb deleted file mode 100644 index 1f11b1e..0000000 --- a/recipes-thunder/thunder-interfaces/thunder-interfaces_4.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-interfaces.inc - -SRCREV = "d144e041f9c2169d45136e36da246c7f5c9b80a7" diff --git a/recipes-thunder/thunder-interfaces/thunder-interfaces_4.4.3.bb b/recipes-thunder/thunder-interfaces/thunder-interfaces_4.4.3.bb deleted file mode 100644 index 52624c1..0000000 --- a/recipes-thunder/thunder-interfaces/thunder-interfaces_4.4.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-interfaces.inc - -SRCREV = "23e142a4cea01fce3c39a234a3ffde20aeb98490" diff --git a/recipes-thunder/thunder-interfaces/thunder-interfaces_5.0.0.bb b/recipes-thunder/thunder-interfaces/thunder-interfaces_5.0.0.bb deleted file mode 100644 index d6b3ef2..0000000 --- a/recipes-thunder/thunder-interfaces/thunder-interfaces_5.0.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-interfaces.inc - -SRCREV = "227976cc2fa9e7167414aa6e924d3767ae9cf2b0" diff --git a/recipes-thunder/thunder-interfaces/thunder-interfaces_5.1.0.bb b/recipes-thunder/thunder-interfaces/thunder-interfaces_5.1.0.bb new file mode 100644 index 0000000..8e04f4f --- /dev/null +++ b/recipes-thunder/thunder-interfaces/thunder-interfaces_5.1.0.bb @@ -0,0 +1,3 @@ +require ./thunder-interfaces.inc + +SRCREV = "80d71127d5431daf6c35aa9e6924ec17e6a35018" diff --git a/recipes-thunder/thunder-libraries/thunder-libraries.inc b/recipes-thunder/thunder-libraries/thunder-libraries.inc deleted file mode 100644 index ff5dcf6..0000000 --- a/recipes-thunder/thunder-libraries/thunder-libraries.inc +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Thunder Libraries" -DESCRIPTION = "Thunder libraries component" -HOMEPAGE = "https://github.com/WebPlatformForEmbedded/ThunderLibraries" -SECTION = "thunder" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=85bcfede74b96d9a58c6ea5d4b607e58" -PROVIDES += "wpeframework-libraries" -RPROVIDES:${PN} += "wpeframework-libraries" -DEPENDS += "thunder-tools-native thunder" - -require ../include/thunder.inc -require ../include/version.inc - -SRC_URI = "git://git@github.com:/WebPlatformForEmbedded/ThunderLibraries.git;protocol=ssh;branch=${RECIPE_BRANCH}" - -PACKAGECONFIG ??= "\ - ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'bluetooth', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'broadcast', 'broadcast', '', d)} \ -" - -PACKAGECONFIG[bluetooth] = "-DBLUETOOTH=ON,-DBLUETOOTH=OFF,bluez5" -PACKAGECONFIG[broadcast] = "-DBROADCAST=ON,-DBROADCAST=OFF," -PACKAGECONFIG[broadcastsiparse] = "-DBROADCAST_SI_PARSING=ON,-DBROADCAST_SI_PARSING=OFF," - -EXTRA_OECMAKE += "\ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_REFERENCE=${SRCREV} \ -" diff --git a/recipes-thunder/thunder-libraries/thunder-libraries_4.2.1.bb b/recipes-thunder/thunder-libraries/thunder-libraries_4.2.1.bb deleted file mode 100644 index 4ee441e..0000000 --- a/recipes-thunder/thunder-libraries/thunder-libraries_4.2.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-libraries.inc - -SRCREV = "72c559ddc31fdc75c256cec9d7014a84ccfffc3f" diff --git a/recipes-thunder/thunder-libraries/thunder-libraries_4.2.bb b/recipes-thunder/thunder-libraries/thunder-libraries_4.2.bb deleted file mode 100644 index 3c612e3..0000000 --- a/recipes-thunder/thunder-libraries/thunder-libraries_4.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-libraries.inc - -SRCREV = "6efb1eb6c3b10dd60252420e7233956abb46ec76" diff --git a/recipes-thunder/thunder-libraries/thunder-libraries_4.4.1.bb b/recipes-thunder/thunder-libraries/thunder-libraries_4.4.1.bb deleted file mode 100644 index 6d441e8..0000000 --- a/recipes-thunder/thunder-libraries/thunder-libraries_4.4.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-libraries.inc - -SRCREV = "b9d52f41575966f5f74173b08bf68ad1db07e5ad" diff --git a/recipes-thunder/thunder-libraries/thunder-libraries_5.0.0.bb b/recipes-thunder/thunder-libraries/thunder-libraries_5.0.0.bb deleted file mode 100644 index 586cb26..0000000 --- a/recipes-thunder/thunder-libraries/thunder-libraries_5.0.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-libraries.inc - -SRCREV = "0b92c2d84f0b77c20e0ce935604ea05326f5cc31" diff --git a/recipes-thunder/thunder-tools/thunder-tools-native_4.2.1.bb b/recipes-thunder/thunder-tools/thunder-tools-native_4.2.1.bb deleted file mode 100644 index 9e60856..0000000 --- a/recipes-thunder/thunder-tools/thunder-tools-native_4.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ./thunder-tools.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=85bcfede74b96d9a58c6ea5d4b607e58" - -# In the past the generators resided in Thunders repo. -SRC_URI = "git://github.com/rdkcentral/Thunder.git;protocol=https;branch=${RECIPE_BRANCH}" - -OECMAKE_SOURCEPATH = "${WORKDIR}/git/Tools" - -SRCREV = "0d6aa9664f780053818d1bbd211cdcf69ec2e9aa" diff --git a/recipes-thunder/thunder-tools/thunder-tools-native_4.2.bb b/recipes-thunder/thunder-tools/thunder-tools-native_4.2.bb deleted file mode 100644 index 25909e5..0000000 --- a/recipes-thunder/thunder-tools/thunder-tools-native_4.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ./thunder-tools.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=85bcfede74b96d9a58c6ea5d4b607e58" - -# In the past the generators resided in Thunders repo. -SRC_URI = "git://github.com/rdkcentral/Thunder.git;protocol=https;branch=${RECIPE_BRANCH}" - -OECMAKE_SOURCEPATH = "${WORKDIR}/git/Tools" - -SRCREV = "8fa0abb34e7db00905fcf6ab58e05f9860ca1b50" diff --git a/recipes-thunder/thunder-tools/thunder-tools-native_4.4.3.bb b/recipes-thunder/thunder-tools/thunder-tools-native_4.4.3.bb deleted file mode 100644 index 66b34fc..0000000 --- a/recipes-thunder/thunder-tools/thunder-tools-native_4.4.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-tools.inc - -SRCREV = "b6789ca88b1e6c56942d9858d6d4411eae389ddc" diff --git a/recipes-thunder/thunder-tools/thunder-tools-native_5.0.0.bb b/recipes-thunder/thunder-tools/thunder-tools-native_5.0.0.bb deleted file mode 100644 index 666c765..0000000 --- a/recipes-thunder/thunder-tools/thunder-tools-native_5.0.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-tools.inc - -SRCREV = "701c686d08b90f5033f29f6d733a71d5d742c66e" diff --git a/recipes-thunder/thunder-tools/thunder-tools-native_5.1.0.bb b/recipes-thunder/thunder-tools/thunder-tools-native_5.1.0.bb new file mode 100644 index 0000000..8b6358c --- /dev/null +++ b/recipes-thunder/thunder-tools/thunder-tools-native_5.1.0.bb @@ -0,0 +1,3 @@ +require ./thunder-tools.inc + +SRCREV = "4ceccbc111e9e9fb73ec6182c6886d84c2037517" diff --git a/recipes-thunder/thunder-tools/thunder-tools.inc b/recipes-thunder/thunder-tools/thunder-tools.inc index 7be8824..3c4d070 100644 --- a/recipes-thunder/thunder-tools/thunder-tools.inc +++ b/recipes-thunder/thunder-tools/thunder-tools.inc @@ -4,8 +4,6 @@ DESCRIPTION = "Host/Native tooling (i.e generators) required to build Thunder Fr SECTION = "thunder" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c3349dc67b2f8c28fc99b300eb39e3cc" -PROVIDES += "wpeframework-tools-native" -RPROVIDES:${PN} += "wpeframework-tools-native" DEPENDS += "python3-native python3-jsonref-native" require ../include/version.inc diff --git a/recipes-thunder/thunder-ui/thunder-ui.inc b/recipes-thunder/thunder-ui/thunder-ui.inc index 1c2ea74..7591ef8 100644 --- a/recipes-thunder/thunder-ui/thunder-ui.inc +++ b/recipes-thunder/thunder-ui/thunder-ui.inc @@ -3,8 +3,6 @@ DESCRIPTION = "Thunder Framework User Interface web app" HOMEPAGE = "https://github.com/rdkcentral/ThunderUI" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=66fe57b27abb01505f399ce4405cfea0" -PROVIDES += "wpeframework-ui" -RPROVIDES:${PN} += "wpeframework-ui" require ../include/version.inc diff --git a/recipes-thunder/thunder-ui/thunder-ui_4.2.1.bb b/recipes-thunder/thunder-ui/thunder-ui_4.2.1.bb deleted file mode 100644 index 728614b..0000000 --- a/recipes-thunder/thunder-ui/thunder-ui_4.2.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-ui.inc - -SRCREV = "aa8c9287cc34753d66eb9a2fd4c114d7dda78a19" diff --git a/recipes-thunder/thunder-ui/thunder-ui_4.2.bb b/recipes-thunder/thunder-ui/thunder-ui_4.2.bb deleted file mode 100644 index 728614b..0000000 --- a/recipes-thunder/thunder-ui/thunder-ui_4.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-ui.inc - -SRCREV = "aa8c9287cc34753d66eb9a2fd4c114d7dda78a19" diff --git a/recipes-thunder/thunder-ui/thunder-ui_4.4.1.bb b/recipes-thunder/thunder-ui/thunder-ui_4.4.1.bb deleted file mode 100644 index 983dfa8..0000000 --- a/recipes-thunder/thunder-ui/thunder-ui_4.4.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-ui.inc - -SRCREV = "b4f54fd06fc4e6c748f21d3f62d3f8763f58d6d1" diff --git a/recipes-thunder/thunder-ui/thunder-ui_5.0.0.bb b/recipes-thunder/thunder-ui/thunder-ui_5.0.0.bb deleted file mode 100644 index 0278a4b..0000000 --- a/recipes-thunder/thunder-ui/thunder-ui_5.0.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder-ui.inc - -SRCREV = "ceb5e69d83ab077d13d6ae4391e62be126230a2a" diff --git a/recipes-thunder/thunder-ui/thunder-ui_5.1.0.bb b/recipes-thunder/thunder-ui/thunder-ui_5.1.0.bb new file mode 100644 index 0000000..6937180 --- /dev/null +++ b/recipes-thunder/thunder-ui/thunder-ui_5.1.0.bb @@ -0,0 +1,3 @@ +require ./thunder-ui.inc + +SRCREV = "7fd8bd29280cc9c2261d1b25f154386d2aae0091" diff --git a/recipes-thunder/thunder/thunder-4.2.1/ThunderTools-path-variable-added-for-Tools-cmake-path.patch b/recipes-thunder/thunder/thunder-4.2.1/ThunderTools-path-variable-added-for-Tools-cmake-path.patch deleted file mode 100644 index c98cf6b..0000000 --- a/recipes-thunder/thunder/thunder-4.2.1/ThunderTools-path-variable-added-for-Tools-cmake-path.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 256f5c8337a1360ea78ec7ed37424993db4c10ff Mon Sep 17 00:00:00 2001 -From: HaseenaSainul <41037131+HaseenaSainul@users.noreply.github.com> -Date: Wed, 15 Mar 2023 00:15:56 +0530 -Subject: [PATCH] ThunderTools: path variable added for Tools cmake path - (#1272) -Upstream-Status: Inappropriate [Thunder adaptation] - -Co-authored-by: Pierre Wielders ---- - CMakeLists.txt | 5 +++++ - cmake/project.cmake.in | 9 +++++++++ - 2 files changed, 14 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 286b5a9ed..24e5d52da 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,6 +47,11 @@ list(APPEND CMAKE_MODULE_PATH - "${CMAKE_SOURCE_DIR}/cmake/modules" - "${CMAKE_SYSROOT}${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}/Modules") - -+if (TOOLS_SYSROOT) -+ list(APPEND CMAKE_MODULE_PATH -+ "${TOOLS_SYSROOT}${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}/Modules") -+endif() -+ - include(platform) - include(CmakeHelperFunctions) - -diff --git a/cmake/project.cmake.in b/cmake/project.cmake.in -index 38c110079..969026519 100644 ---- a/cmake/project.cmake.in -+++ b/cmake/project.cmake.in -@@ -120,6 +120,15 @@ endif() - set(MODULE_BASE_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "" FORCE) - list(APPEND CMAKE_MODULE_PATH "${MODULE_BASE_DIR}/common" "${CMAKE_SYSROOT}@CMAKE_INSTALL_PREFIX@/include/${NAMESPACE}/Modules") - -+if(NOT DEFINED TOOLS_SYSROOT) -+ set(TOOLS_SYSROOT @TOOLS_SYSROOT@) -+endif() -+ -+if(TOOLS_SYSROOT) -+ list(APPEND CMAKE_MODULE_PATH -+ "${TOOLS_SYSROOT}/@CMAKE_INSTALL_PREFIX@/include/${NAMESPACE}/Modules") -+endif() -+ - list(REMOVE_DUPLICATES CMAKE_MODULE_PATH) - list(SORT CMAKE_MODULE_PATH) \ No newline at end of file diff --git a/recipes-thunder/thunder/thunder.inc b/recipes-thunder/thunder/thunder.inc index 44d6ba1..99c48f0 100644 --- a/recipes-thunder/thunder/thunder.inc +++ b/recipes-thunder/thunder/thunder.inc @@ -1,11 +1,9 @@ HOMEPAGE = "https://github.com/rdkcentral/Thunder" -SUMMARY = "Web Platform for Embedded Framework" +SUMMARY = "Thunder Framework" DESCRIPTION = "A C++ platform abstraction layer for generic functionality." SECTION = "thunder" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=85bcfede74b96d9a58c6ea5d4b607e58" -PROVIDES += "wpeframework" -RPROVIDES:${PN} += "wpeframework" require ../include/thunder.inc require ../include/version.inc @@ -151,5 +149,5 @@ INITSCRIPT_NAME:${PN}-initscript = "thunder" INITSCRIPT_PARAMS:${PN}-initscript = "defaults ${THUNDER_START} 24" RRECOMMENDS:${PN} = "${PN}-initscript" -FILES:${PN} += "${libdir}/thunder/*/*.so* ${THUNDER_PERSISTENT_PATH} ${libdir}/wpeframework/*/*.so*" -FILES:${PN}-dev += "${libdir}/thunder/*/*.so ${libdir}/wpeframework/*/*.so" +FILES:${PN} += "${libdir}/thunder/*/*.so* ${THUNDER_PERSISTENT_PATH}" +FILES:${PN}-dev += "${libdir}/thunder/*/*.so" diff --git a/recipes-thunder/thunder/thunder_4.2.1.bb b/recipes-thunder/thunder/thunder_4.2.1.bb deleted file mode 100644 index 7129b96..0000000 --- a/recipes-thunder/thunder/thunder_4.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ./thunder.inc - -SRC_URI += "file://ThunderTools-path-variable-added-for-Tools-cmake-path.patch" - -SRCREV = "0d6aa9664f780053818d1bbd211cdcf69ec2e9aa" diff --git a/recipes-thunder/thunder/thunder_4.2.bb b/recipes-thunder/thunder/thunder_4.2.bb deleted file mode 100644 index 2584197..0000000 --- a/recipes-thunder/thunder/thunder_4.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -require ./thunder.inc - -SRCREV = "8fa0abb34e7db00905fcf6ab58e05f9860ca1b50" - -# FIXME, determine this a little smarter -# Provision event is required for libprovision and provision plugin -# Location event is required for locationsync plugin -# Time event is required for timesync plugin -# Identifier event is required for Compositor plugin -# Internet event is provided by the LocationSync plugin -# WebSource event is provided by the WebServer plugin - -WPEFRAMEWORK_EXTERN_EVENTS ?= " \ - Decryption \ - ${@bb.utils.contains('PACKAGECONFIG', 'websource', 'WebSource', '', d)} \ - Location Time Internet Provisioning \ - ${@bb.utils.contains('DISTRO_FEATURES', 'thunder_security_disable', '', 'Security', d)} \ -" - -EXTRA_OECMAKE += '-DEXTERN_EVENTS="${WPEFRAMEWORK_EXTERN_EVENTS}"' \ No newline at end of file diff --git a/recipes-thunder/thunder/thunder_4.4.3.bb b/recipes-thunder/thunder/thunder_4.4.3.bb deleted file mode 100644 index 2aca07f..0000000 --- a/recipes-thunder/thunder/thunder_4.4.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder.inc - -SRCREV = "19100433e5517c743738bb2a9ed8ce2f79c10eaf" diff --git a/recipes-thunder/thunder/thunder_5.0.0.bb b/recipes-thunder/thunder/thunder_5.0.0.bb deleted file mode 100644 index 284760f..0000000 --- a/recipes-thunder/thunder/thunder_5.0.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder.inc - -SRCREV = "f3132aff41c144983135a6c43c34289e9b7581f7" diff --git a/recipes-thunder/thunder/thunder_5.0.1.bb b/recipes-thunder/thunder/thunder_5.0.1.bb deleted file mode 100644 index a94fda3..0000000 --- a/recipes-thunder/thunder/thunder_5.0.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ./thunder.inc - -SRCREV = "c63cae7f190f388341bea8df8bd24872c9760590" diff --git a/recipes-thunder/thunder/thunder_5.1.0.bb b/recipes-thunder/thunder/thunder_5.1.0.bb new file mode 100644 index 0000000..28c6ceb --- /dev/null +++ b/recipes-thunder/thunder/thunder_5.1.0.bb @@ -0,0 +1,3 @@ +require ./thunder.inc + +SRCREV = "efe1926a0680bffc29491f1a1304f861ff2fa771" diff --git a/recipes-thunder/thunder/thunder_5.1.1.bb b/recipes-thunder/thunder/thunder_5.1.1.bb new file mode 100644 index 0000000..be36db6 --- /dev/null +++ b/recipes-thunder/thunder/thunder_5.1.1.bb @@ -0,0 +1,3 @@ +require ./thunder.inc + +SRCREV = "a89444e8407b9ce717525e8cd424378ce353b88f"