summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-core
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-12-02 21:05:15 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-12-02 21:05:20 +0300
commit996bc45c6b2ab1ef612fa4710088373f1f627ea9 (patch)
tree5a16fa220483d7427ab4cec7612852a3149439dc /meta-openembedded/meta-oe/recipes-core
parent2eda1a371b06865fd2d4d84af3de14440e3bafa3 (diff)
downloadopenbmc-996bc45c6b2ab1ef612fa4710088373f1f627ea9.tar.xz
meta-openembedded: subtree update:e4ac09169d..459dbf1078
Alex Kiernan (1): leveldb: Upgrade 1.20 -> 1.22 Cengiz Can (1): recipes-support: gperftools: RDEPENDS for pprof Changqing Li (2): python3-django: upgrade 1.11.14 -> 2.2.7 python-sqlparse/python3-sqlparse: move from meta-cloud-services Christopher Larson (1): kconfig-frontends: drop unneeded target flex/bison deps Daniels Umanovskis (1): gattlib: add recipe Fabio Berton (3): mdbus2: Add recipe jpnevulator: Add recipe emlog: Add recipe Jacopo Dall'Aglio (1): python-netifaces: add recipes Khem Raj (8): packagegroup-meta-oe: Drop gperftools for mips/musl as well python-slip-dbus: Add missing rdep on six module htop: Use python3 pidgin: Use python3 mercurial: Upgrade to 5.2 and switch to py3 a2jmidid: Upgrade to release 9 pidgin: Use python3 during build tvheadend: Demand use of py3 during build Lei YU (1): googletest: Add PV and set to 1.10.0 Leon Anavi (1): stalonetray: Add a simple stand-alone system tray Li Zhou (1): libssh2: Security Advisory - libssh2 - CVE-2019-17498 Michael Haener (1): libmbim: upgrade 1.20.0 -> 1.20.2 Nicola Lunghi (2): python-configargparse: add package (version 0.15.1) python3-dbussy: add recipe (v1.2.1) Qi.Chen@windriver.com (1): python3-pid: upgrade to 2.2.5 Ross Burton (3): glmark2: upgrade to latest HEAD glmark2: use Python 3 to build jack: upgrade to 1.19.14 Ulrich Ölmann (1): python3-yarl: add missing dependencies Zang Ruochen (6): p910nd: upgrade 0.95 -> 0.97 links: upgrade 2.16 -> 2.20.2 links-x11: upgrade 2.16 -> 2.20.2 libmicrohttpd: upgrade 0.9.67 -> 0.9.68 gsoap: upgrade 2.8.51 -> 2.8.95 mksh: upgrade 56 -> 57 Zheng Ruoqin (1): libsdl: Refresh patch zhangxiao (1): syslog-ng: Fix multilib header conflict - syslog-ng-config.h Change-Id: I8557e00b893b61c10ee305fb3229db773b4b894f Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core')
-rw-r--r--meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc13
-rw-r--r--meta-openembedded/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch113
-rw-r--r--meta-openembedded/meta-oe/recipes-core/emlog/emlog/emlog.initd25
-rw-r--r--meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb22
-rw-r--r--meta-openembedded/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb12
-rw-r--r--meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb16
-rw-r--r--meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb2
7 files changed, 202 insertions, 1 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc
new file mode 100644
index 0000000000..9a0f9ba928
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "emlog is a Linux kernel module that makes it easy to access the \
+most recent (and only the most recent) output from a process"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=http"
+SRCREV = "aee53e8dee862f35291242ba41b0ca88010f6c71"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE += " \
+ CFLAGS='${TARGET_CFLAGS}' \
+"
diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch b/meta-openembedded/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch
new file mode 100644
index 0000000000..6bfc44cb85
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch
@@ -0,0 +1,113 @@
+From 41de28a92297f4cb0c5a8d7356cde9190176947b Mon Sep 17 00:00:00 2001
+From: Fabio Berton <fabio.berton@ossystems.com.br>
+Date: Thu, 14 Mar 2019 19:54:27 -0300
+Subject: [PATCH] Drop use of error.h
+Organization: O.S. Systems Software LTDA.
+
+The error.h does not work with musl and this project being embedded
+friendly it makes sense to avoid glibc-specific code.
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
+---
+ mkemlog.c | 29 ++++++++++++++---------------
+ 1 file changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/mkemlog.c b/mkemlog.c
+index e3354ed..7bcdfce 100644
+--- a/mkemlog.c
++++ b/mkemlog.c
+@@ -21,7 +21,6 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+-#include <error.h>
+ #include <errno.h>
+
+ #define EMLOG_DEVICE "/dev/emlog"
+@@ -40,16 +39,16 @@ int main(int argc, char** argv) {
+ FILE *max_size_file = NULL;
+ uid_t uid = -1;
+ if (argc < 2 || argc > 5) {
+- error(1 ,0, USAGE);
++ fprintf(stderr, USAGE);
+ }
+ file = argv[1];
+
+ max_size_file = fopen("/sys/module/emlog/parameters/emlog_max_size", "r");
+ if (max_size_file == NULL)
+- error(1, errno, "Emlog module not loaded\n");
++ fprintf(stderr, "Emlog module not loaded\n");
+ rc = fscanf(max_size_file, "%d", &emlog_max_size);
+ if (rc != 1)
+- error(1, errno, "Unable to get emlog max size\n");
++ fprintf(stderr, "Unable to get emlog max size\n");
+ fclose(max_size_file);
+ max_size_file = NULL;
+ if (argc > 2 ) {
+@@ -57,13 +56,13 @@ int main(int argc, char** argv) {
+ number = argv[2];
+ size_of_buffer = strtol(number, &end_of_number, 10);
+ if (errno) {
+- error(1, errno, "Invalid size provided\n" USAGE);
++ fprintf(stderr, "Invalid size provided\n" USAGE);
+ }
+ if (end_of_number == number) {
+- error(1, 0, "Invalid size provided\n" USAGE);
++ fprintf(stderr, "Invalid size provided\n" USAGE);
+ }
+ if (size_of_buffer < 1 || size_of_buffer > emlog_max_size) {
+- error(1, 0, "Invalid size provided must be a value between 1 and %d\n" USAGE, emlog_max_size);
++ fprintf(stderr, "Invalid size provided must be a value between 1 and %d\n" USAGE, emlog_max_size);
+ }
+ }
+ if (argc > 3 ) {
+@@ -71,10 +70,10 @@ int main(int argc, char** argv) {
+ number = argv[3];
+ mode = strtol(number, &end_of_number, 8);
+ if (errno) {
+- error(1, errno, "Invalid mode provided\n" USAGE);
++ fprintf(stderr, "Invalid mode provided\n" USAGE);
+ }
+ if (end_of_number == number || S_IFMT & mode) {
+- error(1, 0, "Invalid mode provided\n" USAGE);
++ fprintf(stderr, "Invalid mode provided\n" USAGE);
+ }
+ }
+ if (argc > 4 ) {
+@@ -82,27 +81,27 @@ int main(int argc, char** argv) {
+ number = argv[4];
+ uid = strtol(number, &end_of_number, 10);
+ if (errno) {
+- error(1, errno, "Invalid uid provided\n" USAGE);
++ fprintf(stderr, "Invalid uid provided\n" USAGE);
+ }
+ if (end_of_number == number) {
+- error(1, 0, "Invalid uid provided\n" USAGE);
++ fprintf(stderr, "Invalid uid provided\n" USAGE);
+ }
+ }
+ rc = stat(EMLOG_DEVICE, &emlog_stat);
+ if (rc == -1) {
+- error(1, errno, "stat: " EMLOG_DEVICE);
++ fprintf(stderr, "stat: " EMLOG_DEVICE);
+ }
+ if (!S_ISCHR(emlog_stat.st_mode)) {
+- error(1, 0, EMLOG_DEVICE " is not a valid emlog device\n");
++ fprintf(stderr, EMLOG_DEVICE " is not a valid emlog device\n");
+ }
+ rc = mknod(file, mode | S_IFCHR, makedev(major(emlog_stat.st_rdev),size_of_buffer));
+ if (rc == -1) {
+- error(1, errno, "mknod: %s", file);
++ fprintf(stderr, "mknod: %s", file);
+ }
+ if (uid != -1) {
+ rc = chown(file, uid, -1);
+ if (rc == -1) {
+- error(1, errno, "chown: %s", file);
++ fprintf(stderr, "chown: %s", file);
+ }
+ }
+ printf("Log device %s created with buffer size of %d KiB\n", file, size_of_buffer);
+--
+2.20.1
diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog/emlog.initd b/meta-openembedded/meta-oe/recipes-core/emlog/emlog/emlog.initd
new file mode 100644
index 0000000000..361cf8029e
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog/emlog.initd
@@ -0,0 +1,25 @@
+#!/bin/sh
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+[ -r /etc/default/emlog ] && . /etc/default/emlog
+
+do_start() {
+ :
+}
+
+do_stop() {
+ nbcat /dev/emlog > /data/emlog
+}
+
+case "$1" in
+ start)
+ do_start || exit $?
+ ;;
+ stop)
+ do_stop || exit $?
+ ;;
+ *)
+ echo "Usage: $0 {stop}" >&2
+ exit 3
+ ;;
+esac
diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb b/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb
new file mode 100644
index 0000000000..63d12477bf
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb
@@ -0,0 +1,22 @@
+require ${BPN}.inc
+
+SRC_URI += "file://${BPN}.initd"
+
+SRC_URI_append_libc-musl = " file://Drop-use-of-error-h.patch"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "${BPN}"
+
+do_compile() {
+ oe_runmake nbcat
+ oe_runmake mkemlog
+}
+
+do_install() {
+ install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/${BPN}
+ install -Dm 0755 ${S}/nbcat ${D}${bindir}/nbcat
+ install -Dm 0755 ${S}/mkemlog ${D}${bindir}/mkemlog
+}
+
+RDEPENDS_${PN} += "kernel-module-emlog"
diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb b/meta-openembedded/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb
new file mode 100644
index 0000000000..51f7226ebd
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb
@@ -0,0 +1,12 @@
+require emlog.inc
+
+inherit module
+
+EXTRA_OEMAKE += " \
+ KDIR=${STAGING_KERNEL_DIR} \
+ KVER=${KERNEL_VERSION} \
+"
+
+do_compile() {
+ oe_runmake modules
+}
diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
new file mode 100644
index 0000000000..82f2cf8c94
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Mickey's DBus Introspection and Interaction Utility V2"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07"
+
+DEPENDS = "readline"
+
+PV = "2.3.3+git${SRCPV}"
+
+SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http"
+SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa"
+
+S = "${WORKDIR}/git"
+
+inherit autotools vala
+
+EXTRA_OECONF += "--enable-vala"
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 1f0a7b9470..310de53726 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
@@ -257,7 +257,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\
"
RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl"
-RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch_libc-glibc = "gperftools"
+RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch = "gperftools"
RDEPENDS_packagegroup-meta-oe-support-egl ="\
freerdp libnice opencv \