diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-21 15:11:42 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-21 15:11:49 +0300 |
| commit | 6a62e0e0f4642841f3956fe2977f9d57766c2f2b (patch) | |
| tree | c158ee7227dd3b9137b3bad7f84358258868b5a9 | |
| parent | 87ad221ffb3753e69264f664dcfc4f8a2e3d9081 (diff) | |
| download | openbmc-6a62e0e0f4642841f3956fe2977f9d57766c2f2b.tar.xz | |
meta-openembedded: subtree update:1bfaa2e63a..64224b92e5
Adrian Bunk (1):
networkmanager: Upgrade 1.18.2 -> 1.18.4
Alistair Francis (5):
mycroft: Bump to 19.8.1
mycroft: Run the files from /var
python3-monotonic: Initial commit of version 1.5
python3-msk: Initial commit of version 0.3.13
python3-google-api-python-client: Initial commit of 1.7.11
Andreas Müller (3):
exiv2: initial add 0.27.1
menulibre: upgrade 2.2.0 -> 2.2.1
libmbim: upgrade 1.18.0 -> 1.20.0
Callaghan, Dan (1):
strongswan: add a PACKAGECONFIG for libbfd stack traces
Changqing Li (1):
kea: fix kea-dhcp4.service/kea-dhcp6.service start up failed
Christophe PRIOUZEAU (14):
xfce4-mpc-plugin: Clarify BSD license variant
xfce4-diskperf-plugin: Clarify BSD license variant
xfce4-wavelan-plugin: Clarify BSD license variant
libmpdclient: Clarify BSD license variant
tremor: Clarify BSD license variant
xscreensaver: Clarify BSD license variant
openjpeg: Clarify BSD license variant
sdparm: Clarify BSD license variant
onig: Clarify BSD license variant
libssh2: Clarify BSD license variant
libsmi: Clarify BSD license variant
libinih: Clarify BSD license variant
gperftools: Clarify BSD license variant
daemonize: Clarify BSD license variant
Fabio Berton (1):
ifplugd: Add recipe for version 0.28
George Kiagiadakis (1):
pipewire: Initial add of 0.2.7
Hongxu Jia (1):
lvm2/libdevmapper: 2.03.02 -> 2.03.05
Khem Raj (4):
wvstreams,wvdial: Mark incompatible for musl
pidgin-sipe: Upgrade to 1.25.0
dconf: Upgrade to 0.34.0
libsmi: Fix and operator per SPDX
Martin Siegumfeldt (3):
Revert "libiio: fix build of python bindins"
libiio: allow python3 bindings to be built
libiio: bump to version 0.18+
Stefan Wiehler (1):
nvme-cli: defer host ID generation to post installation
Tekkub (1):
nlohmann-fifo: Add recipe
Trevor Gamblin (2):
rsyslog: fix CVE-2019-17041
quagga: fix PIDFile path for service files
Yi Zhao (2):
freeradius: fix CVE-2019-10143
ipvsadm: install initscript to /etc/init.d
Zang Ruochen (9):
python-paste: upgrade 3.2.1 -> 3.2.2
python-pip: upgrade 19.2.3 -> 19.3
python-pyasn1-modules: upgrade 0.2.6 -> 0.2.7
python-pytest: upgrade 5.1.3 -> 5.2.1
python-pytz: upgrade 2019.2 -> 2019.3
python-xxhash: upgrade 1.4.1 -> 1.4.2
python-cffi: upgrade 1.12.3 -> 1.13.0
python-jsonschema: upgrade 3.0.2 -> 3.1.1
protobuf: upgrade 3.9.2 -> 3.10.0
Change-Id: I72806dd6bfe6427787917f687d058c6ced02a00c
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
85 files changed, 951 insertions, 457 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb index 8d1bbdfd1..a1996a1a3 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb @@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" -SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a" -SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab" +SRC_URI[archive.md5sum] = "a3ab18ed51a0494a1c8436fef20cc1b0" +SRC_URI[archive.sha256sum] = "943a94ab16121de5580ceaed2605b87444d1bca1c6cd8beefb778bcb0aa2da52" DEPENDS = "dbus glib-2.0 intltool-native" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb index 455e76fcb..235e63e48 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb @@ -1,5 +1,5 @@ SUMMARY = "C client library for the Music Player Daemon" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=06b9dfd2f197dc514d8ef06549684b77" HOMEPAGE = "https://www.musicpd.org/libs/libmpdclient/" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch index c03bccd3d..43994e0ca 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch @@ -1,4 +1,4 @@ -From 6272f36080bd440a5825b526f4c06223c5bb9fbb Mon Sep 17 00:00:00 2001 +From 07fce2101d83b5334de78e661ba0361c2874ebdf Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Mon, 18 Mar 2019 16:30:45 -0700 Subject: [PATCH 1/5] Remove python venv @@ -9,75 +9,77 @@ python and pip pacakges. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Upstream-Status: Inappropriate [embedded specific] --- - dev_setup.sh | 36 ------------------------------------ + dev_setup.sh | 39 --------------------------------------- start-mycroft.sh | 13 ------------- venv-activate.sh | 44 +------------------------------------------- - 3 files changed, 1 insertion(+), 92 deletions(-) + 3 files changed, 1 insertion(+), 95 deletions(-) diff --git a/dev_setup.sh b/dev_setup.sh -index e0b07bf25cf..aed54b2167a 100755 +index cf81ed25f0f..99a44bfd8a7 100755 --- a/dev_setup.sh +++ b/dev_setup.sh -@@ -310,18 +310,6 @@ function install_deps() { +@@ -338,18 +338,6 @@ ${YELLOW}Make sure to manually install:$BLUE git python3 python-setuptools pytho fi } -VIRTUALENV_ROOT=${VIRTUALENV_ROOT:-"${TOP}/.venv"} - -function install_venv() { -- ${opt_python} -m venv "${VIRTUALENV_ROOT}/" --without-pip +- $opt_python -m venv "${VIRTUALENV_ROOT}/" --without-pip - # Force version of pip for reproducability, but there is nothing special - # about this version. Update whenever a new version is released and - # verified functional. - curl https://bootstrap.pypa.io/3.3/get-pip.py | "${VIRTUALENV_ROOT}/bin/python" - 'pip==18.0.0' - # Function status depending on if pip exists -- [ -x "${VIRTUALENV_ROOT}/bin/pip" ] +- [[ -x ${VIRTUALENV_ROOT}/bin/pip ]] -} - install_deps # Configure to use the standard commit template for -@@ -355,15 +343,7 @@ else +@@ -383,17 +371,6 @@ else fi fi --if [ ! -x "${VIRTUALENV_ROOT}/bin/activate" ] ; then +-if [[ ! -x ${VIRTUALENV_ROOT}/bin/activate ]] ; then - if ! install_venv ; then -- echo "Failed to set up virtualenv for mycroft, exiting setup." +- echo 'Failed to set up virtualenv for mycroft, exiting setup.' - exit 1 - fi -fi - - # Start the virtual environment +-# Start the virtual environment -source "${VIRTUALENV_ROOT}/bin/activate" - cd "${TOP}" - +-cd "$TOP" +- # Install pep8 pre-commit hook -@@ -380,22 +360,6 @@ fi + HOOK_FILE='./.git/hooks/pre-commit' + if [[ -n $INSTALL_PRECOMMIT_HOOK ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then +@@ -408,22 +385,6 @@ fi - PYTHON=$( python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" ) + PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") -# Add mycroft-core to the virtualenv path -# (This is equivalent to typing 'add2virtualenv $TOP', except -# you can't invoke that shell function from inside a script) -VENV_PATH_FILE="${VIRTUALENV_ROOT}/lib/$PYTHON/site-packages/_virtualenv_path_extensions.pth" --if [ ! -f "$VENV_PATH_FILE" ] ; then -- echo "import sys; sys.__plen = len(sys.path)" > "$VENV_PATH_FILE" || return 1 +-if [[ ! -f $VENV_PATH_FILE ]] ; then +- echo 'import sys; sys.__plen = len(sys.path)' > "$VENV_PATH_FILE" || return 1 - echo "import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)" >> "$VENV_PATH_FILE" || return 1 -fi - -if ! grep -q "$TOP" $VENV_PATH_FILE ; then -- echo "Adding mycroft-core to virtualenv path" +- echo 'Adding mycroft-core to virtualenv path' - sed -i.tmp '1 a\ -'"$TOP"' --' "${VENV_PATH_FILE}" +-' "$VENV_PATH_FILE" -fi - # install required python modules if ! pip install -r requirements.txt ; then - echo "Warning: Failed to install all requirements. Continue? y/N" + echo 'Warning: Failed to install all requirements. Continue? y/N' diff --git a/start-mycroft.sh b/start-mycroft.sh -index b9514a61ba5..64e0216a62f 100755 +index 0f88430982e..3aed2f189d4 100755 --- a/start-mycroft.sh +++ b/start-mycroft.sh @@ -20,7 +20,6 @@ script=${0} @@ -130,7 +132,7 @@ index b9514a61ba5..64e0216a62f 100755 "sdkdoc") - source-venv cd doc - make ${opt} + make ${_params} cd .. diff --git a/venv-activate.sh b/venv-activate.sh index d1e7bcb44e7..10b46d4de3b 100644 @@ -188,5 +190,5 @@ index d1e7bcb44e7..10b46d4de3b 100644 main $@ -- -2.21.0 +2.23.0 diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch new file mode 100644 index 000000000..dd2431fdf --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch @@ -0,0 +1,48 @@ +From 88696037af52d6a7f57bc0fb82598de1a25365cc Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Fri, 29 Mar 2019 16:09:57 -0700 +Subject: [PATCH 2/5] dev_setup.sh: Remove the git dependency + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [embedded specific] +--- + dev_setup.sh | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/dev_setup.sh b/dev_setup.sh +index 99a44bfd8a7..672b27080c2 100755 +--- a/dev_setup.sh ++++ b/dev_setup.sh +@@ -340,10 +340,6 @@ ${YELLOW}Make sure to manually install:$BLUE git python3 python-setuptools pytho + + install_deps + +-# Configure to use the standard commit template for +-# this repo only. +-git config commit.template .gitmessage +- + # Check whether to build mimic (it takes a really long time!) + build_mimic='n' + if [[ $opt_forcemimicbuild == true ]] ; then +@@ -371,18 +367,6 @@ else + fi + fi + +-# Install pep8 pre-commit hook +-HOOK_FILE='./.git/hooks/pre-commit' +-if [[ -n $INSTALL_PRECOMMIT_HOOK ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then +- if [[ ! -f $HOOK_FILE ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then +- echo 'Installing PEP8 check as precommit-hook' +- echo "#! $(which python)" > $HOOK_FILE +- echo '# MYCROFT DEV SETUP' >> $HOOK_FILE +- cat ./scripts/pre-commit >> $HOOK_FILE +- chmod +x $HOOK_FILE +- fi +-fi +- + PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") + + # install required python modules +-- +2.23.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-pip-requirements-Remove-ones-installed-by-OE.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-pip-requirements-Remove-ones-installed-by-OE.patch deleted file mode 100644 index ca79d00b4..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-pip-requirements-Remove-ones-installed-by-OE.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 142bc3912ea9e1a4ecf4db0e2bec3049aa416464 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Tue, 19 Mar 2019 13:32:54 -0700 -Subject: [PATCH 2/5] pip requirements: Remove ones installed by OE - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Inappropriate [embedded specific] ---- - requirements.txt | 14 -------------- - test-requirements.txt | 1 - - 2 files changed, 15 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 7e4faf48182..29536e990ac 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,20 +1,10 @@ --six==1.10.0 --requests==2.20.0 - gTTS==2.0.3 - gTTS-token==1.1.3 --PyAudio==0.2.11 - pyee==5.0.0 - SpeechRecognition==3.8.1 --tornado==4.5.3 - websocket-client==0.54.0 - requests-futures==0.9.5 --pyalsaaudio==0.8.2 - xmlrunner==1.7.7 --pyserial==3.0 --psutil==5.2.1 --pocketsphinx==0.1.0 --inflection==0.3.1 --pillow==4.1.1 - python-dateutil==2.6.0 - pychromecast==0.7.7 - python-vlc==1.1.2 -@@ -26,10 +16,6 @@ msm==0.7.3 - msk==0.3.12 - adapt-parser==0.3.2 - padatious==0.4.6 --fann2==1.0.7 - padaos==0.1.9 - precise-runner==0.2.1 - petact==0.1.2 -- --# dev setup tools --pep8==1.7.0 -diff --git a/test-requirements.txt b/test-requirements.txt -index 8ada8157c95..eb4e364a9b4 100644 ---- a/test-requirements.txt -+++ b/test-requirements.txt -@@ -1,6 +1,5 @@ - pep8==1.7.0 - coveralls==1.5.0 --pytest==3.5.0 - pytest-cov==2.5.1 - cov-core==1.15.0 - mock==2.0.0 --- -2.21.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch new file mode 100644 index 000000000..a4290d1cd --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch @@ -0,0 +1,36 @@ +From 5ef52cdea278a1dff966a912549cb6708f2cb699 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Tue, 17 Sep 2019 11:31:47 -0700 +Subject: [PATCH 3/5] dev_setup.sh: Remove the TERM dependency + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +--- + dev_setup.sh | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/dev_setup.sh b/dev_setup.sh +index 672b27080c2..72f734f36bf 100755 +--- a/dev_setup.sh ++++ b/dev_setup.sh +@@ -115,18 +115,6 @@ function get_YN() { + done + } + +-# If tput is available and can handle multiple colors +-if found_exe tput ; then +- if [[ $(tput colors) != "-1" ]]; then +- GREEN=$(tput setaf 2) +- BLUE=$(tput setaf 4) +- CYAN=$(tput setaf 6) +- YELLOW=$(tput setaf 3) +- RESET=$(tput sgr0) +- HIGHLIGHT=$YELLOW +- fi +-fi +- + # Run a setup wizard the very first time that guides the user through some decisions + if [[ ! -f .dev_opts.json && -z $CI ]] ; then + echo " +-- +2.23.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Remove-the-git-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Remove-the-git-dependency.patch deleted file mode 100644 index b7ca16013..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Remove-the-git-dependency.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a480dde949f820fda6e46c13261883e851f5a430 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Fri, 29 Mar 2019 16:09:57 -0700 -Subject: [PATCH 4/5] dev_setup.sh: Remove the git dependency - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Inappropriate [embedded specific] ---- - dev_setup.sh | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/dev_setup.sh b/dev_setup.sh -index dd391181f19..c6aa783e1ef 100755 ---- a/dev_setup.sh -+++ b/dev_setup.sh -@@ -312,10 +312,6 @@ function install_deps() { - - install_deps - --# Configure to use the standard commit template for --# this repo only. --git config commit.template .gitmessage -- - # Check whether to build mimic (it takes a really long time!) - build_mimic="n" - if [[ ${opt_forcemimicbuild} == true ]] ; then -@@ -346,18 +342,6 @@ fi - # Start the virtual environment - cd "${TOP}" - --# Install pep8 pre-commit hook --if [ -z ${INSTALL_PRECOMMIT_HOOK} ] ; then -- HOOK_FILE="./.git/hooks/pre-commit" -- if [ ! -f ${HOOK_FILE} ] || grep -q "MYCROFT DEV SETUP" ${HOOK_FILE} ; then -- echo "Installing PEP8 check as precommit-hook" -- echo "#! $( which python3 )" > ${HOOK_FILE} -- echo "# MYCROFT DEV SETUP" >> ${HOOK_FILE} -- cat ./scripts/pre-commit >> ${HOOK_FILE} -- chmod +x ${HOOK_FILE} -- fi --fi -- - PYTHON=$( python3 -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" ) - - # install required python modules --- -2.21.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch new file mode 100644 index 000000000..3063e7f8d --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch @@ -0,0 +1,103 @@ +From ac749f2512e8d121e8a64a8d5e6f226f16735dda Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Tue, 19 Mar 2019 13:32:54 -0700 +Subject: [PATCH 4/5] pip requirements: Don't install requirements with pip + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [embedded specific] +--- + dev_setup.sh | 15 +-------------- + requirements.txt | 36 ------------------------------------ + test-requirements.txt | 7 ------- + 3 files changed, 1 insertion(+), 57 deletions(-) + delete mode 100644 requirements.txt + delete mode 100644 test-requirements.txt + +diff --git a/dev_setup.sh b/dev_setup.sh +index 72f734f36bf..b5ca6851631 100755 +--- a/dev_setup.sh ++++ b/dev_setup.sh +@@ -357,19 +357,6 @@ fi + + PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") + +-# install required python modules +-if ! pip install -r requirements.txt ; then +- echo 'Warning: Failed to install all requirements. Continue? y/N' +- read -n1 continue +- if [[ $continue != 'y' ]] ; then +- exit 1 +- fi +-fi +- +-if ! pip install -r test-requirements.txt ; then +- echo "Warning test requirements wasn't installed, Note: normal operation should still work fine..." +-fi +- + SYSMEM=$(free | awk '/^Mem:/ { print $2 }') + MAXCORES=$(($SYSMEM / 512000)) + MINCORES=1 +@@ -426,4 +413,4 @@ if [[ ! -w /var/log/mycroft/ ]] ; then + fi + + #Store a fingerprint of setup +-md5sum requirements.txt test-requirements.txt dev_setup.sh > .installed ++md5sum dev_setup.sh > .installed +diff --git a/requirements.txt b/requirements.txt +deleted file mode 100644 +index 0140d5465dc..00000000000 +--- a/requirements.txt ++++ /dev/null +@@ -1,36 +0,0 @@ +-six==1.10.0 +-cryptography==2.6.1 +-requests==2.20.0 +-gTTS==2.0.3 +-gTTS-token==1.1.3 +-PyAudio==0.2.11 +-pyee==5.0.0 +-SpeechRecognition==3.8.1 +-tornado==4.5.3 +-websocket-client==0.54.0 +-requests-futures==0.9.5 +-pyalsaaudio==0.8.2 +-xmlrunner==1.7.7 +-pyserial==3.0 +-psutil==5.2.1 +-pocketsphinx==0.1.0 +-inflection==0.3.1 +-pillow==4.1.1 +-python-dateutil==2.6.0 +-pychromecast==3.2.2 +-python-vlc==1.1.2 +-google-api-python-client==1.6.4 +-fasteners==0.14.1 +-PyYAML==3.13 +- +-msm==0.8.3 +-msk==0.3.13 +-adapt-parser==0.3.3 +-padatious==0.4.6 +-fann2==1.0.7 +-padaos==0.1.9 +-precise-runner==0.2.1 +-petact==0.1.2 +- +-# dev setup tools +-pep8==1.7.0 +diff --git a/test-requirements.txt b/test-requirements.txt +deleted file mode 100644 +index fd129e3f66d..00000000000 +--- a/test-requirements.txt ++++ /dev/null +@@ -1,7 +0,0 @@ +-pycodestyle===2.5.0 +-coveralls==1.5.0 +-pytest==3.5.0 +-pytest-cov==2.5.1 +-cov-core==1.15.0 +-sphinx==1.8.2 +-sphinx-rtd-theme==0.4.2 +-- +2.23.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-Use-python3-and-pip3-instead-of-python-and-pip.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-Use-python3-and-pip3-instead-of-python-and-pip.patch index a1f04b4b4..189b686c9 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-Use-python3-and-pip3-instead-of-python-and-pip.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-Use-python3-and-pip3-instead-of-python-and-pip.patch @@ -1,19 +1,19 @@ -From 87b94e54fefa1f83b41030444fc87b421c97b2c5 Mon Sep 17 00:00:00 2001 +From 9a0bd09706da3949db17ea7272d6647a487bb6ad Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Tue, 19 Mar 2019 13:38:44 -0700 -Subject: [PATCH 3/5] Use python3 and pip3 instead of python and pip +Subject: [PATCH 5/5] Use python3 and pip3 instead of python and pip Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Upstream-Status: Inappropriate [embedded specific] --- - bin/mycroft-cli-client | 2 +- - bin/mycroft-pip | 2 +- - bin/mycroft-say-to | 2 +- - bin/mycroft-skill-testrunner | 4 ++-- - bin/mycroft-speak | 2 +- - dev_setup.sh | 10 +++++----- - scripts/install-pocketsphinx.sh | 2 +- - 7 files changed, 12 insertions(+), 12 deletions(-) + bin/mycroft-cli-client | 2 +- + bin/mycroft-pip | 2 +- + bin/mycroft-say-to | 2 +- + bin/mycroft-skill-testrunner | 4 ++-- + bin/mycroft-speak | 2 +- + dev_setup.sh | 6 +++--- + scripts/install-pocketsphinx.sh | 2 +- + 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/mycroft-cli-client b/bin/mycroft-cli-client index f40a316e3f6..de2040d9e67 100755 @@ -38,15 +38,15 @@ index a42b16b847a..81bd5bfb3cf 100755 +pip3 $@ \ No newline at end of file diff --git a/bin/mycroft-say-to b/bin/mycroft-say-to -index 964e16eb0c5..5575969715c 100755 +index 4ae597f3062..8bb4039996d 100755 --- a/bin/mycroft-say-to +++ b/bin/mycroft-say-to -@@ -22,4 +22,4 @@ DIR="$( pwd )" - source "$DIR/../venv-activate.sh" -q +@@ -26,4 +26,4 @@ set -- "${1:-$(</dev/stdin)}" "${@:2}" # Send a message to be spoken --output=$(python -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$@\"], \"lang\": \"en-us\"}") -+output=$(python3 -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$@\"], \"lang\": \"en-us\"}") + data="$@" +-output=$(python -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$data\"], \"lang\": \"en-us\"}") ++output=$(python3 -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$data\"], \"lang\": \"en-us\"}") diff --git a/bin/mycroft-skill-testrunner b/bin/mycroft-skill-testrunner index 9699a4d138f..282f5ca65b0 100755 --- a/bin/mycroft-skill-testrunner @@ -63,60 +63,46 @@ index 9699a4d138f..282f5ca65b0 100755 fi \ No newline at end of file diff --git a/bin/mycroft-speak b/bin/mycroft-speak -index 51facf29189..c65556f1173 100755 +index d80f0e75b13..9448ea3400f 100755 --- a/bin/mycroft-speak +++ b/bin/mycroft-speak -@@ -22,4 +22,4 @@ DIR="$( pwd )" - source "$DIR/../venv-activate.sh" -q +@@ -24,4 +24,4 @@ source "$DIR/../venv-activate.sh" -q # Send a message to be spoken --output=$(python -m mycroft.messagebus.send "speak" "{\"utterance\": \"$@\"}") -\ No newline at end of file -+output=$(python3 -m mycroft.messagebus.send "speak" "{\"utterance\": \"$@\"}") -\ No newline at end of file + data="$@" +-output=$(python -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}") ++output=$(python3 -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}") diff --git a/dev_setup.sh b/dev_setup.sh -index aed54b2167a..dd391181f19 100755 +index b5ca6851631..fcd0834669f 100755 --- a/dev_setup.sh +++ b/dev_setup.sh -@@ -48,7 +48,7 @@ param="" +@@ -48,7 +48,7 @@ param='' for var in "$@" ; do # Check if parameter should be read -- if [[ ${param} == "python" ]] ; then -+ if [[ ${param} == "python3" ]] ; then - opt_python=${var} +- if [[ $param == 'python' ]] ; then ++ if [[ $param == 'python3' ]] ; then + opt_python=$var param="" continue -@@ -351,17 +351,17 @@ if [ -z ${INSTALL_PRECOMMIT_HOOK} ] ; then - HOOK_FILE="./.git/hooks/pre-commit" - if [ ! -f ${HOOK_FILE} ] || grep -q "MYCROFT DEV SETUP" ${HOOK_FILE} ; then - echo "Installing PEP8 check as precommit-hook" -- echo "#! $( which python )" > ${HOOK_FILE} -+ echo "#! $( which python3 )" > ${HOOK_FILE} - echo "# MYCROFT DEV SETUP" >> ${HOOK_FILE} - cat ./scripts/pre-commit >> ${HOOK_FILE} - chmod +x ${HOOK_FILE} +@@ -75,7 +75,7 @@ for var in "$@" ; do + opt_skipmimicbuild=true fi - fi - --PYTHON=$( python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" ) -+PYTHON=$( python3 -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" ) + if [[ $var == '-p' || $var == '--python' ]] ; then +- param='python' ++ param='python3' + fi + done - # install required python modules --if ! pip install -r requirements.txt ; then -+if ! pip3 install -r requirements.txt ; then - echo "Warning: Failed to install all requirements. Continue? y/N" - read -n1 continue - if [[ "$continue" != "y" ]] ; then -@@ -369,7 +369,7 @@ if ! pip install -r requirements.txt ; then +@@ -355,7 +355,7 @@ else fi fi --if ! pip install -r test-requirements.txt ; then -+if ! pip3 install -r test-requirements.txt ; then - echo "Warning test requirements wasn't installed, Note: normal operation should still work fine..." - fi +-PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") ++PYTHON=$(python3 -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") + SYSMEM=$(free | awk '/^Mem:/ { print $2 }') + MAXCORES=$(($SYSMEM / 512000)) diff --git a/scripts/install-pocketsphinx.sh b/scripts/install-pocketsphinx.sh index 44d329b7985..d45f5c22747 100755 --- a/scripts/install-pocketsphinx.sh @@ -131,5 +117,5 @@ index 44d329b7985..d45f5c22747 100755 if [ "$1" = "-q" ] ; then -- -2.21.0 +2.23.0 diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch deleted file mode 100644 index 5ae868376..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7fc38ae0dec30789fa0d365f1764f4950b700a98 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Tue, 2 Apr 2019 16:52:44 -0700 -Subject: [PATCH 5/5] dev_setup.sh: Remove the test setup dependency - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> ---- - dev_setup.sh | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/dev_setup.sh b/dev_setup.sh -index c6aa783e1ef..bcfaa0c16c2 100755 ---- a/dev_setup.sh -+++ b/dev_setup.sh -@@ -353,10 +353,6 @@ if ! pip3 install -r requirements.txt ; then - fi - fi - --if ! pip3 install -r test-requirements.txt ; then -- echo "Warning test requirements wasn't installed, Note: normal operation should still work fine..." --fi -- - SYSMEM=$( free | awk '/^Mem:/ { print $2 }' ) - MAXCORES=$(($SYSMEM / 512000)) - MINCORES=1 --- -2.21.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service index 07598235e..4b4bcdd77 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service @@ -5,7 +5,8 @@ After=systemd-user-sessions.service [Service] Type=oneshot -ExecStart=@LIBDIR@/mycroft/dev_setup.sh --allow-root +ExecStart=cp -rf @LIBDIR@/mycroft /var/ +ExecStart=/var/mycroft/dev_setup.sh --allow-root [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service index 28729f6b1..c7f477f13 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service @@ -5,10 +5,10 @@ After=mycroft-setup.service [Service] Type=forking -WorkingDirectory=@LIBDIR@/mycroft +WorkingDirectory=/var/mycroft ExecStartPre=mkdir -p /var/log/mycroft -ExecStart=@LIBDIR@/mycroft/start-mycroft.sh all -ExecStop=@LIBDIR@/mycroft/stop-mycroft.sh all +ExecStart=/var/mycroft/start-mycroft.sh all +ExecStop=/var/mycroft/stop-mycroft.sh all [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb index b03a90083..d4ac4096b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb @@ -6,13 +6,13 @@ SECTION = "multimedia" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=79aa497b11564d1d419ee889e7b498f6" -SRCREV = "4b45db34ecd95b62ef2b66a8e5180c66ca791a21" +SRCREV = "913f29d3d550637934f9abf43a097eb2c30d76fc" SRC_URI = "git://github.com/MycroftAI/mycroft-core.git;branch=master \ file://0001-Remove-python-venv.patch \ - file://0002-pip-requirements-Remove-ones-installed-by-OE.patch \ - file://0003-Use-python3-and-pip3-instead-of-python-and-pip.patch \ - file://0004-dev_setup.sh-Remove-the-git-dependency.patch \ - file://0005-dev_setup.sh-Remove-the-test-setup-dependency.patch \ + file://0002-dev_setup.sh-Remove-the-git-dependency.patch \ + file://0003-dev_setup.sh-Remove-the-TERM-dependency.patch \ + file://0004-pip-requirements-Don-t-install-requirements-with-pip.patch \ + file://0005-Use-python3-and-pip3-instead-of-python-and-pip.patch \ file://dev_opts.json \ file://mycroft-setup.service \ file://mycroft.service \ @@ -24,6 +24,7 @@ inherit systemd # Mycroft installs itself on the host # Just copy the setup files to the rootfs +# The mycroft-setup service will copy the files to /var/ where we run them from do_install() { install -d ${D}${libdir}/ cp -r ${B} ${D}${libdir}/mycroft @@ -49,20 +50,30 @@ FILES_${PN} += "${libdir}/mycroft" RDEPENDS_${PN} = "python3" -# Install as many Python packages as we can. -# We don't yet have all the packages in meta-python. -# Install as many as we can and we will install the rest on the target with pip. -# TODO: Add all the remaining packages and remove pip -RDEPENDS_${PN} += "python3-pip \ - python3-requests python3-pillow \ +RDEPENDS_${PN} += "python3-requests python3-pillow \ python3-tornado python3-pyyaml \ python3-pyalsaaudio python3-inflection \ python3-pyserial python3-psutil \ python3-pyaudio python3-fann2 \ python3-pocketsphinx \ - python3-xxhash \ + python3-xxhash python3-pako \ + python3-six python3-cryptography \ + python3-requests-futures \ + python3-xmlrunner python3-fasteners \ + python3-python-vlc \ + python3-padatious python3-padaos \ + python3-petact python3-precise-runner \ + python3-pulsectl python3-pychromecast \ + python3-msm python3-msk \ + python3-websocket-client \ + python3-google-api-python-client \ " +# These packages need to be installed on the target +# python3-speechrecognition python3-pyee==5.0.0 python3-six==1.10.0 +# python3-websocket-client==0.54.0 python3-gtts python3-gtts-token +# python3-python-dateutil python3-adapt-parser python3-lazy + # Mycroft uses Alsa, PulseAudio and Flac RDEPENDS_${PN} += "alsa-utils alsa-plugins alsa-tools" RDEPENDS_${PN} += "pulseaudio pulseaudio-misc pulseaudio-server" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20180319.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20180319.bb index beeb23ae2..28bb5d924 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20180319.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20180319.bb @@ -1,7 +1,7 @@ SUMMARY = "Fixed-point decoder" DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec." SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \ file://os.h;beginline=3;endline=14;md5=5c0af5e1bedef3ce8178c89f48cd6f1f" DEPENDS = "libogg" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch new file mode 100644 index 000000000..5859dc7ed --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch @@ -0,0 +1,104 @@ +From 1f233773962bf1a9c2d228a180eacddb9db2d574 Mon Sep 17 00:00:00 2001 +From: Alexander Scheel <ascheel@redhat.com> +Date: Tue, 7 May 2019 16:04:29 -0400 +Subject: [PATCH] su to radiusd user/group when rotating logs + +The su directive to logrotate ensures that log rotation happens under the +owner of the logs. Otherwise, logrotate runs as root:root, potentially +enabling privilege escalation if a RCE is discovered against the +FreeRADIUS daemon. + +Signed-off-by: Alexander Scheel <ascheel@redhat.com> + +Upstream-Status: Backport +[https://github.com/FreeRADIUS/freeradius-server/commit/1f233773962bf1a9c2d228a180eacddb9db2d574] + +CVE: CVE-2019-10143 + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + debian/freeradius.logrotate | 3 +++ + redhat/freeradius-logrotate | 1 + + scripts/logrotate/freeradius | 3 +++ + suse/radiusd-logrotate | 1 + + 4 files changed, 8 insertions(+) + +diff --git a/debian/freeradius.logrotate b/debian/freeradius.logrotate +index 7d837d5..a8d29b7 100644 +--- a/debian/freeradius.logrotate ++++ b/debian/freeradius.logrotate +@@ -9,6 +9,7 @@ + notifempty + + copytruncate ++ su freerad freerad + } + + # (in order) +@@ -26,6 +27,7 @@ + notifempty + + nocreate ++ su freerad freerad + } + + # There are different detail-rotating strategies you can use. One is +@@ -45,4 +47,5 @@ + notifempty + + nocreate ++ su freerad freerad + } +diff --git a/redhat/freeradius-logrotate b/redhat/freeradius-logrotate +index 360765d..bb97ca5 100644 +--- a/redhat/freeradius-logrotate ++++ b/redhat/freeradius-logrotate +@@ -9,6 +9,7 @@ rotate 4 + missingok + compress + delaycompress ++su radiusd radiusd + + # + # The main server log +diff --git a/scripts/logrotate/freeradius b/scripts/logrotate/freeradius +index 3de435e..eecf631 100644 +--- a/scripts/logrotate/freeradius ++++ b/scripts/logrotate/freeradius +@@ -17,6 +17,7 @@ + notifempty + + copytruncate ++ su radiusd radiusd + } + + # (in order) +@@ -34,6 +35,7 @@ + notifempty + + nocreate ++ su radiusd radiusd + } + + # There are different detail-rotating strategies you can use. One is +@@ -53,4 +55,5 @@ + notifempty + + nocreate ++ su radiusd radiusd + } +diff --git a/suse/radiusd-logrotate b/suse/radiusd-logrotate +index 24d56be..be5a797 100644 +--- a/suse/radiusd-logrotate ++++ b/suse/radiusd-logrotate +@@ -11,6 +11,7 @@ missingok + compress + delaycompress + notifempty ++su radiusd radiusd + + # + # The main server log +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb index 9da15e07a..8c95bbae3 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb @@ -26,6 +26,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x; \ file://freeradius-fix-quoting-for-BUILT_WITH.patch \ file://freeradius-fix-error-for-expansion-of-macro.patch \ file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ + file://0001-su-to-radiusd-user-group-when-rotating-logs.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service b/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service index f32edcb90..b851ea71c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service +++ b/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service @@ -6,7 +6,7 @@ After=time-sync.target [Service] ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf [Install] diff --git a/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service b/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service index 26d2205e6..0f9f0ef8d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service +++ b/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service @@ -6,7 +6,7 @@ After=time-sync.target [Service] ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf [Install] diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb index 0d6e1a0b0..085807c4c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb @@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \ file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ file://musl/0002-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "ca1e6175c6ba97ca1adf65a67861ccd9" -SRC_URI[sha256sum] = "4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3" +SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d" +SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e" S = "${WORKDIR}/NetworkManager-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service index 76f9f61e7..c1021fbd7 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/bgpd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/bgpd.pid +PIDFile=/run/quagga/bgpd.pid ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f @SYSCONFDIR@/quagga/bgpd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/bgpd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/bgpd.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service index a2e493b42..99d0e6dca 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospf6d.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ospf6d.pid +PIDFile=/run/quagga/ospf6d.pid ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f @SYSCONFDIR@/quagga/ospf6d.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospf6d.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospf6d.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service index 0c62cbce5..fe8343be1 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospfd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ospfd.pid +PIDFile=/run/quagga/ospfd.pid ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f @SYSCONFDIR@/quagga/ospfd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospfd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospfd.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service index 1d20389e8..7af65ca8a 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ripd.pid +PIDFile=/run/quagga/ripd.pid ExecStart=@SBINDIR@/ripd -d $ripd_options -f @SYSCONFDIR@/quagga/ripd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripd.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service index 0355ad12a..9305f86be 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripngd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ripngd.pid +PIDFile=/run/quagga/ripngd.pid ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f @SYSCONFDIR@/quagga/ripngd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripngd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripngd.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service index e4fb6c808..e34af7242 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service @@ -7,10 +7,10 @@ ConditionPathExists=@SYSCONFDIR@/quagga/zebra.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/zebra.pid +PIDFile=/run/quagga/zebra.pid ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/zebra.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/zebra.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb index 22cb88ac1..b375ca94e 100644 --- a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb +++ b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb @@ -34,7 +34,9 @@ do_compile() { } do_install() { - sed -i -e "s;SBIN\t\t= \$(BUILD_ROOT)/sbin;SBIN\t\t= \$(BUILD_ROOT)/$base_sbindir;" ${S}/Makefile + sed -i -e "s;SBIN\t\t= \$(BUILD_ROOT)/sbin;SBIN\t\t= \$(BUILD_ROOT)$base_sbindir;" \ + -e "s;INIT\t\t= \$(BUILD_ROOT)/etc/rc.d/init.d;INIT\t\t= \$(BUILD_ROOT)${sysconfdir}/init.d;" \ + ${S}/Makefile oe_runmake 'BUILD_ROOT=${D}' install } diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb index 5408eed27..b521633ff 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb @@ -28,6 +28,7 @@ PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ ${@bb.utils.filter('DISTRO_FEATURES', 'ldap', d)} \ " PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" +PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils" PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb index 6133b3a27..92c902b75 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" -DEPENDS = "util-linux util-linux-native" +DEPENDS = "util-linux" PV .= "+git${SRCPV}" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" @@ -21,6 +21,7 @@ do_install() { pkg_postinst_ontarget_${PN}() { ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn + ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid } PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" @@ -28,3 +29,5 @@ PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN}-dracut = "${libdir}/dracut/dracut.conf.d" FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "util-linux-uuidgen" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch new file mode 100644 index 000000000..4bd40606b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch @@ -0,0 +1,31 @@ +From 3f2fc79385398f213a9bd3c99616d749d699f2bb Mon Sep 17 00:00:00 2001 +From: Fabio Berton <fabio.berton@ossystems.com.br> +Date: Thu, 14 Mar 2019 19:26:14 -0300 +Subject: [PATCH] Fix build with musl +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> +--- + src/ethtool-local.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/ethtool-local.h b/src/ethtool-local.h +index 200476b..0edc7a9 100644 +--- a/src/ethtool-local.h ++++ b/src/ethtool-local.h +@@ -22,9 +22,9 @@ + */ + + typedef unsigned long long u64; +-typedef __uint32_t u32; +-typedef __uint16_t u16; +-typedef __uint8_t u8; ++typedef uint32_t u32; ++typedef uint16_t u16; ++typedef uint8_t u8; + + #include "ethtool-kernel.h" + +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb new file mode 100644 index 000000000..0b5c5a6ce --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "ifplugd is a Linux daemon which will automatically configure your ethernet device \ +when a cable is plugged in and automatically unconfigure it if the cable is pulled." +HOMEPAGE = "http://0pointer.de/lennart/projects/ifplugd/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "libdaemon" + +SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz" + +SRC_URI_append_libc-musl = " file://Fix-build-with-musl.patch" + +SRC_URI[md5sum] = "df6f4bab52f46ffd6eb1f5912d4ccee3" +SRC_URI[sha256sum] = "474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0" + +inherit autotools update-rc.d pkgconfig + +EXTRA_OECONF = "--disable-lynx --with-initdir=${sysconfdir}/init.d" + +INITSCRIPT_NAME = "ifplugd" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/ifplugd/ifplugd.conf" + +RDEPENDS_${PN} += "bash" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.18.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.0.bb index 9f59ad6b4..17d784766 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.18.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.0.bb @@ -14,5 +14,5 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ file://clang.patch \ " -SRC_URI[md5sum] = "840cd133bc0f715a7ee4797dd9ac5562" -SRC_URI[sha256sum] = "6cf40128d83d087946a7d8577e735526202e034d52f90047735329609097b282" +SRC_URI[md5sum] = "b5506db07fb2a0b118e0d6e59b3d5b8f" +SRC_URI[sha256sum] = "2cf7c6c7aa9e962a589f61bff2766035b61792ef961131a21fcbbe043f91a866" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index 36580952f..b985d39ab 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb @@ -16,6 +16,7 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.bz2 \ SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de" SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82" +COMPATIBLE_HOST_libc-musl = "null" EXTRA_OEMAKE = "" export WVLINK="${LD}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch deleted file mode 100644 index 232db9e63..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 0e054339c1422168a7f4a9dcf090268053a33b1f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 20 Jul 2017 21:05:37 -0700 -Subject: [PATCH 2/5] wvtask: Dont use ucontext on non-glibc systems - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/wvtask.cc | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/utils/wvtask.cc b/utils/wvtask.cc -index cdcd544..c0bff7d 100644 ---- a/utils/wvtask.cc -+++ b/utils/wvtask.cc -@@ -199,7 +199,9 @@ WvTaskMan::WvTaskMan() - stacktop = (char *)alloca(0); - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&get_stack_return) == 0); -+#endif - if (context_return == 0) - { - // initial setup - start the stackmaster() task (never returns!) -@@ -265,13 +267,17 @@ int WvTaskMan::run(WvTask &task, int val) - state = &old_task->mystate; - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(state) == 0); -+#endif - int newval = context_return; - if (newval == 0) - { - // saved the state, now run the task. - context_return = val; -+#ifdef __GLIBC__ - setcontext(&task.mystate); -+#endif - return -1; - } - else -@@ -319,13 +325,17 @@ int WvTaskMan::yield(int val) - #endif - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(¤t_task->mystate) == 0); -+#endif - int newval = context_return; - if (newval == 0) - { - // saved the task state; now yield to the toplevel. - context_return = val; -+#ifdef __GLIBC__ - setcontext(&toplevel); -+#endif - return -1; - } - else -@@ -341,7 +351,9 @@ int WvTaskMan::yield(int val) - void WvTaskMan::get_stack(WvTask &task, size_t size) - { - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&get_stack_return) == 0); -+#endif - if (context_return == 0) - { - assert(magic_number == -WVTASK_MAGIC); -@@ -371,7 +383,9 @@ void WvTaskMan::get_stack(WvTask &task, size_t size) - // initial setup - stack_target = &task; - context_return = size/1024 + (size%1024 > 0); -+#ifdef __GLIBC__ - setcontext(&stackmaster_task); -+#endif - } - else - { -@@ -409,7 +423,9 @@ void WvTaskMan::_stackmaster() - assert(magic_number == -WVTASK_MAGIC); - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&stackmaster_task) == 0); -+#endif - val = context_return; - if (val == 0) - { -@@ -419,7 +435,9 @@ void WvTaskMan::_stackmaster() - // all current stack allocations) and go back to get_stack - // (or the constructor, if that's what called us) - context_return = 1; -+#ifdef __GLIBC__ - setcontext(&get_stack_return); -+#endif - } - else - { -@@ -474,7 +492,9 @@ void WvTaskMan::do_task() - - // back here from longjmp; someone wants stack space. - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&task->mystate) == 0); -+#endif - if (context_return == 0) - { - // done the setjmp; that means the target task now has -@@ -510,7 +530,9 @@ void WvTaskMan::do_task() - } - else - { -+#ifdef __GLIBC__ - assert(getcontext(&task->func_call) == 0); -+#endif - task->func_call.uc_stack.ss_size = task->stacksize; - task->func_call.uc_stack.ss_sp = task->stack; - task->func_call.uc_stack.ss_flags = 0; -@@ -521,9 +543,11 @@ void WvTaskMan::do_task() - (void (*)(void))call_func, 1, task); - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&task->func_return) == 0); - if (context_return == 0) - setcontext(&task->func_call); -+#endif - } - - // the task's function terminated. --- -2.13.3 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index b9f62da7b..b220f9c1b 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -15,7 +15,6 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ file://gcc-6.patch \ file://argp.patch \ file://0001-Check-for-limits.h-during-configure.patch \ - file://0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch \ file://0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch \ file://0004-wvcrash-Replace-use-of-basename-API.patch \ file://0005-check-for-libexecinfo-during-configure.patch \ @@ -28,6 +27,8 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" +COMPATIBLE_HOST_libc-musl = "null" + inherit autotools-brokensep pkgconfig TARGET_CFLAGS_append = " -fno-tree-dce -fno-optimize-sibling-calls" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 5bb0beb7a..1f0a7b947 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -66,11 +66,12 @@ RDEPENDS_packagegroup-meta-oe-connectivity ="\ modemmanager mosh \ paho-mqtt-c phonet-utils rabbitmq-c rfkill rtorrent \ ser2net smstools3 telepathy-glib telepathy-idle thrift \ - usbmuxd wvstreams zabbix zeromq \ + usbmuxd zabbix zeromq \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obex-data-server", "", d)} \ libmikmod \ - obexftp openobex libnet wvdial \ + obexftp openobex libnet \ " +RDEPENDS_packagegroup-meta-oe-connectivity_append_libc-glibc = " wvstreams wvdial" # dracut needs dracut RDEPENDS_packagegroup-meta-oe-core ="\ diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb new file mode 100644 index 000000000..326a4abfb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "fifo maps for c++" +HOMEPAGE = "https://github.com/nlohmann/fifo_map" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=b67209a1e36b682a8226de19d265b1e0" + +SRC_URI = "git://github.com/nlohmann/fifo_map.git" + +PV = "1.0.0+git${SRCPV}" + +SRCREV = "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9" + +S = "${WORKDIR}/git" + +# nlohmann-fifo is a header only C++ library, so the main package will be empty. + +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +do_install() { + install -d ${D}${includedir} + install -m 0644 ${S}/src/fifo_map.hpp ${D}${includedir} +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb index a007b2a69..928454117 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "52b2447247f535663ac1c292e088b4b27d2910ef" +SRCREV = "6d4e7fd7966c989e38024a8ea693db83758944f1" -SRC_URI = "git://github.com/google/protobuf.git;branch=3.9.x \ +SRC_URI = "git://github.com/google/protobuf.git;branch=3.10.x \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch new file mode 100644 index 000000000..0b32766a5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch @@ -0,0 +1,43 @@ +From 10549ba915556c557b22b3dac7e4cb73ad22d3d8 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards <rgerhards@adiscon.com> +Date: Fri, 27 Sep 2019 13:36:02 +0200 +Subject: [PATCH] pmaixforwardedfrom bugfix: potential misadressing + +--- + contrib/pmaixforwardedfrom/pmaixforwardedfrom.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Upstream-Status: Backport [https://github.com/rsyslog/rsyslog/pull/3884] +CVE: CVE-2019-17041 +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> + +diff --git a/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c b/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c +index 37157c7d4..ebf12ebbe 100644 +--- a/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c ++++ b/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c +@@ -109,6 +109,10 @@ CODESTARTparse + /* bump the message portion up by skipLen(23 or 5) characters to overwrite the "Message forwarded from + " or "From " with the hostname */ + lenMsg -=skipLen; ++ if(lenMsg < 2) { ++ dbgprintf("not a AIX message forwarded from message has nothing after header\n"); ++ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); ++ } + memmove(p2parse, p2parse + skipLen, lenMsg); + *(p2parse + lenMsg) = '\n'; + *(p2parse + lenMsg + 1) = '\0'; +@@ -120,6 +124,11 @@ really an AIX log, but has a similar preamble */ + --lenMsg; + ++p2parse; + } ++ if (lenMsg < 1) { ++ dbgprintf("not a AIX message forwarded from message has nothing after colon " ++ "or no colon at all\n"); ++ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); ++ } + if (lenMsg && *p2parse != ':') { + DBGPRINTF("not a AIX message forwarded from mangled log but similar enough that the preamble has " + "been removed\n"); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb index bd0dbc1a2..f9e44421d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb @@ -24,6 +24,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t file://use-pkgconfig-to-check-libgcrypt.patch \ file://run-ptest \ file://0001-Out-of-bounds-issue.patch \ + file://0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch \ " SRC_URI_append_libc-musl = " \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb index b19f9109d..ffd4099b4 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" HOMEPAGE = "http://www.openjpeg.org" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" DEPENDS = "libpng tiff lcms zlib" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb index c2b345da6..62f00563c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb @@ -1,6 +1,6 @@ SUMMARY = "X screen saver and locker" -LICENSE = "BSD" +LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=e141ab5822fb2d43694e1e47b59fc0df" SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb new file mode 100644 index 000000000..bcb3015f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb @@ -0,0 +1,65 @@ +SUMMARY = "Multimedia processing server for Linux" +AUTHOR = "Wim Taymans <wtaymans@redhat.com>" +HOMEPAGE = "https://pipewire.org" +SECTION = "multimedia" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ + file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" +DEPENDS = "alsa-lib dbus udev" +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" +PV = "0.2.7" + +SRC_URI = "git://github.com/PipeWire/pipewire" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd manpages + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + gstreamer \ +" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" + +PACKAGES =+ "\ + ${PN}-spa-plugins \ + ${PN}-alsa \ + ${PN}-config \ + gstreamer1.0-${PN} \ + lib${PN} \ + lib${PN}-modules \ +" + +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" + +FILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pipewire* \ + ${systemd_user_unitdir}/* \ +" +FILES_lib${PN} = "\ + ${libdir}/libpipewire-*.so.* \ +" +FILES_lib${PN}-modules = "\ + ${libdir}/pipewire-*/* \ +" +FILES_${PN}-spa-plugins = "\ + ${bindir}/spa-* \ + ${libdir}/spa/* \ +" +FILES_${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ +" +FILES_gstreamer1.0-${PN} = "\ + ${libdir}/gstreamer-1.0/* \ +" + +CONFFILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb index 1e49eefcc..c76632781 100644 --- a/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb @@ -1,6 +1,6 @@ SUMMARY = "A tool to run a command as a daemon" HOMEPAGE = "http://software.clapper.org/daemonize/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3cf9084faa88bc8554a9139d8d7dd35f" PV = "1.7.8" diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb new file mode 100644 index 000000000..97116ee2d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb @@ -0,0 +1,13 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat" + +SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" +SRC_URI[md5sum] = "56d064517ae5903dd963b84514a121c1" +SRC_URI[sha256sum] = "f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081" + +S = "${WORKDIR}/${BPN}-${PV}-Source" + +inherit cmake gettext diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb index c48a98183..fdb82519b 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb @@ -1,6 +1,6 @@ SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" HOMEPAGE = "https://github.com/gperftools/gperftools" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" DEPENDS += "libunwind" diff --git a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb index 5030c78a3..48271f721 100644 --- a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb @@ -2,7 +2,7 @@ SUMMARY = "C and C++ INI Library" HOMEPAGE = "http://code.google.com/p/inih/" PV = "0.0+gitr${SRCPV}" PKGV = "${GITPKGVTAG}" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde" PR = "r3" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index cc0efccf9..4e57d5b77 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -4,14 +4,15 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SRCREV = "6ecff5d46e1b12c2859f0b63a73282940e3402bb" -PV = "0.15+git${SRCPV}" +# v0.18 + a single commit fixing the build +SRCREV = "5090603d01779bb1717fb0c50953330e8770550f" +PV = "0.18+git${SRCPV}" SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" S = "${WORKDIR}/git" -inherit cmake pythonnative systemd +inherit cmake python3native systemd DEPENDS = " \ flex-native bison-native libaio \ @@ -24,22 +25,21 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ " -PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND PYTHON_BINDINGS" +PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND" PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" -PACKAGECONFIG[PYTHON_BINDINGS] = ",,python" -PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python" +PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" -RDEPENDS_${PN}-python = "${PN} python-ctypes python-stringold" +RDEPENDS_${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" FILES_${PN}-iiod = " \ ${sbindir}/iiod \ ${systemd_system_unitdir}/iiod.service \ " FILES_${PN}-tests = "${bindir}" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" SYSTEMD_PACKAGES = "${PN}-iiod" SYSTEMD_SERVICE_${PN}-iiod = "iiod.service" diff --git a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index b537ce67d..3685c4aca 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -1,7 +1,7 @@ SUMMARY = "A Library to Access SMI MIB Information" HOMEPAGE = "https://www.ibr.cs.tu-bs.de/projects/libsmi" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause & TCL" LIC_FILES_CHKSUM = "file://COPYING;md5=3ad3076f9332343a21636cfd351f05b7" SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb index fe853cde4..6428958f9 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb @@ -4,7 +4,7 @@ SECTION = "libs" DEPENDS = "zlib" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch index e5ad4eaf2..9f9383ef4 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch @@ -1,6 +1,6 @@ -From 24a2c47fd01dde1710f1fa66f5c30ce7010c5956 Mon Sep 17 00:00:00 2001 +From e213ed33a28704f6f538df41a91b7ce95594a4f8 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 21 Sep 2017 15:28:10 +0800 +Date: Tue, 15 Oct 2019 18:12:54 +0800 Subject: [PATCH] start lvm2-monitor.service after tmp.mount The lvm2-monitor.service reqires the existence of locking_dir @@ -9,18 +9,14 @@ So start lvm2-monitor.service after tmp.mount Upstream-Status: Inappropriate [oe specific] +Rebase to v2_03_05 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - - -Update context for lvm2 2.03.02. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> --- scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in -index 7ec4e4e..3282a95 100644 +index 4bf744a..46766cb 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -2,7 +2,7 @@ @@ -29,9 +25,9 @@ index 7ec4e4e..3282a95 100644 Requires=dm-event.socket -After=dm-event.socket dm-event.service lvm2-activation.service +After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount - Before=local-fs-pre.target + Before=local-fs-pre.target shutdown.target DefaultDependencies=no Conflicts=shutdown.target -- -1.8.3.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb index 32bc13d1b..be558ce1d 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.02.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb @@ -3,8 +3,6 @@ # generates package libdevmapper require lvm2.inc -SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" - DEPENDS += "autoconf-archive-native" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 6c95bfd02..41bf78a3f 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ DEPENDS += "libaio" -SRC_URI = "https://sourceware.org/pub/lvm2/LVM2.${PV}.tgz \ +SRC_URI = "git://sourceware.org/git/lvm2.git \ file://lvm.conf \ file://0001-implement-libc-specific-reopen_stream.patch \ file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ @@ -17,10 +17,8 @@ SRC_URI = "https://sourceware.org/pub/lvm2/LVM2.${PV}.tgz \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ file://0001-configure-Fix-setting-of-CLDFLAGS-default.patch \ " -SRC_URI[md5sum] = "5fc07da5461a3794a751dcfc355827d5" -SRC_URI[sha256sum] = "550ba750239fd75b7e52c9877565cabffef506bbf6d7f6f17b9700dee56c720f" - -S = "${WORKDIR}/LVM2.${PV}" +SRCREV = "60bd9e8406ac28a04aa5e8165149f7a5d4f3265a" +S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd license diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch new file mode 100644 index 000000000..a864f1e21 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch @@ -0,0 +1,82 @@ +From f8466749dd73f5b0ccf4fc86c8a7585c4140b3f9 Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac <zkabelac@redhat.com> +Date: Fri, 16 Aug 2019 23:49:59 +0200 +Subject: [PATCH 1/3] activation: add synchronization point + +Resuming of 'error' table entry followed with it's dirrect removal +is now troublesame with latest udev as it may skip processing of +udev rules for already 'dropped' device nodes. + +As we cannot 'synchronize' with udev while we know we have devices +in suspended state - rework 'cleanup' so it collects nodes +for removal into pending_delete list and process the list with +synchronization once we are without any suspended nodes. + +Upstream-Status: Backport +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + WHATS_NEW | 9 +++++++++ + lib/activate/dev_manager.c | 20 ++++++++++++-------- + 2 files changed, 21 insertions(+), 8 deletions(-) + +diff --git a/WHATS_NEW b/WHATS_NEW +index 3a58de5f9..0b48e032b 100644 +--- a/WHATS_NEW ++++ b/WHATS_NEW +@@ -1,3 +1,12 @@ ++Version 2.03.06 - ++================================ ++ Synchronize with udev when dropping snapshot. ++ Add missing device synchronization point before removing pvmove node. ++ Correctly set read_ahead for LVs when pvmove is finished. ++ Remove unsupported OPTIONS+="event_timeout" udev rule from 11-dm-lvm.rules. ++ Prevent creating VGs with PVs with different logical block sizes. ++ Fix metadata writes from corrupting with large physical block size. ++ + Version 2.03.05 - 15th June 2019 + ================================ + Fix command definition for pvchange -a. +diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c +index 981f4674a..7101ffa12 100644 +--- a/lib/activate/dev_manager.c ++++ b/lib/activate/dev_manager.c +@@ -3558,13 +3558,6 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const + const char *name, *uuid; + struct dm_str_list *dl; + +- /* Deactivate any tracked pending delete nodes */ +- dm_list_iterate_items(dl, &dm->pending_delete) { +- log_debug_activation("Deleting tracked UUID %s.", dl->str); +- if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) +- return_0; +- } +- + while ((child = dm_tree_next_child(&handle, root, 0))) { + if (!(name = dm_tree_node_get_name(child))) + continue; +@@ -3585,10 +3578,21 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const + if (non_toplevel_tree_dlid && !strcmp(non_toplevel_tree_dlid, uuid)) + continue; + +- if (!dm_tree_deactivate_children(root, uuid, strlen(uuid))) ++ if (!str_list_add(dm->mem, &dm->pending_delete, uuid)) + return_0; + } + ++ /* Deactivate any tracked pending delete nodes */ ++ if (!dm_list_empty(&dm->pending_delete) && !dm_get_suspended_counter()) { ++ fs_unlock(); ++ dm_tree_set_cookie(root, fs_get_cookie()); ++ dm_list_iterate_items(dl, &dm->pending_delete) { ++ log_debug_activation("Deleting tracked UUID %s.", dl->str); ++ if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) ++ return_0; ++ } ++ } ++ + return 1; + } + +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch new file mode 100644 index 000000000..e30731593 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch @@ -0,0 +1,124 @@ +From d06ad77b47f4dfd25bc3da88c0621ac073ad8ce5 Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac <zkabelac@redhat.com> +Date: Fri, 23 Aug 2019 13:08:34 +0200 +Subject: [PATCH 2/3] activation: extend handling of pending_delete + +With previous patch 30a98e4d6710a543692d40d11428ae4baea11b7b we +started to put devices one pending_delete list instead +of directly scheduling their removal. + +However we have operations like 'snapshot merge' where we are +resuming device tree in 2 subsequent activation calls - so +1st such call will still have suspened devices and no chance +to push 'remove' ioctl. + +Since we curently cannot easily solve this by doing just single +activation call (which would be preferred solution) - we introduce +a preservation of pending_delete via command structure and +then restore it on next activation call. + +This way we keep to remove devices later - although it might be +not the best moment - this may need futher tunning. + +Also we don't keep the list of operation in 1 trasaction +(unless we do verify udev symlinks) - this could probably +also make it more correct in terms of which 'remove' can +be combined we already running 'resume'. + +Upstream-Status: Backport +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + lib/activate/dev_manager.c | 24 +++++++++++------------- + lib/commands/toolcontext.c | 8 ++++++++ + lib/commands/toolcontext.h | 1 + + 3 files changed, 20 insertions(+), 13 deletions(-) + +diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c +index 7101ffa12..7a7689291 100644 +--- a/lib/activate/dev_manager.c ++++ b/lib/activate/dev_manager.c +@@ -3591,6 +3591,7 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const + if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) + return_0; + } ++ dm_list_init(&dm->pending_delete); + } + + return 1; +@@ -3717,25 +3718,22 @@ out_no_root: + int dev_manager_activate(struct dev_manager *dm, const struct logical_volume *lv, + struct lv_activate_opts *laopts) + { ++ dm_list_splice(&dm->pending_delete, &lv->vg->cmd->pending_delete); ++ + if (!_tree_action(dm, lv, laopts, ACTIVATE)) + return_0; + +- /* +- * When lvm2 resumes a device and shortly after that it removes it, +- * udevd rule will try to blindly call 'dmsetup info' on already removed +- * device leaving the trace inside syslog about failing operation. +- * +- * TODO: It's not completely clear this call here is the best fix. +- * Maybe there can be a better sequence, but ATM we do usually resume +- * error device i.e. on cache deletion and remove it. +- * TODO2: there could be more similar cases! +- */ +- if (!dm_list_empty(&dm->pending_delete)) +- fs_unlock(); +- + if (!_tree_action(dm, lv, laopts, CLEAN)) + return_0; + ++ if (!dm_list_empty(&dm->pending_delete)) { ++ log_debug("Preserving %d device(s) for removal while being suspended.", ++ dm_list_size(&dm->pending_delete)); ++ if (!(str_list_dup(lv->vg->cmd->mem, &lv->vg->cmd->pending_delete, ++ &dm->pending_delete))) ++ return_0; ++ } ++ + return 1; + } + +diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c +index 1e03ea235..0a9355361 100644 +--- a/lib/commands/toolcontext.c ++++ b/lib/commands/toolcontext.c +@@ -1734,6 +1734,8 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, + cmd->current_settings = cmd->default_settings; + + cmd->initialized.config = 1; ++ ++ dm_list_init(&cmd->pending_delete); + out: + if (!cmd->initialized.config) { + destroy_toolcontext(cmd); +@@ -1922,6 +1924,12 @@ int refresh_toolcontext(struct cmd_context *cmd) + + cmd->initialized.config = 1; + ++ if (!dm_list_empty(&cmd->pending_delete)) { ++ log_debug(INTERNAL_ERROR "Unprocessed pending delete for %d devices.", ++ dm_list_size(&cmd->pending_delete)); ++ dm_list_init(&cmd->pending_delete); ++ } ++ + if (cmd->initialized.connections && !init_connections(cmd)) + return_0; + +diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h +index 6e4530c8a..54ddec320 100644 +--- a/lib/commands/toolcontext.h ++++ b/lib/commands/toolcontext.h +@@ -237,6 +237,7 @@ struct cmd_context { + const char *report_list_item_separator; + const char *time_format; + unsigned rand_seed; ++ struct dm_list pending_delete; /* list of LVs for removal */ + }; + + /* +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch new file mode 100644 index 000000000..953e4ad65 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch @@ -0,0 +1,40 @@ +From 9143445478871b47ba28b41f5e88d4c415f8205b Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac <zkabelac@redhat.com> +Date: Mon, 26 Aug 2019 15:13:55 +0200 +Subject: [PATCH 3/3] snapshot: always activate + +Drop the 'cluster-only' optimization so we do resume ALL device +before we try to wait on cookie before 'removal' operation. + +It's more correct order of operation - alhtough possibly slightly +less efficient - but until we have correct list of operations +'in-progress' we can't do anything better. + +Upstream-Status: Backport +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + lib/metadata/snapshot_manip.c | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c +index 5ccf251c7..65d8dbd13 100644 +--- a/lib/metadata/snapshot_manip.c ++++ b/lib/metadata/snapshot_manip.c +@@ -361,13 +361,7 @@ int vg_remove_snapshot(struct logical_volume *cow) + return 0; + } + +- /* +- * For merged snapshot and clustered VG activate cow LV so +- * the following call to deactivate_lv() can clean-up table +- * entries. For this clustered lock need to be held. +- */ +- if (vg_is_clustered(cow->vg) && +- merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { ++ if (merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { + log_error("Failed to activate %s.", cow->name); + return 0; + } +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb index 875709cd9..b80f1fd4b 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb @@ -1,11 +1,12 @@ require lvm2.inc -SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" - SRC_URI += " \ file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ file://0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch \ + file://0001-activation-add-synchronization-point.patch \ + file://0002-activation-extend-handling-of-pending_delete.patch \ + file://0003-snapshot-always-activate.patch \ " DEPENDS += "autoconf-archive-native" diff --git a/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb b/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb index abbaf98c0..20a71c6c9 100644 --- a/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Regular expressions library. The characteristics of this \ library is that different character encoding for every regular expression \ object can be specified." HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f" SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.24.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 7632fd2de..1d739874b 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.24.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -5,14 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "pidgin gmime intltool-native glib-2.0-native" -inherit pkgconfig -inherit autotools +inherit autotools gettext pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ " -SRC_URI[md5sum] = "b91106d28c235b347a63dcb676f7b66a" -SRC_URI[sha256sum] = "958803722b23d869131f76bd90df9da19116d4ca5a873e5253371479b7390f43" +SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" +SRC_URI[sha256sum] = "738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba" PACKAGECONFIG ??= "nss krb5" PACKAGECONFIG[nss] = "--enable-nss=yes,--enable-nss=no,nss" diff --git a/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb b/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb index 35e22d3ea..c09b495be 100644 --- a/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The sdparm utility accesses and optionally modifies \ SCSI devices' mode page and inquiry data." HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html" SECTION = "console/utils" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \ file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed" DEPENDS="sg3-utils" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc index 818d23815..07baa2daf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" DEPENDS += "libffi ${PYTHON_PN}-pycparser" -SRC_URI[md5sum] = "35ad1f9e1003cac9404c1493eb10d7f5" -SRC_URI[sha256sum] = "041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774" +SRC_URI[md5sum] = "2c90be6d3bfbf80ab732b28fd677051d" +SRC_URI[sha256sum] = "8fe230f612c18af1df6f348d02d682fe2c28ca0a6c3856c99599cdacae7cf226" RDEPENDS_${PN}_class-target = " \ ${PYTHON_PN}-ctypes \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.13.0.bb index bc667b805..bc667b805 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.13.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc index c772e9eb5..d9ccf1cad 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc @@ -2,8 +2,8 @@ SUMMARY = "An implementation of JSON Schema validation for Python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8" -SRC_URI[md5sum] = "2b44d00dccc96d7ba3839190263152eb" -SRC_URI[sha256sum] = "8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d" +SRC_URI[md5sum] = "a802ab85600074a726ef6acc4e6a8148" +SRC_URI[sha256sum] = "2fa0684276b6333ff3c0b1b27081f4b2305f0a36cf702a23db50edb141893c3f" DEPENDS += "${PYTHON_PN}-vcversioner-native ${PYTHON_PN}-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.1.1.bb index b677c646e..b677c646e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.1.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.2.bb index 6c78598a4..2778fc6b5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.2.bb @@ -5,8 +5,8 @@ RDEPENDS_${PN} = "python-six" LIC_FILES_CHKSUM = "file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c" -SRC_URI[md5sum] = "4ec8ac6032270daf91ff9621bda019d0" -SRC_URI[sha256sum] = "3d9c9e96a8408777b01976dfce900049e9e8c970e02198534f2c8c1b2cca5dee" +SRC_URI[md5sum] = "788fceb192bc338f1a3e2a8f78fd42b6" +SRC_URI[sha256sum] = "0b1f4d86f8366f0d4093e5449813792c98e760edc6b7c918f0f29f9ef22ae996" PYPI_PACKAGE = "Paste" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.3.bb index 506a9e21c..2b5ee9e7e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.3.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://pip.pypa.io/" LICENSE = "MIT & LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" -SRC_URI[md5sum] = "f417444c66a0db1a82c8d9d2283a2f95" -SRC_URI[sha256sum] = "e7a31f147974362e6c82d84b91c7f2bdf57e4d3163d3d454e6c3e71944d67135" +SRC_URI[md5sum] = "a57da8b758cbf1a155cde6a7a4428ba7" +SRC_URI[sha256sum] = "324d234b8f6124846b4e390df255cacbe09ce22791c3b714aa1ea6e44a4f2861" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc index a9e4bbef0..fcb140ac3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc @@ -6,8 +6,8 @@ HOMEPAGE = "https://github.com/etingof/pyasn1-modules" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a14482d15c2249de3b6f0e8a47e021fd" -SRC_URI[md5sum] = "c0bbe9820c971a97f156ff343ae67911" -SRC_URI[sha256sum] = "43c17a83c155229839cc5c6b868e8d0c6041dba149789b6d6e28801c64821722" +SRC_URI[md5sum] = "18c77d56abeef631d94f95ff2d652859" +SRC_URI[sha256sum] = "0c35a52e00b672f832e5846826f1fb7507907f7d52fba6faa9e3c4cbe874fe4b" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.7.bb index eb7888408..eb7888408 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index 576361c41..fa264f791 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=640061b8cee64b308a4d2f9f556c12f2" -SRC_URI[md5sum] = "79efe2708aa73dd5c618e5a89d80ce58" -SRC_URI[sha256sum] = "cc6620b96bc667a0c8d4fa592a8c9c94178a1bd6cc799dbb057dfd9286d31a31" +SRC_URI[md5sum] = "00561d0295aab167987f8a4f784964c4" +SRC_URI[sha256sum] = "ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.1.bb index 39e50aca9..39e50aca9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc index ddeedc6c8..b4edea002 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4878a915709225bceab739bdc2a18e8d" inherit pypi -SRC_URI[md5sum] = "8c21963449c3a793aa61ef122e171516" -SRC_URI[sha256sum] = "26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32" +SRC_URI[md5sum] = "c3d84a465fc56a4edd52cca8873ac0df" +SRC_URI[sha256sum] = "b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be" RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2019.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2019.3.bb index f2ffc596f..f2ffc596f 100755 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2019.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2019.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc index 6b4448220..93b2a15a7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc @@ -3,5 +3,5 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=5a8d76283514a1b7e6a414aba38629b5" -SRC_URI[md5sum] = "2e6c0bd69a540e15ff2222d6cb8da466" -SRC_URI[sha256sum] = "6b5af8c37ff12745ae77f28e695c0d3a3327932fd229824e49382377e940fdf1" +SRC_URI[md5sum] = "80461eff10ac62214fa788a6045aab43" +SRC_URI[sha256sum] = "82cdc67b41da904aa2921107e9877814079d9b067a99f19852b5d85e8a40555d" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.13.0.bb index e88808434..e88808434 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.13.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.7.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.7.11.bb new file mode 100644 index 000000000..25e3b9c3f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.7.11.bb @@ -0,0 +1,9 @@ +SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, Moderator, and many other Google APIs." +HOMEPAGE = "https://github.com/googleapis/google-api-python-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" + +SRC_URI[md5sum] = "6e28e8caf2e4d55ed5b7c48a538a61c9" +SRC_URI[sha256sum] = "a8a88174f66d92aed7ebbd73744c2c319b4b1ce828e565f9ec721352d2e2fb8c" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.1.1.bb index 926990747..926990747 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.1.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-monotonic_1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-monotonic_1.5.bb new file mode 100644 index 000000000..94b90524b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-monotonic_1.5.bb @@ -0,0 +1,9 @@ +SUMMARY = "This module provides a monotonic() function which returns the value (in fractional seconds) of a clock which never goes backwards." +HOMEPAGE = "https://github.com/atdt/monotonic" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +SRC_URI[md5sum] = "9f81cb0e5966479754453dea2b6822f4" +SRC_URI[sha256sum] = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.13.bb new file mode 100644 index 000000000..3f2aaf48d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.13.bb @@ -0,0 +1,11 @@ +SUMMARY = "A tool to help with creating, uploading, and upgrading Mycroft skills on the skills repo." +HOMEPAGE = "https://github.com/MycroftAI/mycroft-skills-kit" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.md;md5=2f90e43663eddf1c33087419fbb35e28" + +SRC_URI[md5sum] = "11d9fc865ef627efe68f25fc113974e8" +SRC_URI[sha256sum] = "55be86ff2cd0087016759f2b15b40861cda2a8d8a8d0c669fdacdf32a77a10da" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.7.bb index 3b1186f06..3b1186f06 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.1.bb index eba6632a2..eba6632a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb index 19a89dc55..19a89dc55 100755 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.2.bb index 76bc41a11..76bc41a11 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.2.bb diff --git a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb index 1e9e5f1a1..8196e6c17 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb @@ -14,8 +14,8 @@ inherit distutils3 gtk-icon-cache distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "9690848dbf9196c3f7baa574e90378d8" -SRC_URI[sha256sum] = "546fec87f451c8f5c220d02b1f36dd850f4ce9ab607f8e9711ed8f2009e349fe" +SRC_URI[md5sum] = "8460ea844a5998c5f722bccb5ce8627a" +SRC_URI[sha256sum] = "5b3ef8e6073d584f6accf282fa1eb649185ee42eb22fab70231491c7377d7e8f" do_compile() { } diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb index ff954acb8..9d031dd59 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Simple client plugin for Music Player Daemon" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" SECTION = "x11/application" -LICENSE = "BSD" +LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb index 04da55d61..6a72c89a6 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin displaying instant disk/partition performance" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb index 6ffa35aad..95c1fe4d9 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin displaying stats from a wireless lan interface" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" inherit xfce-panel-plugin |