diff options
Diffstat (limited to 'meta-agl-core/recipes-connectivity')
13 files changed, 197 insertions, 0 deletions
diff --git a/meta-agl-core/recipes-connectivity/busybox/busybox_%.bbappend b/meta-agl-core/recipes-connectivity/busybox/busybox_%.bbappend new file mode 100644 index 000000000..980783236 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/busybox/busybox_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', '${BPN}_aglcore.inc', '', d)} diff --git a/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc b/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc new file mode 100644 index 000000000..88ff7daec --- /dev/null +++ b/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append = " file://enable-wget-https.cfg" + diff --git a/meta-agl-core/recipes-connectivity/busybox/files/enable-wget-https.cfg b/meta-agl-core/recipes-connectivity/busybox/files/enable-wget-https.cfg new file mode 100644 index 000000000..e92006bef --- /dev/null +++ b/meta-agl-core/recipes-connectivity/busybox/files/enable-wget-https.cfg @@ -0,0 +1,3 @@ +# Thu Jun 8 17:32:07 2017 +CONFIG_FEATURE_WGET_OPENSSL=y +CONFIG_FEATURE_WGET_SSL_HELPER=y diff --git a/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses/0001-Do-not-overwrite-CFLAGS.patch b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses/0001-Do-not-overwrite-CFLAGS.patch new file mode 100644 index 000000000..4a86e6c57 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses/0001-Do-not-overwrite-CFLAGS.patch @@ -0,0 +1,37 @@ +From 50ca6e010c3ca3f7cb06dfdf5dbdfaacd4f4749a Mon Sep 17 00:00:00 2001 +From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> +Date: Tue, 19 Jul 2022 23:28:21 +0200 +Subject: [PATCH] Do not overwrite CFLAGS + +Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7e3307f..c385bc0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,14 +24,14 @@ AC_PROG_CC + AC_PROG_CC_C99 + AM_PROG_CC_C_O + +-CFLAGS="" +- +-AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], +- [disable code optimization through compiler]), [ +- if (test "${enableval}" = "no"); then +- CFLAGS="$CFLAGS -O0 -U_FORTIFY_SOURCE" +- fi +-]) ++#CFLAGS="" ++# ++#AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], ++# [disable code optimization through compiler]), [ ++# if (test "${enableval}" = "no"); then ++# CFLAGS="$CFLAGS -O0 -U_FORTIFY_SOURCE" ++# fi ++#]) + + AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], + [enable compiling with debugging information]), [ diff --git a/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses/0001-Initialize-variables.patch b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses/0001-Initialize-variables.patch new file mode 100644 index 000000000..9a1078426 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses/0001-Initialize-variables.patch @@ -0,0 +1,39 @@ +From 0389a80796d3ae31d8f60659f0638660a00157b2 Mon Sep 17 00:00:00 2001 +From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> +Date: Tue, 19 Jul 2022 23:58:05 +0200 +Subject: [PATCH] Initialize variables + +This fixes compiler warnings. + +Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> +--- + main.c | 2 +- + renderers.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/main.c b/main.c +index f0354f9..1fa9ab1 100644 +--- a/main.c ++++ b/main.c +@@ -159,7 +159,7 @@ static void report_error() + */ + static void get_help_window() + { +- char *msg; ++ char *msg = ""; + + if (win_help) + return; +diff --git a/renderers.c b/renderers.c +index c531a1e..d9d0414 100644 +--- a/renderers.c ++++ b/renderers.c +@@ -153,7 +153,7 @@ static void renderers_technologies(struct json_object *jobj) + int i; + char *desc_base = "%-20s Powered %-5s Connected %-5s"; + char desc_base_sub[30]; +- const char *k_name, *k_type, *k_powered, *k_connected; ++ const char *k_name = "" , *k_type = "" , *k_powered = "", *k_connected = ""; + char *desc, *tech_short_name; + struct json_object *sub_array, *dbus_tech_name, *tech_dict; + struct userptr_data *data; diff --git a/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses/stdbool-fixes.patch b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses/stdbool-fixes.patch new file mode 100644 index 000000000..4e858e3c4 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses/stdbool-fixes.patch @@ -0,0 +1,53 @@ +Replace some TRUE/FALSE usage with stdbool.h definitions + +Newer versions of json-c dropped its previous #defines for TRUE and +FALSE, update affected code to use the stdbool.h boolean definitions +to fix compilation. + +Upstream-Status: Pending +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +--- +diff --git a/json_regex.c b/json_regex.c +index 2524c18..cdb6801 100644 +--- a/json_regex.c ++++ b/json_regex.c +@@ -24,6 +24,7 @@ + #endif + + #include <json.h> ++#include <stdbool.h> + + #include "json_regex.h" + #include "keys.h" +@@ -64,7 +65,7 @@ void generate_trusted_json(void) + json_object_object_add(jregex_agent_response, "Username", json_object_new_string("^([[:print:]]*)$")); + json_object_object_add(jregex_agent_response, "Password", json_object_new_string("^([[:print:]]*)$")); + +- jregex_agent_retry_response = json_object_new_boolean(TRUE); ++ jregex_agent_retry_response = json_object_new_boolean(true); + + // See commands.c __cmd_config_service for a better idea of the format. + jregex_config_service = json_object_new_object(); +@@ -94,7 +95,7 @@ void generate_trusted_json(void) + json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$")); + json_object_object_add(tmp, key_serv_proxy_excludes, arr); + json_object_object_add(opt, key_serv_proxy_config, tmp); +- json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(TRUE)); ++ json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(true)); + arr = json_object_new_array(); + json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$")); + json_object_object_add(opt, key_serv_domains_config, arr); +diff --git a/json_utils.c b/json_utils.c +index f66d08a..8f2c195 100644 +--- a/json_utils.c ++++ b/json_utils.c +@@ -83,7 +83,7 @@ static bool json_match_object(struct json_object *jobj, + key_is_trusted = json_object_object_get_ex(jtrusted, key, + &tmp_trusted); + +- if (key_is_trusted == FALSE) ++ if (key_is_trusted == false) + return false; + + res = __json_type_dispatch(val, tmp_trusted); diff --git a/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb new file mode 100644 index 000000000..7b6d50531 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb @@ -0,0 +1,30 @@ +SUMMARY = "A simple ncurses interface for connman" +DESCRIPTION = "A simple ncurses interface for connman" +HOMEPAGE = "https://gitlab.com/iotbzh/connman-json-client" + +SECTION = "console/network" + +DEPENDS = "dbus ncurses connman json-c" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" + +SRC_URI = "git://gitlab.com/iotbzh/connman-json-client.git;protocol=https;branch=master \ + file://stdbool-fixes.patch \ + file://0001-Do-not-overwrite-CFLAGS.patch \ + file://0001-Initialize-variables.patch \ + " +SRCREV = "2b0f93ec9518c978c04807fe52e95315d6d80e6b" + +inherit autotools pkgconfig + +EXTRA_AUTORECONF += " -vfi" + +S = "${WORKDIR}/git" + +do_install () { + install -dm755 ${D}${bindir} + install -Dm755 connman_ncurses ${D}${bindir} +} + +FILES:${PN} = "${bindir}/connman_ncurses" diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend b/meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend new file mode 100644 index 000000000..bd6e7b75c --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'connman-conf_aglcore.inc', '', d)} diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf new file mode 100644 index 000000000..be9fd0ed2 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf @@ -0,0 +1,3 @@ +[General] +FallbackTimeservers=pool.ntp.org +NetworkInterfaceBlacklist=vmnet,vboxnet,virbr,tap,ifb,meth diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc new file mode 100644 index 000000000..30a250e1e --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc @@ -0,0 +1,9 @@ +# Pick up our version of main.conf +FILESEXTRAPATHS:prepend := "${THISDIR}/connman-conf:" + +# Upstream connman-conf only installs configuration for qemu targets +# but we need it in all our BSP +do_install:append() { + mkdir -p ${D}${sysconfdir}/connman + cp ${S}/main.conf ${D}${sysconfdir}/connman/main.conf +} diff --git a/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch b/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch new file mode 100644 index 000000000..7cc92e2c4 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch @@ -0,0 +1,14 @@ +Exempt when nfs is in use. + +Upstream-Status: Pending + +--- connman-1.36.orig/src/connman.service.in 2019-02-18 18:02:07.034947373 -0500 ++++ connman-1.36/src/connman.service.in 2019-02-18 18:07:24.689959219 -0500 +@@ -7,6 +7,7 @@ + Before=network.target multi-user.target shutdown.target + Wants=network.target + Conflicts=systemd-resolved.service ++ConditionKernelCommandLine=!root=/dev/nfs + + [Service] + Type=dbus diff --git a/meta-agl-core/recipes-connectivity/connman/connman_%.bbappend b/meta-agl-core/recipes-connectivity/connman/connman_%.bbappend new file mode 100644 index 000000000..8078f3d34 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'connman_aglcore.inc', '', d)} diff --git a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc new file mode 100644 index 000000000..e372e9186 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/connman:" + +SRC_URI += "file://0001-disable-when-booting-over-nfs.patch" |