Skip to content

Commit 8e3fa57

Browse files
author
Neeraj Deshpande
committed
Merge branch 'main' into development/bcm-refsw-20.2
2 parents 2e273f2 + d91148a commit 8e3fa57

File tree

105 files changed

+2477
-447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2477
-447
lines changed

‎board/explora/explora.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ libocdm.so
8787
libpng16.so
8888
libprovision.so
8989
librpc.so
90-
libsoup-2.4.so
90+
libsoup*
9191
libsqlite3.so
9292
libstdc++.so
9393
libtasn1.so

‎configs/explora_bcm7267_wpe_ml_defconfig‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ BR2_CCACHE=y
66
BR2_OPTIMIZE_2=y
77
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
88
BR2_KERNEL_HEADERS_4_9=y
9+
BR2_PACKAGE_GLIBC_LEGACY=y
910
BR2_GCC_VERSION_9_X=y
1011
BR2_TOOLCHAIN_BUILDROOT_CXX=y
1112
BR2_GCC_ENABLE_LTO=y
@@ -28,10 +29,13 @@ BR2_PACKAGE_NETFLIX52=y
2829
# BR2_PACKAGE_NETFLIX52_AUDIO_MIXER is not set
2930
BR2_PACKAGE_BITSTREAM_VERA=y
3031
BR2_PACKAGE_EXPLORA_SDK=y
32+
BR2_PACKAGE_CA_CERTIFICATES=y
3133
BR2_PACKAGE_WPEFRAMEWORK_PORT="2300"
3234
BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH="/UserApps/metrological/usr/share/WPEFramework"
3335
BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH="/UserApps/metrological/usr/lib/wpeframework/plugins"
3436
BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH="/UserApps/metrological/usr/lib/wpeframework/proxystubs"
37+
BR2_PACKAGE_WPEFRAMEWORK_UMASK="000"
38+
BR2_PACKAGE_WPEFRAMEWORK_GROUP="thunder"
3539
BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PREFIX="MCA"
3640
BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS=y
3741
# BR2_PACKAGE_WPEFRAMEWORK_CDMI_SOFTWARE_OVERRIDE is not set
@@ -61,7 +65,7 @@ BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER=y
6165
BR2_PACKAGE_WPEFRAMEWORK_AMAZON_MANUFACTURER="Commscope"
6266
BR2_PACKAGE_WPEFRAMEWORK_AMAZON_FRAGMENT_CACHE_SIZE="100"
6367
BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER="amazon"
64-
BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP="amazon"
68+
BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP="thunder"
6569
BR2_PACKAGE_WPEFRAMEWORK_APPS=y
6670
BR2_PACKAGE_WPEFRAMEWORK_UX=y
6771
BR2_PACKAGE_WPEFRAMEWORK_WEBSERVER=y

‎docs/manual/adding-packages-cmake.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ typical packages will therefore only use a few of them.
100100
necessary to set them in the package's +*.mk+ file unless you want
101101
to override them:
102102

103-
** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_DEBUG+;
103+
** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_RUNTIME_DEBUG+;
104104
** +CMAKE_INSTALL_PREFIX+;
105105
** +BUILD_SHARED_LIBS+ is driven by +BR2_STATIC_LIBS+;
106106
** +BUILD_DOC+, +BUILD_DOCS+ are disabled;

‎docs/manual/adding-packages-meson.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,15 @@ will therefore only use a few of them.
116116
single quotes. By default, empty. Note that Buildroot already sets the
117117
correct values for +c+, +cpp+, +ar+, +strip+, and +pkgconfig+.
118118

119+
* +FOO_MESON_EXTRA_PROPERTIES+, to specify a space-separated list of
120+
properties to add to the `[properties]` section of the meson
121+
`cross-compilation.conf` configuration file. The format is
122+
`property-name=<value>` with no space around the +=+ sign, and with
123+
single quotes around string values. By default, empty. Note that
124+
Buildroot already sets values for +needs_exe_wrapper+, +c_args+,
125+
+c_link_args+, +cpp_args+, +cpp_link_args+, +sys_root+, and
126+
+pkg_config_libdir+.
127+
119128
* +FOO_NINJA_ENV+, to specify additional environment variables to pass to
120129
+ninja+, meson companion tool in charge of the build operations. By default,
121130
empty.

