summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/dynamic-layers
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-05-15 22:09:53 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-05-21 23:43:47 +0300
commit7f40b7168b897da48694d6e71fd3fd45861bfb19 (patch)
treefc7d9f02c5a2e0322b6aaac5cac6d12959fd26bb /meta-openembedded/meta-oe/dynamic-layers
parentdce5cf9dceda684d40fb0e9686ba884ed6b0751f (diff)
downloadopenbmc-7f40b7168b897da48694d6e71fd3fd45861bfb19.tar.xz
meta-openembedded: subtree update:679bb49126..7c02c7d411
Adam Miartus (1): toybox: allow user to provide own defconfig Adrian Bunk (5): uftrace: Fix PR mraa: Replace -fcommon with fix mozjs: Remove workaround for gcc < 4.9 flatbuffers: Remove workarounds for gcc < 6 protobuf-c: Remove workarounds for gcc < 6 Alejandro Enedino Hernandez Samaniego (2): weechat: introduce weechat recipe providing a fully working IRC client imapfilter: introduce imapfilter recipe providing a mailbox filter through the IMAP protocol Alejandro Hernandez Samaniego (1): remmina: Upgrade to version 1.4.3 Alexander Vickberg (2): tcpdump: Fix PACKAGECONFIG for OpenSSL iperf3: Add OpenSSL build option to PACKAGECONFIG Alistair Francis (2): geany-plugins: Support libgit2 version 1.0 libgit2: Update to v1.0.0 Andreas Müller (5): xfce4-notifyd: upgrade 0.6.0 -> 0.6.1 xfconf: upgrade 4.14.1 -> 4.14.2 xfwm4: upgrade 4.14.1 -> 4.14.2 qpdf: upgrade 9.1.0 -> 10.0.1 qpdf: link libatomic explicitly on mips Bartłomiej Burdukiewicz (2): pugixml: generate pkgconfig files. pugixml: add native and nativesdk BBCLASSEXTEND Claude Bing (3): php: fix PACKAGECONFIG for soap php: fix opcache link error in 7.4 php: update fix for opcache link issue in 7.4.4 Emmanuel Roullit (1): cockpit: fix metainfo.xml file ownership Gianfranco Costamagna (1): cpprest: Disable one more test requiring internet connection Gregory Vimont (1): opencv: 4.1.0 -> 4.3.0 Jonathan Liu (1): x11vnc: fix xfc NULL pointer dereference Jorge Solla (1): Cockpit: Added missing dependency on udisks2 for package cockpit-storaged Khem Raj (7): remmina: Depend on avahi instead of Avahi-ui libgit2: Enable pcre2 regexp backend con2fbmap: Add recipe xf86-input-void: Drop INC_PR nodejs: Fix build with icu 67.1 nss: Remove mcpu to avoid march conflicts pmdk: Update to 1.8 Konrad Weihmann (2): php: fix zip package config php: add multibyte string support config Leon Anavi (1): lirc: upgrade 0.9.4d -> 0.10.1 Michael Haener (1): cockpit: Add recipe version 218 Mingli Yu (10): python3-ntplib: add missing python3-io RDEPENDS python3-pid: add the missing rdepends python3-parallax: add the missing rdepends python3-pkgconfig: add missing rdepends python3-pathlib2: add the missing rdepends python3-ptyprocess: add the missing rdepends python3-pydbus: add the missing rdepends python3-pyudev: add the missing rdepends python3-zipp: add the missing rdepends gnome-themes-extra: correct the recipe name Pierre-Jean Texier (1): ccid: upgrade 1.4.31 -> 1.4.32 Rasmus Villemoes (1): libgpiod: split c++ library to its own package Sean Nyekjaer (1): gpsd: Upgrade 3.19 -> 3.20 Slater, Joseph (2): python-pretty-table: add rdep's python3-pyhamcrest: add rdep Trevor Gamblin (7): python3-py: add python3-netclient to RDEPENDS python3-markdown: add logging and setuptools to RDEPENDS python3-pyrsistent: add python3-numbers to RDEPENDS python3-pytoml: add datetime and stringold to RDEPENDS python3-dbusmock: re-add recipe and fix patch path python3-pyyaml: add python3-netclient to RDEPENDS python3-werkzeug: add python3-logging to RDEPENDS Wang Mingyu (6): mailcap: upgrade 2.1.48 -> 2.1.49 sanlock: upgrade 3.8.0 -> 3.8.1 libcgi-perl: upgrade 4.46 -> 4.47 libencode-perl: upgrade 3.05 -> 3.06 python3-idna: upgrade 2.8 -> 2.9 multipath-tools: upgrade 0.8.3 -> 0.8.4 Yi Zhao (1): nginx: remove /var/log/nginx when do_install Zang Ruochen (8): python3-parse-type: Modify ptest output format python3-pluggy: Modify ptest output format python3-polyline: Modify ptest output format python3-precise-runner: Modify ptest output format python3-prettytable: Modify ptest output format python3-ptyprocess: Modify ptest output format python3-pyasn1: Modify ptest output format python3-pyasn1-modules: Modify ptest output format Zheng Ruoqin (4): python3-pyserial: Modify ptest output format python3-pyroute2: Modify ptest output format v4l-utils: upgrade 1.18.0 -> 1.18.1 cpprest: upgrade 2.10.15 -> 2.10.16 Zong Li (1): Upgrade testfloat to 3e version. niko.mauno@vaisala.com (3): python3-setuptools-scm: Cosmetic improvement python3-setuptools-scm: Add nativesdk to BBCLASSEXTEND python3-attrs: Add nativesdk to BBCLASSEXTEND Change-Id: I696f29557eafda5f9f9d6e26525e1a5819982a4b Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/dynamic-layers')
-rw-r--r--meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch30
-rw-r--r--meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/pollfd.patch101
-rw-r--r--meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb (renamed from meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.9.4d.bb)32
-rw-r--r--meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch42
-rw-r--r--meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb1
5 files changed, 58 insertions, 148 deletions
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch
new file mode 100644
index 000000000..41353dbbd
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch
@@ -0,0 +1,30 @@
+diff --git a/configure.ac b/configure.ac
+index 58347d8..8c7fca2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,15 +77,10 @@ AC_TYPE_UINT64_T
+
+ dnl AC_TYPE_GETGROUPS seems broken on recent MacOS, so:
+ AC_MSG_CHECKING([Figure out if getgrouplist() needs gid_t or int])
+-oldcflags="$CFLAGS"
+-export CFLAGS=-Werror
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <unistd.h>
+-#include <grp.h>
+- ]], [[
+-gid_t groups[32]; int ngroups; const char* user = "root";
+-getgrouplist(user, 1, groups, &ngroups);
+- ]])],[
++int getgroups(int gidsetsize, gid_t grouplist[]);
++ ]], [[ ]])],[
+ AC_MSG_RESULT(gid_t)
+ AC_DEFINE(GETGROUPS_T,[gid_t])
+ ],[
+@@ -93,7 +88,6 @@ getgrouplist(user, 1, groups, &ngroups);
+ AC_DEFINE(GETGROUPS_T,[int])
+ ]
+ )
+-export CFLAGS="$oldcflags"
+
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(gethostname gettimeofday mkfifo select socket strdup \
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/pollfd.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/pollfd.patch
deleted file mode 100644
index 4feea8034..000000000
--- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/pollfd.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: lirc-0.9.4d/daemons/lircrcd.cpp
-===================================================================
---- lirc-0.9.4d.orig/daemons/lircrcd.cpp
-+++ lirc-0.9.4d/daemons/lircrcd.cpp
-@@ -29,10 +29,12 @@
- #include <sys/un.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <poll.h>
- #include <syslog.h>
-
- #include "lirc_client.h"
- #include "lirc/lirc_log.h"
-+#include "lirc/curl_poll.h"
-
- #define MAX_CLIENTS 100
- #define WHITE_SPACE " \t"
-Index: lirc-0.9.4d/lib/curl_poll.c
-===================================================================
---- lirc-0.9.4d.orig/lib/curl_poll.c
-+++ lirc-0.9.4d/lib/curl_poll.c
-@@ -36,6 +36,7 @@
- #include <stdlib.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <sys/poll.h>
-
- #include "lirc_log.h"
- #include "curl_poll.h"
-@@ -67,7 +68,7 @@ static const logchannel_t logchannel = L
-
- #ifdef HAVE_POLL_FINE
-
--int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms)
-+int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms)
- {
- return poll(ufds, nfds, timeout_ms);
- }
-@@ -112,7 +113,7 @@ static int verify_sock(int s)
- }
-
-
--int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms)
-+int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms)
- {
- struct timeval pending_tv;
- struct timeval* ptimeout;
-Index: lirc-0.9.4d/lib/curl_poll.h
-===================================================================
---- lirc-0.9.4d.orig/lib/curl_poll.h
-+++ lirc-0.9.4d/lib/curl_poll.h
-@@ -1,5 +1,5 @@
--#ifndef _POLL_H
--#define _POLL_H
-+#ifndef _LIB_CURL_POLL_H
-+#define _LIB_CURL_POLL_H
- /***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
-@@ -29,13 +29,9 @@
- extern "C" {
- #endif
-
--#ifdef HAVE_SYS_POLL_H
--#include <sys/poll.h>
--#else
- #include <poll.h>
--#endif
-
--int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms);
-+int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms);
-
- #ifdef __cplusplus
- }
-Index: lirc-0.9.4d/lib/lirc/curl_poll.h
-===================================================================
---- lirc-0.9.4d.orig/lib/lirc/curl_poll.h
-+++ lirc-0.9.4d/lib/lirc/curl_poll.h
-@@ -1,5 +1,5 @@
--#ifndef _POLL_H
--#define _POLL_H
-+#ifndef _LIRC_CURL_POLL_H
-+#define _LIRC_CURL_POLL_H
- /***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
-@@ -29,13 +29,9 @@
- extern "C" {
- #endif
-
--#ifdef HAVE_SYS_POLL_H
--#include <sys/poll.h>
--#else
- #include <poll.h>
--#endif
-
--int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms);
-+int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms);
-
- #ifdef __cplusplus
- }
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb
index f59969673..52d6adb56 100644
--- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.9.4d.bb
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb
@@ -6,13 +6,13 @@ DESCRIPTION_append_lirc-nslu2example = " This package contains a working config
HOMEPAGE = "http://www.lirc.org"
SECTION = "console/network"
LICENSE = "GPLv2"
-DEPENDS = "libxslt-native alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19 python3-pyyaml"
+DEPENDS = "libxslt-native alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19 python3-pyyaml python3-setuptools-native"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2 \
- file://pollfd.patch \
file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+ file://fix_build_errors.patch \
file://lircd.service \
file://lircd.init \
file://lircexec.init \
@@ -20,8 +20,8 @@ SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2 \
file://lirc_options.conf \
file://lirc.tmpfiles \
"
-SRC_URI[md5sum] = "0d11679cbdd94a5a6da00a8e7231b4bf"
-SRC_URI[sha256sum] = "c68f18c35b489b865c0a741d119b136e8702191538cd3551b977a7af6c4e41ab"
+SRC_URI[md5sum] = "86c3f8e4efaba10571addb8313d1e040"
+SRC_URI[sha256sum] = "8b753c60df2a7f5dcda2db72c38e448ca300c3b4f6000c1501fcb0bd5df414f2"
SYSTEMD_PACKAGES = "lirc lirc-exec"
SYSTEMD_SERVICE_${PN} = "lircd.service lircmd.service lircd-setup.service lircd-uinput.service"
@@ -41,7 +41,31 @@ PACKAGECONFIG ?= " \
CACHED_CONFIGUREVARS = "HAVE_WORKING_POLL=yes"
#EXTRA_OEMAKE = 'SUBDIRS="lib daemons tools"'
+
+# Ensure python-pkg/VERSION exists
+do_configure_append() {
+ cp ${S}/VERSION ${S}/python-pkg/
+}
+
+# Create PYTHON_TARBALL which LIRC needs for install-nodist_pkgdataDATA
+do_install_prepend() {
+ rm -rf ${WORKDIR}/${PN}-${PV}/python-pkg/dist/
+ mkdir ${WORKDIR}/${PN}-${PV}/python-pkg/dist/
+ tar --exclude='${WORKDIR}/${PN}-${PV}/python-pkg/*' -czf ${WORKDIR}/${PN}-${PV}/python-pkg/dist/${PN}-${PV}.tar.gz ${S}
+}
+
+# In code, path to python is a variable that is replaced with path to native version of it
+# during the configure stage, e.g ../recipe-sysroot-native/usr/bin/python3-native/python3.
+# Replace it with #!/usr/bin/env python3
do_install_append() {
+ sed -i '1c#!/usr/bin/env python3' ${D}${bindir}/lirc-setup \
+ ${D}${PYTHON_SITEPACKAGES_DIR}/lirc-setup/lirc-setup \
+ ${D}${bindir}/irtext2udp \
+ ${D}${bindir}/lirc-init-db \
+ ${D}${bindir}/irdb-get \
+ ${D}${bindir}/pronto2lirc \
+ ${D}${sbindir}/lircd-setup
+
install -m 0755 -d ${D}${sysconfdir}
install -m 0755 -d ${D}${sysconfdir}/lirc
install -m 0755 -d ${D}${systemd_unitdir}/system
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch
deleted file mode 100644
index 7a0d286e1..000000000
--- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Option '-std=gnu++14' has been supported from gcc 4.9. But on some build hosts
-such as CentOS 7.6 which only has gcc 4.8.5 and fails to configure:
-
-| checking whether the host C compiler can be used... no
-| ERROR: Only GCC 4.9 or newer is supported (found version 4.8.5).
-
-Fallback to 2011 C++ standard and lower required gcc version to 4.8.0 which is
-the same as in previous version 52.9.1 of mozjs.
-
-Upstream-Status: Inappropriate [Workaround]
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
-diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
-index 9c772a8..fc640c7 100755
---- a/build/moz.configure/toolchain.configure
-+++ b/build/moz.configure/toolchain.configure
-@@ -502,10 +502,8 @@ def check_compiler(compiler, language, target):
- append_flag('-std=c++14')
- # GCC 4.9 indicates that it implements draft C++14 features
- # instead of the full language.
-- elif info.type == 'gcc' and \
-- info.language_version not in (draft_cxx14_version,
-- cxx14_version):
-- append_flag('-std=gnu++14')
-+ elif info.type == 'gcc' and info.language_version != 201103:
-+ append_flag('-std=gnu++11')
-
- # We force clang-cl to emulate Visual C++ 2017 version 15.4
- if info.type == 'clang-cl' and info.version != '19.11.25547':
-@@ -903,9 +901,9 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
- # Check the compiler version here instead of in `compiler_version` so
- # that the `checking` message doesn't pretend the compiler can be used
- # to then bail out one line later.
-- if info.type == 'gcc' and info.version < '4.9.0':
-+ if info.type == 'gcc' and info.version < '4.8.0':
- raise FatalCheckError(
-- 'Only GCC 4.9 or newer is supported (found version %s).'
-+ 'Only GCC 4.8 or newer is supported (found version %s).'
- % info.version)
-
- if info.type == 'gcc' and host_or_target.os == 'Android':
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb
index 9466c62aa..f13a184b6 100644
--- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb
@@ -18,7 +18,6 @@ SRC_URI = " \
file://0011-To-fix-build-error-on-arm32BE.patch \
file://0012-JS_PUBLIC_API.patch \
file://0013-riscv-Disable-atomic-operations.patch \
- file://0014-fallback-to-2011-C++-standard.patch \
"
SRC_URI_append_libc-musl = " \
file://musl/0001-support-musl.patch \