diff options
Diffstat (limited to 'meta-openembedded/meta-networking')
5 files changed, 59 insertions, 4 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch new file mode 100644 index 0000000000..a52821915e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch @@ -0,0 +1,49 @@ +From 37f24a9bd62f0a8f3e37eaddd33f2f0c9d3aaa0a Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Fri, 1 Apr 2022 23:12:17 -0700 +Subject: [PATCH] meson: add pythoninstalldir option + +In case of cross build, using host python to determine the python +site-packages directory for target is not feasible, add a new option +pythoninstalldir to fix the issue. + +Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/1699] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + meson.build | 7 ++++++- + meson_options.txt | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bc990cd..a37aacd 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,12 @@ pkgdatadir = join_paths([prefix, get_option('datadir'), package_name]) + bindir = join_paths([prefix, get_option('bindir')]) + libexecdir = join_paths([prefix, get_option('libexecdir')]) + schemadir = join_paths([datadir, 'glib-2.0', 'schemas']) +-pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) ++pythoninstalldir = get_option('pythoninstalldir') ++if pythoninstalldir != '' ++ pythondir = join_paths([prefix, pythoninstalldir]) ++else ++ pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) ++endif + + if get_option('policykit') + have_polkit = 'True' +diff --git a/meson_options.txt b/meson_options.txt +index b3e939f..96acbbc 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -5,5 +5,6 @@ option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAud + option('appindicator', type: 'boolean', value: true, description: 'Enable Libappindicator support') + option('systemdsystemunitdir', type: 'string', description: 'Path to systemd system unit dir relative to ${prefix}') + option('systemduserunitdir', type: 'string', description: 'Path to systemd user unit dir relative to ${prefix}') ++option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}') + option('sendto-plugins', type: 'array', choices: ['Caja', 'Nemo', 'Nautilus'], value: ['Caja', 'Nemo', 'Nautilus'], description: 'Install sendto plugins for various filemanagers') + option('thunar-sendto', type: 'boolean', value: true, description: 'Install Thunar sendto plugin') +-- +2.33.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb index ea06ee67f7..d5aeceeb42 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb @@ -10,10 +10,11 @@ SRC_URI = " \ https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ file://0001-Search-for-cython3.patch \ file://0002-fix-fail-to-enable-bluetooth.patch \ + file://0001-meson-add-pythoninstalldir-option.patch \ " SRC_URI[sha256sum] = "55d639feeda0b43b18a659e65985213a54b47dcb1348f3b4effb5238db242602" -EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false" +EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false -Dpythoninstalldir=${@noprefix('PYTHON_SITEPACKAGES_DIR', d)}" SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb index dc6e4b5e16..3da397f5c7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb @@ -340,3 +340,8 @@ RDEPENDS:${PN}-test = "\ " ALLOW_EMPTY:${PN}-test = "1" + +# Patch for CVE-2018-1050 is applied in version 4.5.15, 4.6.13, 4.7.5. +# Patch for CVE-2018-1057 is applied in version 4.3.13, 4.4.16. +CVE_CHECK_IGNORE += "CVE-2018-1050" +CVE_CHECK_IGNORE += "CVE-2018-1057" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init index 51c95dfedd..43c286f9c7 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init @@ -16,7 +16,7 @@ fi DNSMASQ_CONF="/etc/dnsmasq.conf" test "/etc/dnsmasq.d/*" != '/etc/dnsmasq.d/*' && DNSMASQ_CONF="${DNSMASQ_CONF} /etc/dnsmasq.d/*" -test -z "${PIDFILE}" && PIFILE="/run/dnsmasq.pid" +test -z "${PIDFILE}" && PIDFILE="/run/dnsmasq.pid" if [ -z "$IGNORE_RESOLVCONF" ] then diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb index a3e090fbd5..1c3545f960 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb @@ -17,9 +17,9 @@ for better management of and seamless user interactions with guests.\ " SECTION = "vmware-tools" -LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD & CDDL-1.0" +LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD-2-Clause & CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" -LICENSE:modules/freebsd/vmblock = "BSD" +LICENSE:modules/freebsd/vmblock = "BSD-2-Clause" LICENSE:modules/freebsd/vmmemctl = "GPL-2.0-only" LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" LICENSE:modules/linux = "GPL-2.0-only" |