‎package/Config.in‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ menu "Debugging, profiling and benchmark"
9595
source "package/blktrace/Config.in"
9696
source "package/bonnie/Config.in"
9797
source "package/cache-calibrator/Config.in"
98+
source "package/ccspcommonlibrary/Config.in"
99+
source "package/cimplog/Config.in"
98100
source "package/clinfo/Config.in"
99101
source "package/dacapo/Config.in"
100102
source "package/dhrystone/Config.in"
@@ -115,6 +117,7 @@ menu "Debugging, profiling and benchmark"
115117
source "package/kvm-unit-tests/Config.in"
116118
source "package/kyua/Config.in"
117119
source "package/latencytop/Config.in"
120+
source "package/libparodus/Config.in"
118121
source "package/lmbench/Config.in"
119122
source "package/lsof/Config.in"
120123
source "package/ltp-testsuite/Config.in"
@@ -124,10 +127,15 @@ menu "Debugging, profiling and benchmark"
124127
source "package/lttng-tools/Config.in"
125128
source "package/mcelog/Config.in"
126129
source "package/memstat/Config.in"
130+
source "package/msgpack-c/Config.in"
131+
source "package/nanomsg/Config.in"
127132
source "package/netperf/Config.in"
128133
source "package/netsniff-ng/Config.in"
129134
source "package/nmon/Config.in"
135+
source "package/nopoll/Config.in"
130136
source "package/oprofile/Config.in"
137+
source "package/parodus/Config.in"
138+
source "package/parodus2ccsp/Config.in"
131139
source "package/pax-utils/Config.in"
132140
source "package/pcm-tools/Config.in"
133141
source "package/piglit/Config.in"
@@ -147,10 +155,14 @@ menu "Debugging, profiling and benchmark"
147155
source "package/tinymembench/Config.in"
148156
source "package/trace-cmd/Config.in"
149157
source "package/trinity/Config.in"
158+
source "package/trower-base64/Config.in"
150159
source "package/uclibc-ng-test/Config.in"
160+
source "package/ucresolv/Config.in"
151161
source "package/valgrind/Config.in"
152162
source "package/vmtouch/Config.in"
163+
source "package/wdmp-c/Config.in"
153164
source "package/whetstone/Config.in"
165+
source "package/wrp-c/Config.in"
154166
endmenu
155167

156168
menu "Development tools"
@@ -1554,6 +1566,7 @@ endmenu
15541566
menu "JSON/XML"
15551567
source "package/benejson/Config.in"
15561568
source "package/cjson/Config.in"
1569+
source "package/cjwt/Config.in"
15571570
source "package/expat/Config.in"
15581571
source "package/ezxml/Config.in"
15591572
source "package/jansson/Config.in"

‎package/amazon-backend/amazon-backend.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
AMAZON_BACKEND_VERSION = 1a3ad731e92abb983777547287b4169b9be0b8b4
7+
AMAZON_BACKEND_VERSION = 4157d63753756cb3d2403f30513dc533a8d33758
88
AMAZON_BACKEND_SITE = [email protected]:Metrological/amazon-backend.git
99
AMAZON_BACKEND_SITE_METHOD = git
1010
AMAZON_BACKEND_DEPENDENCIES = wpeframework wpeframework-clientlibraries

‎package/ccspcommonlibrary/0001-openssl-usage-based-on-version.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/source/util_api/ansc/AnscPlatform/user_openssl.c b/source/util_api/ansc/AnscPlatform/user_openssl.c
2+
index ec0f962b..f998278d 100644
3+
--- a/source/util_api/ansc/AnscPlatform/user_openssl.c
4+
+++ b/source/util_api/ansc/AnscPlatform/user_openssl.c
5+
@@ -68,8 +68,10 @@ void initialize_openssl_lib()
6+
7+
SSL_library_init ();
8+
SSL_load_error_strings ();
9+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
10+
SSLeay_add_all_algorithms ();
11+
SSLeay_add_ssl_algorithms ();
12+
+#endif
13+
}
14+
15+
16+
@@ -402,7 +404,7 @@ SSL * openssl_connect (int fd)
17+
18+
SSL_set_connect_state (ssl);
19+
20+
- if (SSL_connect (ssl) <= 0 || ssl->state != SSL_ST_OK)
21+
+ if (SSL_connect (ssl) <= 0)
22+
{
23+
AnscTraceWarning(("openssl_connect - failed in SSL_set_connect_state \n"));
24+
goto error;

‎package/ccspcommonlibrary/Config.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
config BR2_PACKAGE_CCSPCOMMONLIBRARY
2+
bool "CCSP Common Library"
3+
default n
4+
select BR2_PACKAGE_DBUS
5+
help
6+
Ccsp common library

‎package/ccspcommonlibrary/ccspcommonlibrary.mk‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
################################################################################
2+
#
3+
# ccspcommonlibrary
4+
#
5+
################################################################################
6+
7+
CCSPCOMMONLIBRARY_VERSION = a3117b5c45532a24507557886910cdaa9d0c411c
8+
CCSPCOMMONLIBRARY_SITE_METHOD = git
9+
CCSPCOMMONLIBRARY_SITE = https://github.com/rdkcmf/rdkb-CcspCommonLibrary.git
10+
CCSPCOMMONLIBRARY_INSTALL_STAGING = YES
11+
CCSPCOMMONLIBRARY_AUTORECONF = YES
12+
CCSPCOMMONLIBRARY_DEPENDENCIES = dbus
13+
14+
define CCSPCOMMONLIBRARY_FIXUP_M4_DIR
15+
mkdir $(@D)/m4
16+
endef
17+
CCSPCOMMONLIBRARY_POST_EXTRACT_HOOKS += CCSPCOMMONLIBRARY_FIXUP_M4_DIR
18+
19+
CCSPCOMMONLIBRARY_CONF_OPTS = \
20+
--prefix=/usr/ \
21+
--includedir=${STAGING_DIR}/usr/include \
22+
--libdir=${STAGING_DIR}/usr/lib \
23+
--bindir=${STAGING_DIR}/usr/bin \
24+
--docdir=${STAGING_DIR}/usr/share/doc \
25+
${CUSTOM_HOST}
26+
27+
CCSPCOMMONLIBRARY_CONF_ENV += CPPFLAGS="$(TARGET_CXXFLAGS) -I${STAGING_DIR}/usr/include/dbus-1.0 -I${STAGING_DIR}/usr/lib/dbus-1.0/include"
28+
29+
30+
define CCSPCOMMONLIBRARY_INSTALL_STAGING_CMDS
31+
cp -ar $(@D)/.libs/libccsp_common.so* $(STAGING_DIR)/usr/lib
32+
mkdir -p ${STAGING_DIR}/usr/include/ccsp
33+
cp -ar $(@D)/source/debug_api/include/* ${STAGING_DIR}/usr/include/ccsp
34+
cp -ar $(@D)/source/util_api/ansc/include/* ${STAGING_DIR}/usr/include/ccsp
35+
cp -ar $(@D)/source/util_api/asn.1/include/* ${STAGING_DIR}/usr/include/ccsp
36+
cp -ar $(@D)/source/util_api/http/include/* ${STAGING_DIR}/usr/include/ccsp
37+
cp -ar $(@D)/source/util_api/stun/include/* ${STAGING_DIR}/usr/include/ccsp
38+
cp -ar $(@D)/source/util_api/tls/include/* ${STAGING_DIR}/usr/include/ccsp
39+
cp -ar $(@D)/source/util_api/web/include/* ${STAGING_DIR}/usr/include/ccsp
40+
cp -ar $(@D)/source/cosa/include/* ${STAGING_DIR}/usr/include/ccsp
41+
cp -ar $(@D)/source/cosa/package/slap/include/* ${STAGING_DIR}/usr/include/ccsp
42+
cp -ar $(@D)/source/cosa/package/system/include/* ${STAGING_DIR}/usr/include/ccsp
43+
cp -ar $(@D)/source/ccsp/include/* ${STAGING_DIR}/usr/include/ccsp
44+
cp -ar $(@D)/source/ccsp/custom/* ${STAGING_DIR}/usr/include/ccsp
45+
cp -ar $(@D)/source/ccsp/components/include/* ${STAGING_DIR}/usr/include/ccsp
46+
cp -ar $(@D)/source/ccsp/components/common/MessageBusHelper/include/* ${STAGING_DIR}/usr/include/ccsp
47+
cp $(@D)/source/util_api/slap/components/SlapVarConverter/slap_vco_global.h ${STAGING_DIR}/usr/include/ccsp
48+
cp $(@D)/source/ccsp/components/common/PoamIrepFolder/poam_irepfo_exported_api.h ${STAGING_DIR}/usr/include/ccsp
49+
cp $(@D)/source/ccsp/components/common/PoamIrepFolder/poam_irepfo_global.h ${STAGING_DIR}/usr/include/ccsp
50+
cp $(@D)/source/ccsp/components/common/PoamIrepFolder/poam_irepfo_interface.h ${STAGING_DIR}/usr/include/ccsp
51+
cp $(@D)/source/ccsp/components/common/PoamIrepFolder/poam_irepfo_internal_api.h ${STAGING_DIR}/usr/include/ccsp
52+
endef
53+
54+
define CCSPCOMMONLIBRARY_INSTALL_TARGET_CMDS
55+
cp -ar $(@D)/.libs/libccsp_common.so* $(TARGET_DIR)/usr/lib
56+
mkdir -p ${TARGET_DIR}/usr/share/ccspcommonlibrary
57+
cp $(@D)/config/ccsp_msg.cfg ${TARGET_DIR}/usr/share/ccspcommonlibrary
58+
endef
59+
$(eval $(autotools-package))

‎package/cimplog/Config.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
config BR2_PACKAGE_CIMPLOG
2+
bool "cimplog"
3+
default n
4+
help
5+
Simple logging library

0 commit comments

Comments
 (0)