diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
91 files changed, 2012 insertions, 1152 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch new file mode 100644 index 000000000..3dee34cd0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch @@ -0,0 +1,98 @@ +From 090a17ca338a9311d682ecc5933b32bff67cf07f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 Jul 2019 14:20:14 -0700 +Subject: [PATCH] Remove including sys/sysctl.h on glibc based systems + +Glibc 2.30 has added deprecation notice and collectd detects it as warning [1] + +Fixes +sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and will be removed." [-Werror,-W#warnings] + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990 + +Upstream-Status: Submitted [https://github.com/collectd/collectd/pull/3234] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/contextswitch.c | 2 +- + src/memory.c | 2 +- + src/swap.c | 2 +- + src/uuid.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +--- a/src/contextswitch.c ++++ b/src/contextswitch.c +@@ -26,7 +26,7 @@ + #include "common.h" + #include "plugin.h" + +-#ifdef HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + +--- a/src/memory.c ++++ b/src/memory.c +@@ -28,7 +28,7 @@ + #include "common.h" + #include "plugin.h" + +-#ifdef HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + #ifdef HAVE_SYS_VMMETER_H +--- a/src/swap.c ++++ b/src/swap.c +@@ -49,7 +49,7 @@ + #if HAVE_SYS_PARAM_H + #include <sys/param.h> + #endif +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + #if HAVE_SYS_DKSTAT_H +--- a/src/uuid.c ++++ b/src/uuid.c +@@ -29,7 +29,7 @@ + #include "common.h" + #include "plugin.h" + +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + +--- a/src/cpu.c ++++ b/src/cpu.c +@@ -60,7 +60,7 @@ + + #if (defined(HAVE_SYSCTL) && HAVE_SYSCTL) || \ + (defined(HAVE_SYSCTLBYNAME) && HAVE_SYSCTLBYNAME) +-#ifdef HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + +--- a/src/processes.c ++++ b/src/processes.c +@@ -82,7 +82,7 @@ + #if HAVE_MACH_VM_PROT_H + #include <mach/vm_prot.h> + #endif +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + /* #endif HAVE_THREAD_INFO */ +--- a/src/uptime.c ++++ b/src/uptime.c +@@ -33,7 +33,7 @@ + */ + /* #endif HAVE_LIBKSTAT */ + +-#elif HAVE_SYS_SYSCTL_H ++#elif defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + /* Using sysctl interface to retrieve the boot time on *BSD / Darwin / OS X + * systems */ diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb index 6dff18c16..0951ac076 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb @@ -14,6 +14,7 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://0005-Disable-new-gcc8-warnings.patch \ file://0006-libcollectdclient-Fix-string-overflow-errors.patch \ + file://0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch \ " SRC_URI[md5sum] = "bfce96c42cede5243028510bcc57c1e6" SRC_URI[sha256sum] = "e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da" diff --git a/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb b/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb index 2df7db9e8..52bd11b1a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz" -SRC_URI[md5sum] = "49c845ed89d25b534842e40366154cb4" -SRC_URI[sha256sum] = "09857b2e8074813ac19da5d262890f722e5f7900e521a4c60354cef95eea10a7" +SRC_URI[md5sum] = "8ac89f833c0df221723e33b447e230fe" +SRC_URI[sha256sum] = "4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087" # This isn't already added by base.bbclass do_unpack[depends] += "lzip-native:do_populate_sysroot" @@ -42,4 +42,3 @@ do_install () { rm -f ${D}${infodir}/dir fi } - diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20180621.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb index e98795944..d414bc683 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20180621.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " -SRC_URI[md5sum] = "1dba09cf45ac4ba40b3cb4a3f1d694b2" -SRC_URI[sha256sum] = "4a4859e2b22d24e46c1a529b5a5605b95503aa04da4432f7bbd713e3e867587a" +SRC_URI[md5sum] = "e9d7f8b5e7b17183b0fb9297c0f57840" +SRC_URI[sha256sum] = "e5eb0eaaef9cae8c822887bd998e33c2c3b94ebadd37b4f6aba018c0194a2a87" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch new file mode 100644 index 000000000..d4c776569 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch @@ -0,0 +1,31 @@ +From a47ca75702318ff43446c70120f7aacde4ccee1b Mon Sep 17 00:00:00 2001 +From: Eero Aaltonen <eero.aaltonen@vaisala.com> +Date: Thu, 20 Jun 2019 16:21:20 +0300 +Subject: [PATCH] Set library VERSION and SOVERSION + +With soversion and version specified, `install` target will install the +library with the specified version and also create the proper symlink. + +Upstream-Status: Submitted [https://github.com/docopt/docopt.cpp/pull/112] +but unlikely to be merged soon as it is a duplicate of +[https://github.com/docopt/docopt.cpp/pull/112] which has been **Open** +since 2016-12-08. +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23da468..feff32e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,6 +50,10 @@ else() + set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE) + + add_library(docopt SHARED $<TARGET_OBJECTS:docopt_o>) ++ set_target_properties(docopt PROPERTIES ++ VERSION ${PROJECT_VERSION} ++ SOVERSION ${PROJECT_VERSION_MAJOR} ++ ) + add_library(docopt_s STATIC $<TARGET_OBJECTS:docopt_o>) + endif() + diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb new file mode 100644 index 000000000..aa55ebf84 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb @@ -0,0 +1,27 @@ +SUMMARY = "C++11 port of docopt command-line interface description language and parser" + +DESCRIPTION = "docopt is library that lets you define a command line interface with the \ +utility argument syntax that has been used by command line utilities for \ +decades (formalized in POSIX.1-2017). From the description, docopt \ +automatically generates a parser for the command line arguments." + +HOMEPAGE = "https://github.com/docopt/docopt.cpp" + +LICENSE = "MIT | BSL-1.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE-Boost-1.0;md5=e4224ccaecb14d942c71d31bef20d78c \ + file://LICENSE-MIT;md5=4b242fd9ef20207e18286d73da8a6677 \ +" + +DEPENDS = "boost" +SRCREV = "3dd23e3280f213bacefdf5fcb04857bf52e90917" +PV = "0.6.2+git${SRCPV}" + +SRC_URI = "\ + git://github.com/docopt/docopt.cpp.git;protocol=https \ + file://0001-Set-library-VERSION-and-SOVERSION.patch \ +" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.2.bb index e1a6d9508..09eab9dcd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.2.bb @@ -3,9 +3,9 @@ HOMEPAGE = "https://github.com/Yelp/dumb-init/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c" -SRC_URI = "https://github.com/Yelp/dumb-init/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "4eb7f43d7823686723ff7ac1bad097cb" -SRC_URI[sha256sum] = "74486997321bd939cad2ee6af030f481d39751bc9aa0ece84ed55f864e309a3f" +SRCREV = "b1e978e486114797347deefcc03ab12629a13cc3" +SRC_URI = "git://github.com/Yelp/dumb-init" +S = "${WORKDIR}/git" EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'" diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch deleted file mode 100644 index 5b68f1966..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch +++ /dev/null @@ -1,20 +0,0 @@ -Some ARM cpus does not report the cache size or say it is -1 - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=866306 - -Upstream-status: Pending - -Index: haveged-1.9.2/src/havegetune.c -=================================================================== ---- haveged-1.9.2.orig/src/havegetune.c -+++ haveged-1.9.2/src/havegetune.c -@@ -795,6 +795,9 @@ static int vfs_configInfoCache( - ctype = vfs_configFile(pAnchor, path, vfs_configType); - strcpy(path+plen, "size"); - size = vfs_configFile(pAnchor, path, vfs_configInt); -+ if (size == -1) { -+ size = ctype == 'I' ? GENERIC_ICACHE : GENERIC_DCACHE; -+ } - cfg_cacheAdd(pAnchor, SRC_VFS_INDEX, pArgs[1], level, ctype, size); - } - } diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch deleted file mode 100644 index 020ac2c3b..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b04eeea777df32364df74bd63fc5b7fb05d21c8d Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Tue, 27 Mar 2018 10:21:09 +0800 -Subject: [PATCH] init.d/Makefile.am: add missing dependency - -install-data-hook should depend on install-exec-hook, or the -haveged.service might be installed incorrectly when build -with -j option. - -Upstream-Status: Submitted [https://github.com/jirka-h/haveged/pull/13] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> -Signed-off-by: Khem Raj raj.khem@gmail.com ---- - init.d/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index 5940f78..07bcdf7 100644 ---- a/init.d/Makefile.am -+++ b/init.d/Makefile.am -@@ -33,7 +33,7 @@ if ENABLE_SYSTEMD - install-exec-hook: - $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; - --install-data-hook: -+install-data-hook: install-exec-hook - if ENABLE_SYSTEMD_LOOKUP - install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; - else --- -2.11.0 diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb index d0e1a29dd..0189e19c0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb @@ -5,11 +5,9 @@ HOMEPAGE = "http://www.issihosts.com/haveged/index.html" LICENSE = "GPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -# v1.9.4 -SRCREV = "faa40ff345af194d3253f5fb030403e3c9831c36" +# v1.9.6 +SRCREV = "1470a82a7f79110c79beea1ca5f2d3b0fd1a4668" SRC_URI = "git://github.com/jirka-h/haveged.git \ - file://haveged-init.d-Makefile.am-add-missing-dependency.patch \ - file://fix-cpu-cache-size-detection.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb index 1f1e80ce8..77c995b57 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb @@ -41,6 +41,7 @@ EXTRA_OECONF += "\ PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal" RDEPENDS_${PN} += " \ + python \ python-syslog \ python-pprint \ python-compression \ diff --git a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb index 4f5b248c4..7231484fe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb @@ -8,8 +8,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" SRC_URI = "https://www.open-mpi.org/software/${BPN}/v1.11/downloads/${BP}.tar.bz2" -SRC_URI[md5sum] = "c2a2e4e23eeb719ed31a755684697cf9" -SRC_URI[sha256sum] = "ddfb7b9b4571551165b0fd824a340e58814c8c2b4af64c818579d4bc695a417d" +SRC_URI[md5sum] = "3c792e23c209e9e1bafe9bdbc613d401" +SRC_URI[sha256sum] = "a4494b7765f517c0990d1c7f09d98cb87755bb6b841e4e2cbfebca1b14bac9c8" UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v1.11/" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch new file mode 100644 index 000000000..794394855 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch @@ -0,0 +1,37 @@ +From c2a67c1f62175ab061bc03d10dd766f968c6a097 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Fri, 2 Aug 2019 10:41:26 +0800 +Subject: [PATCH] configure.ac: skip running test program when cross-compiling + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c5e3ca03..4b89396a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -140,7 +140,7 @@ AC_CHECK_FUNC([getloadavg],[AC_DEFINE([HAVE_GETLOADAVG2], 1, [getloadavg() is av + AC_FUNC_SELECT_ARGTYPES + + AC_MSG_CHECKING([for strlcpy]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ + char a[2]; + if (strlcpy(a, "yes", 2) != 3) + return 1;]])], +@@ -156,7 +156,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ + ]) + + AC_MSG_CHECKING([for strlcat]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ + char a[4] = "no"; + if (strlcat(a, "yes", 4) != 5) + return 1;]])], +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb new file mode 100644 index 000000000..63fca1dd1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Ice Window Manager (IceWM)" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" + +SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ + file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ + " +SRC_URI[md5sum] = "6eba94a7935a0531d2c14eeb1426aeef" +SRC_URI[sha256sum] = "f1c1344b20a9e8635143f70ee27930b55f813c15ca61f84d77584d311b6ac027" + +inherit autotools pkgconfig gettext perlnative distro_features_check qemu +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ + --with-cfgdir=${sysconfdir}/icewm \ + --with-docdir=${docdir}/icewm \ + --enable-fribidi \ + --enable-xinerama \ + --enable-shape" + +DEPENDS = "asciidoc-native fontconfig gdk-pixbuf libxft libxpm libxrandr libxinerama libice libsm libx11 libxext libxrender" +DEPENDS_append = " qemu-native" +RDEPENDS_${PN} = "perl fribidi" + +do_compile_prepend_class-target() { + + cd ${B} + oe_runmake -C src genpref + + qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" + cat >qemuwrapper <<EOF +#!/bin/sh +${qemu_binary} src/genpref "\$@" +EOF + chmod +x qemuwrapper + ./qemuwrapper > src/preferences +} + +FILES_${PN} += "${datadir}/xsessions" diff --git a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb index 94643cd24..b01d7f64e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb @@ -24,4 +24,4 @@ do_install_append() { RDEPENDS_${PN} = "python-curses python-textutils \ python-codecs python-ctypes python-pprint \ - python-shell python-subprocess" + python-shell python-subprocess python-core" diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb index 83e838580..b7899a11b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb @@ -2,7 +2,7 @@ SUMMARY = "Tools for taking the MD5 sum of ISO images" DESCRIPTION = "Tools for taking the MD5 sum of ISO images" DEPENDS = "popt python3 openssl curl popt-native" -RDEPENDS_${PN} = "openssl curl" +RDEPENDS_${BPN} = "openssl curl" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" @@ -25,11 +25,11 @@ do_install () { oe_runmake install } -PACKAGES += "${PYTHON_PN}-${PN}" +PACKAGES += "${PYTHON_PN}-${BPN}" -RPROVIDES_${PN}-dbg += "${PYTHON_PN}-${PN}-dbg" +RPROVIDES_${BPN}-dbg += "${PYTHON_PN}-${BPN}-dbg" -FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" +FILES_${PYTHON_PN}-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" SRCREV = "7860901f726f5d92689cb67243cc7f981f21f74b" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb index 54a188dc8..761619d9a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb @@ -8,20 +8,20 @@ SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" -inherit autotools python3native gobject-introspection +inherit autotools gobject-introspection -SRCREV = "cb308566c3c5222b8422f78997a1742713b265a9" +SRCREV = "f5d2458e9e52d8c55b609ae8cf46ef0673b4a02a" SRC_URI = " \ git://github.com/rhinstaller/libblockdev;branch=master \ " S = "${WORKDIR}/git" -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.7/site-packages" PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" +PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python" PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb index 26664255d..eaf6b9b43 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb @@ -22,7 +22,7 @@ inherit cmake pkgconfig # Put client tools into a separate package PACKAGE_BEFORE_PN += "${PN}-tools" FILES_${PN}-tools = "${bindir}" -RDEPENDS_${PN}-tools = "python3-${BPN}" +RDEPENDS_${PN}-tools = "python3-${BPN} python3-core" # Create the wrapper for python3 PACKAGES += "python3-${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb new file mode 100644 index 000000000..1e35f08c0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "A cross-platform, lightweight Modbus RTU library" +DESCRIPTION = "liblightmodbus is a very lightweight, highly configurable, \ + platform-independent Modbus RTU library." + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +inherit cmake pkgconfig + +SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https" +SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81" + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch new file mode 100644 index 000000000..5372a23b6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch @@ -0,0 +1,314 @@ +From: =?utf-8?b?IlNaIExpbiAo5p6X5LiK5pm6KSI=?= <szlin@debian.org> +Date: Wed, 19 Dec 2018 10:24:47 +0800 +Subject: Fix float endianness issue on big endian arch + +It converts float values depending on what order they come in. + +This patch was modified from rm5248 [1] + +[1] https://github.com/synexxus/libmodbus/commit/a511768e7fe7ec52d7bae1d9ae04e33f87a59627 + +--- + src/modbus-data.c | 110 ++++++++++++++++++++++++++++++++++++++--------- + tests/unit-test-client.c | 22 ++++++---- + tests/unit-test.h.in | 41 ++++++++++++++++-- + 3 files changed, 141 insertions(+), 32 deletions(-) + +diff --git a/src/modbus-data.c b/src/modbus-data.c +index 902b8c6..7a744fa 100644 +--- a/src/modbus-data.c ++++ b/src/modbus-data.c +@@ -119,9 +119,18 @@ float modbus_get_float_abcd(const uint16_t *src) + { + float f; + uint32_t i; ++ uint8_t a, b, c, d; + +- i = ntohl(((uint32_t)src[0] << 16) + src[1]); +- memcpy(&f, &i, sizeof(float)); ++ a = (src[0] >> 8) & 0xFF; ++ b = (src[0] >> 0) & 0xFF; ++ c = (src[1] >> 8) & 0xFF; ++ d = (src[1] >> 0) & 0xFF; ++ ++ i = (a << 24) | ++ (b << 16) | ++ (c << 8) | ++ (d << 0); ++ memcpy(&f, &i, 4); + + return f; + } +@@ -131,9 +140,18 @@ float modbus_get_float_dcba(const uint16_t *src) + { + float f; + uint32_t i; ++ uint8_t a, b, c, d; + +- i = ntohl(bswap_32((((uint32_t)src[0]) << 16) + src[1])); +- memcpy(&f, &i, sizeof(float)); ++ a = (src[0] >> 8) & 0xFF; ++ b = (src[0] >> 0) & 0xFF; ++ c = (src[1] >> 8) & 0xFF; ++ d = (src[1] >> 0) & 0xFF; ++ ++ i = (d << 24) | ++ (c << 16) | ++ (b << 8) | ++ (a << 0); ++ memcpy(&f, &i, 4); + + return f; + } +@@ -143,9 +161,18 @@ float modbus_get_float_badc(const uint16_t *src) + { + float f; + uint32_t i; ++ uint8_t a, b, c, d; + +- i = ntohl((uint32_t)(bswap_16(src[0]) << 16) + bswap_16(src[1])); +- memcpy(&f, &i, sizeof(float)); ++ a = (src[0] >> 8) & 0xFF; ++ b = (src[0] >> 0) & 0xFF; ++ c = (src[1] >> 8) & 0xFF; ++ d = (src[1] >> 0) & 0xFF; ++ ++ i = (b << 24) | ++ (a << 16) | ++ (d << 8) | ++ (c << 0); ++ memcpy(&f, &i, 4); + + return f; + } +@@ -155,9 +182,18 @@ float modbus_get_float_cdab(const uint16_t *src) + { + float f; + uint32_t i; ++ uint8_t a, b, c, d; + +- i = ntohl((((uint32_t)src[1]) << 16) + src[0]); +- memcpy(&f, &i, sizeof(float)); ++ a = (src[0] >> 8) & 0xFF; ++ b = (src[0] >> 0) & 0xFF; ++ c = (src[1] >> 8) & 0xFF; ++ d = (src[1] >> 0) & 0xFF; ++ ++ i = (c << 24) | ++ (d << 16) | ++ (a << 8) | ++ (b << 0); ++ memcpy(&f, &i, 4); + + return f; + } +@@ -172,50 +208,84 @@ float modbus_get_float(const uint16_t *src) + memcpy(&f, &i, sizeof(float)); + + return f; ++ + } + + /* Set a float to 4 bytes for Modbus w/o any conversion (ABCD) */ + void modbus_set_float_abcd(float f, uint16_t *dest) + { + uint32_t i; ++ uint8_t *out = (uint8_t*) dest; ++ uint8_t a, b, c, d; + + memcpy(&i, &f, sizeof(uint32_t)); +- i = htonl(i); +- dest[0] = (uint16_t)(i >> 16); +- dest[1] = (uint16_t)i; ++ a = (i >> 24) & 0xFF; ++ b = (i >> 16) & 0xFF; ++ c = (i >> 8) & 0xFF; ++ d = (i >> 0) & 0xFF; ++ ++ out[0] = a; ++ out[1] = b; ++ out[2] = c; ++ out[3] = d; + } + + /* Set a float to 4 bytes for Modbus with byte and word swap conversion (DCBA) */ + void modbus_set_float_dcba(float f, uint16_t *dest) + { + uint32_t i; ++ uint8_t *out = (uint8_t*) dest; ++ uint8_t a, b, c, d; + + memcpy(&i, &f, sizeof(uint32_t)); +- i = bswap_32(htonl(i)); +- dest[0] = (uint16_t)(i >> 16); +- dest[1] = (uint16_t)i; ++ a = (i >> 24) & 0xFF; ++ b = (i >> 16) & 0xFF; ++ c = (i >> 8) & 0xFF; ++ d = (i >> 0) & 0xFF; ++ ++ out[0] = d; ++ out[1] = c; ++ out[2] = b; ++ out[3] = a; ++ + } + + /* Set a float to 4 bytes for Modbus with byte swap conversion (BADC) */ + void modbus_set_float_badc(float f, uint16_t *dest) + { + uint32_t i; ++ uint8_t *out = (uint8_t*) dest; ++ uint8_t a, b, c, d; + + memcpy(&i, &f, sizeof(uint32_t)); +- i = htonl(i); +- dest[0] = (uint16_t)bswap_16(i >> 16); +- dest[1] = (uint16_t)bswap_16(i & 0xFFFF); ++ a = (i >> 24) & 0xFF; ++ b = (i >> 16) & 0xFF; ++ c = (i >> 8) & 0xFF; ++ d = (i >> 0) & 0xFF; ++ ++ out[0] = b; ++ out[1] = a; ++ out[2] = d; ++ out[3] = c; + } + + /* Set a float to 4 bytes for Modbus with word swap conversion (CDAB) */ + void modbus_set_float_cdab(float f, uint16_t *dest) + { + uint32_t i; ++ uint8_t *out = (uint8_t*) dest; ++ uint8_t a, b, c, d; + + memcpy(&i, &f, sizeof(uint32_t)); +- i = htonl(i); +- dest[0] = (uint16_t)i; +- dest[1] = (uint16_t)(i >> 16); ++ a = (i >> 24) & 0xFF; ++ b = (i >> 16) & 0xFF; ++ c = (i >> 8) & 0xFF; ++ d = (i >> 0) & 0xFF; ++ ++ out[0] = c; ++ out[1] = d; ++ out[2] = a; ++ out[3] = b; + } + + /* DEPRECATED - Set a float to 4 bytes in a sort of Modbus format! */ +diff --git a/tests/unit-test-client.c b/tests/unit-test-client.c +index 3e315f4..3fccf3e 100644 +--- a/tests/unit-test-client.c ++++ b/tests/unit-test-client.c +@@ -27,6 +27,7 @@ int send_crafted_request(modbus_t *ctx, int function, + uint16_t max_value, uint16_t bytes, + int backend_length, int backend_offset); + int equal_dword(uint16_t *tab_reg, const uint32_t value); ++int is_memory_equal(const void *s1, const void *s2, size_t size); + + #define BUG_REPORT(_cond, _format, _args ...) \ + printf("\nLine %d: assertion error for '%s': " _format "\n", __LINE__, # _cond, ## _args) +@@ -40,6 +41,11 @@ int equal_dword(uint16_t *tab_reg, const uint32_t value); + } \ + }; + ++int is_memory_equal(const void *s1, const void *s2, size_t size) ++{ ++ return (memcmp(s1, s2, size) == 0); ++} ++ + int equal_dword(uint16_t *tab_reg, const uint32_t value) { + return ((tab_reg[0] == (value >> 16)) && (tab_reg[1] == (value & 0xFFFF))); + } +@@ -286,26 +292,26 @@ int main(int argc, char *argv[]) + /** FLOAT **/ + printf("1/4 Set/get float ABCD: "); + modbus_set_float_abcd(UT_REAL, tab_rp_registers); +- ASSERT_TRUE(equal_dword(tab_rp_registers, UT_IREAL_ABCD), "FAILED Set float ABCD"); +- real = modbus_get_float_abcd(tab_rp_registers); ++ ASSERT_TRUE(is_memory_equal(tab_rp_registers, UT_IREAL_ABCD_SET, 4), "FAILED Set float ABCD"); ++ real = modbus_get_float_abcd(UT_IREAL_ABCD_GET); + ASSERT_TRUE(real == UT_REAL, "FAILED (%f != %f)\n", real, UT_REAL); + + printf("2/4 Set/get float DCBA: "); + modbus_set_float_dcba(UT_REAL, tab_rp_registers); +- ASSERT_TRUE(equal_dword(tab_rp_registers, UT_IREAL_DCBA), "FAILED Set float DCBA"); +- real = modbus_get_float_dcba(tab_rp_registers); ++ ASSERT_TRUE(is_memory_equal(tab_rp_registers, UT_IREAL_DCBA_SET, 4), "FAILED Set float DCBA"); ++ real = modbus_get_float_dcba(UT_IREAL_DCBA_GET); + ASSERT_TRUE(real == UT_REAL, "FAILED (%f != %f)\n", real, UT_REAL); + + printf("3/4 Set/get float BADC: "); + modbus_set_float_badc(UT_REAL, tab_rp_registers); +- ASSERT_TRUE(equal_dword(tab_rp_registers, UT_IREAL_BADC), "FAILED Set float BADC"); +- real = modbus_get_float_badc(tab_rp_registers); ++ ASSERT_TRUE(is_memory_equal(tab_rp_registers, UT_IREAL_BADC_SET, 4), "FAILED Set float BADC"); ++ real = modbus_get_float_badc(UT_IREAL_BADC_GET); + ASSERT_TRUE(real == UT_REAL, "FAILED (%f != %f)\n", real, UT_REAL); + + printf("4/4 Set/get float CDAB: "); + modbus_set_float_cdab(UT_REAL, tab_rp_registers); +- ASSERT_TRUE(equal_dword(tab_rp_registers, UT_IREAL_CDAB), "FAILED Set float CDAB"); +- real = modbus_get_float_cdab(tab_rp_registers); ++ ASSERT_TRUE(is_memory_equal(tab_rp_registers, UT_IREAL_CDAB_SET, 4), "FAILED Set float CDAB"); ++ real = modbus_get_float_cdab(UT_IREAL_CDAB_GET); + ASSERT_TRUE(real == UT_REAL, "FAILED (%f != %f)\n", real, UT_REAL); + + printf("\nAt this point, error messages doesn't mean the test has failed\n"); +diff --git a/tests/unit-test.h.in b/tests/unit-test.h.in +index dca826f..4ffa254 100644 +--- a/tests/unit-test.h.in ++++ b/tests/unit-test.h.in +@@ -56,12 +56,45 @@ const uint16_t UT_INPUT_REGISTERS_ADDRESS = 0x108; + const uint16_t UT_INPUT_REGISTERS_NB = 0x1; + const uint16_t UT_INPUT_REGISTERS_TAB[] = { 0x000A }; + ++/* ++ * This float value is 0x47F12000 (in big-endian format). ++ * In Little-endian(intel) format, it will be stored in memory as follows: ++ * 0x00 0x20 0xF1 0x47 ++ * ++ * You can check this with the following code: ++ ++ float fl = UT_REAL; ++ uint8_t *inmem = (uint8_t*)&fl; ++ int x; ++ for(x = 0; x < 4; x++){ ++ printf("0x%02X ", inmem[ x ]); ++ } ++ printf("\n"); ++ */ + const float UT_REAL = 123456.00; + +-const uint32_t UT_IREAL_ABCD = 0x0020F147; +-const uint32_t UT_IREAL_DCBA = 0x47F12000; +-const uint32_t UT_IREAL_BADC = 0x200047F1; +-const uint32_t UT_IREAL_CDAB = 0xF1470020; ++/* ++ * The following arrays assume that 'A' is the MSB, ++ * and 'D' is the LSB. ++ * Thus, the following is the case: ++ * A = 0x47 ++ * B = 0xF1 ++ * C = 0x20 ++ * D = 0x00 ++ * ++ * There are two sets of arrays: one to test that the setting is correct, ++ * the other to test that the getting is correct. ++ * Note that the 'get' values must be constants in processor-endianness, ++ * as libmodbus will convert all words to processor-endianness as they come in. ++ */ ++const uint8_t UT_IREAL_ABCD_SET[] = {0x47, 0xF1, 0x20, 0x00}; ++const uint16_t UT_IREAL_ABCD_GET[] = {0x47F1, 0x2000}; ++const uint8_t UT_IREAL_DCBA_SET[] = {0x00, 0x20, 0xF1, 0x47}; ++const uint16_t UT_IREAL_DCBA_GET[] = {0x0020, 0xF147}; ++const uint8_t UT_IREAL_BADC_SET[] = {0xF1, 0x47, 0x00, 0x20}; ++const uint16_t UT_IREAL_BADC_GET[] = {0xF147, 0x0020}; ++const uint8_t UT_IREAL_CDAB_SET[] = {0x20, 0x00, 0x47, 0xF1}; ++const uint16_t UT_IREAL_CDAB_GET[] = {0x2000, 0x47F1}; + + /* const uint32_t UT_IREAL_ABCD = 0x47F12000); + const uint32_t UT_IREAL_DCBA = 0x0020F147; diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch new file mode 100644 index 000000000..384a4a40b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch @@ -0,0 +1,52 @@ +From: =?utf-8?b?IlNaIExpbiAo5p6X5LiK5pm6KSI=?= <szlin@debian.org> +Date: Thu, 27 Sep 2018 14:51:32 +0800 +Subject: Fix typo + +--- + doc/modbus_mapping_new_start_address.txt | 4 ++-- + doc/modbus_reply.txt | 2 +- + doc/modbus_reply_exception.txt | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/modbus_mapping_new_start_address.txt b/doc/modbus_mapping_new_start_address.txt +index 4fa196a..94a81fb 100644 +--- a/doc/modbus_mapping_new_start_address.txt ++++ b/doc/modbus_mapping_new_start_address.txt +@@ -21,9 +21,9 @@ The _modbus_mapping_new_start_address()_ function shall allocate four arrays to + store bits, input bits, registers and inputs registers. The pointers are stored + in modbus_mapping_t structure. All values of the arrays are initialized to zero. + +-The different starting adresses make it possible to place the mapping at any ++The different starting addresses make it possible to place the mapping at any + address in each address space. This way, you can give access to values stored +-at high adresses without allocating memory from the address zero, for eg. to ++at high addresses without allocating memory from the address zero, for eg. to + make available registers from 10000 to 10009, you can use: + + [source,c] +diff --git a/doc/modbus_reply.txt b/doc/modbus_reply.txt +index 0b29d6f..6b71d11 100644 +--- a/doc/modbus_reply.txt ++++ b/doc/modbus_reply.txt +@@ -3,7 +3,7 @@ modbus_reply(3) + + NAME + ---- +-modbus_reply - send a reponse to the received request ++modbus_reply - send a response to the received request + + + SYNOPSIS +diff --git a/doc/modbus_reply_exception.txt b/doc/modbus_reply_exception.txt +index 7e6324f..b2170be 100644 +--- a/doc/modbus_reply_exception.txt ++++ b/doc/modbus_reply_exception.txt +@@ -3,7 +3,7 @@ modbus_reply_exception(3) + + NAME + ---- +-modbus_reply_exception - send an exception reponse ++modbus_reply_exception - send an exception response + + + SYNOPSIS diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch new file mode 100644 index 000000000..7fae34e7d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch @@ -0,0 +1,32 @@ +From f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d Mon Sep 17 00:00:00 2001 +From: i-ky <gl.ivanovsky@gmail.com> +Date: Tue, 10 Jul 2018 15:58:45 +0300 +Subject: [PATCH] Fixed MODBUS_GET_* macros in case of negative values + +In case resulting value should be negative it is incorrect to use '+' operator to construct it from pieces, because highest bytes will result in negative number after bitwise shift while others will stay positive. Replacing addition with '|' should solve the issue. +--- + src/modbus.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/modbus.h b/src/modbus.h +index f6e9a5f5..c63f5ceb 100644 +--- a/src/modbus.h ++++ b/src/modbus.h +@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req, + #define MODBUS_GET_HIGH_BYTE(data) (((data) >> 8) & 0xFF) + #define MODBUS_GET_LOW_BYTE(data) ((data) & 0xFF) + #define MODBUS_GET_INT64_FROM_INT16(tab_int16, index) \ +- (((int64_t)tab_int16[(index) ] << 48) + \ +- ((int64_t)tab_int16[(index) + 1] << 32) + \ +- ((int64_t)tab_int16[(index) + 2] << 16) + \ ++ (((int64_t)tab_int16[(index) ] << 48) | \ ++ ((int64_t)tab_int16[(index) + 1] << 32) | \ ++ ((int64_t)tab_int16[(index) + 2] << 16) | \ + (int64_t)tab_int16[(index) + 3]) +-#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) + tab_int16[(index) + 1]) +-#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) + tab_int8[(index) + 1]) ++#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) | tab_int16[(index) + 1]) ++#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) | tab_int8[(index) + 1]) + #define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value) \ + do { \ + tab_int8[(index)] = (value) >> 8; \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb deleted file mode 100644 index cc45fa7e2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libmodbus.inc - -SRC_URI[md5sum] = "b1a8fd3a40d2db4de51fb0cbcb201806" -SRC_URI[sha256sum] = "c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637" diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb new file mode 100644 index 000000000..075487ae9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb @@ -0,0 +1,12 @@ +require libmodbus.inc + +SRC_URI += "file://f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch \ + file://Fix-float-endianness-issue-on-big-endian-arch.patch \ + file://Fix-typo.patch" +SRC_URI[md5sum] = "15c84c1f7fb49502b3efaaa668cfd25e" +SRC_URI[sha256sum] = "d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16" + +# this file has been created one minute after the configure file, so it doesn't get recreated during configure step +do_configure_prepend() { + rm -rf ${S}/tests/unit-test.h +} diff --git a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb new file mode 100644 index 000000000..3a0a87eea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb @@ -0,0 +1,32 @@ +# Copyright (C) 2019 Ruslan Bilovol <rbilovol@cisco.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "NSS module for glibc, to provide NIS+ support for glibc" + +DESCRIPTION = "This package contains the NSS NIS+ plugin for glibc.\ +This code was formerly part of glibc, but is now standalone to\ +be able to link against TI-RPC for IPv6 support." + +HOMEPAGE = "https://github.com/thkukuk/libnss_nisplus" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +SECTION = "libs" +DEPENDS += "libtirpc libnsl2" + +PV = "1.3+git${SRCPV}" + +SRCREV = "c6934373c7bac91499ff7bbe7d2439599325ca63" + +SRC_URI = "git://github.com/thkukuk/libnss_nisplus \ + file://0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +BBCLASSEXTEND += "native nativesdk" +# +# We will skip parsing this packagegeoup for non-glibc systems +# +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch new file mode 100644 index 000000000..cf380ddf4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch @@ -0,0 +1,245 @@ +From 184bda40e05053cd2df61c28bec0baa7353697bb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 28 Aug 2019 09:49:10 -0700 +Subject: [PATCH] nisplus-hosts: Remove use of RES_USE_INET6 + +Upstream glibc dropped it starting glibc 2.30 +see +https://sourceware.org/git/?p=glibc.git;a=commit;h=3f8b44be0a658266adff5ece1e4bc3ce097a5dbe + +Upstream-Status: Submitted [https://github.com/thkukuk/libnss_nisplus/pull/2] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile.am | 3 +- + src/mapv4v6addr.h | 69 --------------------------------------------- + src/nisplus-hosts.c | 58 ++++++++----------------------------- + 3 files changed, 13 insertions(+), 117 deletions(-) + delete mode 100644 src/mapv4v6addr.h + +diff --git a/src/Makefile.am b/src/Makefile.am +index e879d5c..37ef86c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -15,8 +15,7 @@ AM_CPPFLAGS = -I$(srcdir) @TIRPC_CFLAGS@ @LIBNSL_CFLAGS@ + + lib_LTLIBRARIES = libnss_nisplus.la + +-noinst_HEADERS = libc-lock.h nss-nisplus.h netgroup.h nisplus-parser.h \ +- mapv4v6addr.h ++noinst_HEADERS = libc-lock.h nss-nisplus.h netgroup.h nisplus-parser.h + check_PROGRAMS = nss_loader-test + nss_loader_test_LDADD = -ldl + +diff --git a/src/mapv4v6addr.h b/src/mapv4v6addr.h +deleted file mode 100644 +index 7f85f7d..0000000 +--- a/src/mapv4v6addr.h ++++ /dev/null +@@ -1,69 +0,0 @@ +-/* +- * ++Copyright++ 1985, 1988, 1993 +- * - +- * Copyright (c) 1985, 1988, 1993 +- * The Regents of the University of California. All rights reserved. +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * 4. Neither the name of the University nor the names of its contributors +- * may be used to endorse or promote products derived from this software +- * without specific prior written permission. +- * +- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +- * SUCH DAMAGE. +- * - +- * Portions Copyright (c) 1993 by Digital Equipment Corporation. +- * +- * Permission to use, copy, modify, and distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies, and that +- * the name of Digital Equipment Corporation not be used in advertising or +- * publicity pertaining to distribution of the document or software without +- * specific, written prior permission. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL +- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES +- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT +- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL +- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +- * SOFTWARE. +- * - +- * --Copyright-- +- */ +- +-#include <string.h> +-#include <arpa/nameser.h> +- +-static void +-map_v4v6_address (const char *src, char *dst) +-{ +- u_char *p = (u_char *) dst; +- int i; +- +- /* Move the IPv4 part to the right position. */ +- memcpy (dst + 12, src, INADDRSZ); +- +- /* Mark this ipv6 addr as a mapped ipv4. */ +- for (i = 0; i < 10; i++) +- *p++ = 0x00; +- *p++ = 0xff; +- *p = 0xff; +-} +diff --git a/src/nisplus-hosts.c b/src/nisplus-hosts.c +index cc00aa2..d37b209 100644 +--- a/src/nisplus-hosts.c ++++ b/src/nisplus-hosts.c +@@ -42,14 +42,9 @@ static u_long tablename_len; + #define NISENTRYLEN(idx, col, res) \ + (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len) + +-/* Get implementation for some internal functions. */ +-#include "mapv4v6addr.h" +- +- + static int + _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host, +- char *buffer, size_t buflen, int *errnop, +- int flags) ++ char *buffer, size_t buflen, int *errnop) + { + unsigned int i; + char *first_unused = buffer; +@@ -66,8 +61,7 @@ _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host, + + char *data = first_unused; + +- if (room_left < (af != AF_INET || (flags & AI_V4MAPPED) != 0 +- ? IN6ADDRSZ : INADDRSZ)) ++ if (room_left < INADDRSZ) + { + no_more_room: + *errnop = ERANGE; +@@ -78,18 +72,8 @@ _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host, + if (af != AF_INET6 + && inet_pton (AF_INET, NISENTRYVAL (0, 2, result), data) > 0) + { +- assert ((flags & AI_V4MAPPED) == 0 || af != AF_UNSPEC); +- if (flags & AI_V4MAPPED) +- { +- map_v4v6_address (data, data); +- host->h_addrtype = AF_INET6; +- host->h_length = IN6ADDRSZ; +- } +- else +- { +- host->h_addrtype = AF_INET; +- host->h_length = INADDRSZ; +- } ++ host->h_addrtype = AF_INET; ++ host->h_length = INADDRSZ; + } + else if (af != AF_INET + && inet_pton (AF_INET6, NISENTRYVAL (0, 2, result), data) > 0) +@@ -319,12 +303,8 @@ internal_nisplus_gethostent_r (struct hostent *host, char *buffer, + } + } + +- if (_res.options & RES_USE_INET6) +- parse_res = _nss_nisplus_parse_hostent (result, AF_INET6, host, buffer, +- buflen, errnop, AI_V4MAPPED); +- else +- parse_res = _nss_nisplus_parse_hostent (result, AF_INET, host, buffer, +- buflen, errnop, 0); ++ parse_res = _nss_nisplus_parse_hostent (result, AF_INET, host, buffer, ++ buflen, errnop); + + if (parse_res == -1) + { +@@ -379,7 +359,7 @@ get_tablename (int *herrnop) + static enum nss_status + internal_gethostbyname2_r (const char *name, int af, struct hostent *host, + char *buffer, size_t buflen, int *errnop, +- int *herrnop, int flags) ++ int *herrnop) + { + if (tablename_val == NULL) + { +@@ -454,7 +434,7 @@ internal_gethostbyname2_r (const char *name, int af, struct hostent *host, + } + + int parse_res = _nss_nisplus_parse_hostent (result, af, host, buffer, +- buflen, errnop, flags); ++ buflen, errnop); + + nis_freeresult (result); + +@@ -485,8 +465,7 @@ _nss_nisplus_gethostbyname2_r (const char *name, int af, struct hostent *host, + } + + return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop, +- herrnop, +- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0)); ++ herrnop); + } + + +@@ -495,19 +474,8 @@ _nss_nisplus_gethostbyname_r (const char *name, struct hostent *host, + char *buffer, size_t buflen, int *errnop, + int *h_errnop) + { +- if (_res.options & RES_USE_INET6) +- { +- enum nss_status status; +- +- status = internal_gethostbyname2_r (name, AF_INET6, host, buffer, +- buflen, errnop, h_errnop, +- AI_V4MAPPED); +- if (status == NSS_STATUS_SUCCESS) +- return status; +- } +- + return internal_gethostbyname2_r (name, AF_INET, host, buffer, +- buflen, errnop, h_errnop, 0); ++ buflen, errnop, h_errnop); + } + + +@@ -555,9 +523,7 @@ _nss_nisplus_gethostbyaddr_r (const void *addr, socklen_t addrlen, int af, + } + + parse_res = _nss_nisplus_parse_hostent (result, af, host, +- buffer, buflen, errnop, +- ((_res.options & RES_USE_INET6) +- ? AI_V4MAPPED : 0)); ++ buffer, buflen, errnop); + nis_freeresult (result); + + if (parse_res > 0) +@@ -584,7 +550,7 @@ _nss_nisplus_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, + + enum nss_status status = internal_gethostbyname2_r (name, AF_UNSPEC, &host, + buffer, buflen, +- errnop, herrnop, 0); ++ errnop, herrnop); + if (status == NSS_STATUS_SUCCESS) + { + if (*pat == NULL) +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.7.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb index da22836a2..e50226e27 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb @@ -17,7 +17,7 @@ SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ file://0003-without-build-plugins.patch \ file://0004-configure.ac-remove-prog-test-of-augparse.patch \ " -SRCREV = "1d5cc00e44af4800fcae9761625dd4230681e82a" +SRCREV = "eaff08f38d771d9362923765bb404b1514c5ca0a" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb new file mode 100644 index 000000000..4ede3c8c6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Utilities to collect and visualise system statistics" +HOMEPAGE = "http://www.i-scream.org/libstatgrab/" + +LICENSE = "GPL-2.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "ncurses" + +PACKAGES_prepend = "statgrab statgrab-dbg saidar saidar-dbg ${PN}-mrtg " + +# don't use the git tag unless docbooc2x is available to build the manpages +SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92/libstatgrab-0.92.tar.gz \ + " +SRC_URI[md5sum] = "5362b2ddbec54b3901e7d70c22cda249" +SRC_URI[sha256sum] = "5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196" + +# Perl5 is for tests only +EXTRA_OECONF = "--without-perl5 --with-mnttab=/proc/mounts" + +inherit autotools pkgconfig + +FILES_statgrab = "${bindir}/statgrab" +FILES_statgrab-dbg = "${bindir}/.debug/statgrab" +FILES_saidar = "${bindir}/saidar" +FILES_saidar-dbg = "${bindir}/.debug/saidar" +FILES_${PN}-mrtg = "${bindir}/statgrab-make-mrtg-config ${bindir}/statgrab-make-mrtg-index" +RDEPENDS_${PN}-mrtg_append = "perl statgrab" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.5.1.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.5.2.bb index ce73700d7..5d725bf36 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.5.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.5.2.bb @@ -14,5 +14,5 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[md5sum] = "6fe665aa6d6bf3a99eb6fa9c553283fd" -SRC_URI[sha256sum] = "04ea35b6956c7b3453f1ed3f3fe40e3ddae1f43931089124579e8384e79ed372" +SRC_URI[md5sum] = "f9dd38d273bcdec5d3d1498fe6684f42" +SRC_URI[sha256sum] = "b3de4d4bd49a01e0cab3507fc163f88e1651695b6b9cb25ad174dbe319d4a3b4" diff --git a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.5.1.bb index 275a8f238..b6ab43ccf 100644 --- a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.5.1.bb @@ -8,12 +8,12 @@ the package on many systems.\ SECTION = "devel" HOMEPAGE = "http://www.logwatch.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f2566bb12b16d2d80d90ebc533261aa7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ad199c8aca74e70f296f731ad9a1521c" RDEPENDS_${PN} = "perl" SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" -SRC_URI[md5sum] = "22bd22841caa45f12c605abc3e0c2b09" -SRC_URI[sha256sum] = "1dbdc48d65e150f2dbb43f1e4f4700d94166e053b1c7bbbdedf4ad670283720e" +SRC_URI[md5sum] = "3d14fa6e0fb56f890d2b3fd9cbc3162f" +SRC_URI[sha256sum] = "9d4a00625065f25058f8966e7fb11f9f72db25507b4dd9c05f57e14447c33295" do_install() { install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch deleted file mode 100644 index 8b0096630..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90411a7f5e0e9582e79f0a8ccc1e2f158615e451 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 19 May 2018 23:18:11 -0700 -Subject: [PATCH] Fix formatting for modern c++11 compilers - -Fixes -error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/backend/svg/SVG_RenderingContext.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/backend/svg/SVG_RenderingContext.cc b/src/backend/svg/SVG_RenderingContext.cc -index 55d6097..0d50702 100644 ---- a/src/backend/svg/SVG_RenderingContext.cc -+++ b/src/backend/svg/SVG_RenderingContext.cc -@@ -68,7 +68,7 @@ void - SVG_RenderingContext::documentStart(const BoundingBox& bbox) - { - beginDocument(bbox); -- metadata("Created by "PACKAGE" version "VERSION); -+ metadata("Created by " PACKAGE " version " VERSION); - } - - void --- -2.17.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch deleted file mode 100644 index c5814bfe2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c92890c5e18bb6ee23bdb14074bacf306dd9428f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 5 May 2015 20:35:01 -0700 -Subject: [PATCH] include cstdio to get printf definitions - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/engine/boxml/BoxMLHOVElement.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/engine/boxml/BoxMLHOVElement.cc b/src/engine/boxml/BoxMLHOVElement.cc -index 1a2812c..96c9eea 100644 ---- a/src/engine/boxml/BoxMLHOVElement.cc -+++ b/src/engine/boxml/BoxMLHOVElement.cc -@@ -21,7 +21,7 @@ - // <http://www.gnu.org/licenses/>. - - #include <config.h> -- -+#include <cstdio> - #include "BoxMLAttributeSignatures.hh" - #include "BoxMLHOVElement.hh" - #include "BoxMLHElement.hh" --- -2.1.4 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch deleted file mode 100644 index b879d6a51..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 9c226fbc6a42540cb492fcfcb81ff16fffb086d6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 30 Aug 2016 23:24:53 +0200 -Subject: [PATCH] configure.ac: header detection of hash_map is broken - pin to - correct implementation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 31 ++++--------------------------- - 1 file changed, 4 insertions(+), 27 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4f2118e..16c09d5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -252,35 +252,12 @@ AC_SUBST(GTKMATHVIEW_SIZEOF_WCHAR_T, "$ac_cv_sizeof_wchar_t") - - AC_LANG_PUSH(C++) - --AC_CHECK_HEADERS(unordered_map, -- [ -- AC_DEFINE(GMV_HAVE_UNORDERED_MAP,1,[Define if <unordered_map> is provided]) -- GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1 -- ], -- [ -- GMV_HAVE_UNORDERED_MAP_CFLAGS= -- ] --) -+GMV_HAVE_UNORDERED_MAP_CFLAGS= - AC_SUBST(GMV_HAVE_UNORDERED_MAP_CFLAGS) --AC_CHECK_HEADERS(hash_map, -- [ -- AC_DEFINE(GMV_HAVE_HASH_MAP,1,[Define if <hash_map> is provided]) -- GMV_HAVE_HASH_MAP_CFLAGS=-DGMV_HAVE_HASH_MAP=1 -- ], -- [ -- GMV_HAVE_HASH_MAP_CFLAGS= -- ] --) -+GMV_HAVE_HASH_MAP_CFLAGS= - AC_SUBST(GMV_HAVE_HASH_MAP_CFLAGS) --AC_CHECK_HEADERS(ext/hash_map, -- [ -- AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided]) -- GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1 -- ], -- [ -- GMV_HAVE_EXT_HASH_MAP_CFLAGS= -- ] --) -+AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided]) -+GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1 - AC_SUBST(GMV_HAVE_EXT_HASH_MAP_CFLAGS) - - AC_MSG_CHECKING([whether the C++ compiler supports the standard character traits]) --- -2.5.5 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch deleted file mode 100644 index 356274d17..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch +++ /dev/null @@ -1,93 +0,0 @@ -From: Gert Wollny <gw.fossdev@gmail.com> -Date: Sun, 26 Jun 2016 13:25:00 +0200 -Description: gcc 6.0 build fixes -Bug: https://bugs.debian.org/811682 - -Slightly adapted to our environment - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- a/src/engine/common/View.cc -+++ b/src/engine/common/View.cc -@@ -291,7 +291,7 @@ - } - } - -- return false; -+ return SmartPtr<Element>(); - } - - bool ---- a/src/backend/common/tfm/TFM.hh -+++ b/src/backend/common/tfm/TFM.hh -@@ -37,7 +37,7 @@ - unsigned char face; - const char* codingScheme; - int designSize; -- int checksum; -+ unsigned int checksum; - unsigned int nDimensions; - unsigned int nCharacters; - }; -@@ -52,7 +52,7 @@ - struct Kerning - { - UChar8 index; -- int value; -+ unsigned int value; - }; - - struct Ligature -@@ -67,7 +67,7 @@ - UChar8 index; - int width; - int height; -- int depth; -+ unsigned int depth; - int italicCorrection; - unsigned char nKernings; - const Kerning* kerning; ---- a/src/backend/common/StandardSymbolsShaper.hh -+++ b/src/backend/common/StandardSymbolsShaper.hh -@@ -32,20 +32,20 @@ - struct HStretchyChar - { - Char16 ch; -- Char8 normal; -- Char8 left; -- Char8 glue; -- Char8 right; -+ UChar8 normal; -+ UChar8 left; -+ UChar8 glue; -+ UChar8 right; - }; - - struct VStretchyChar - { - Char16 ch; -- Char8 normal; -- Char8 top; -- Char8 glue; -- Char8 middle; -- Char8 bottom; -+ UChar8 normal; -+ UChar8 top; -+ UChar8 glue; -+ UChar8 middle; -+ UChar8 bottom; - }; - - protected: ---- a/src/backend/common/StandardSymbolsShaper.cc -+++ b/src/backend/common/StandardSymbolsShaper.cc -@@ -29,7 +29,7 @@ - #include "ShapingContext.hh" - - struct GlyphMap { -- Char8 index; -+ UChar8 index; - Char16 ch; - }; - diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch deleted file mode 100644 index 3fe632860..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch +++ /dev/null @@ -1,18 +0,0 @@ -Use build_cc to compile the programs to run on build host -helps with cross compiling - -Upstream-Status: Inappropriate [Cross-compiled OE specific] - -diff --git a/src/common/mathvariants/Makefile.am b/src/common/mathvariants/Makefile.am -index 636ccf0..ed9921d 100644 ---- a/src/common/mathvariants/Makefile.am -+++ b/src/common/mathvariants/Makefile.am -@@ -52,7 +52,7 @@ XSLTPROC = xsltproc - %.cc : %_gen.cc $(srcdir)/variant.top $(srcdir)/variant.bot - cat $(srcdir)/variant.top >$@ - $(XSLTPROC) --novalid --param temp "false()" $(srcdir)/extract.xsl $(<:%_gen.cc=$(srcdir)/xml/%.xml) >>$@ -- $(CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $< -+ $(BUILD_CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $< - echo "Char32 " >>$@ - basename map_variant_$@ .cc | tr "-" "_" >>$@ - echo "(Char32 ch)" >>$@ diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb deleted file mode 100644 index 9ee9e3035..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/" -DEPENDS = "t1lib gtk+ popt libxslt-native libxml2" - -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" - -PR = "r3" -SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec" -PV = "0.8.0+git${SRCPV}" - -SRC_URI = "git://github.com/GNOME/gtkmathview.git \ - file://use_hostcxx.patch \ - file://0001-include-cstdio-to-get-printf-definitions.patch \ - file://0002-configure.ac-header-detection-of-hash_map-is-broken-.patch \ - file://0003-gcc-6.0-build-fixes.patch \ - file://0001-Fix-formatting-for-modern-c-11-compilers.patch \ -" - -S = "${WORKDIR}/git" - -inherit distro_features_check autotools pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -do_configure_append() { - # avoid host polution inf pkg-config files - sed -i "s:${STAGING_DIR_HOST}::g" `find -name '*.pc'` -} diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fallback-to-2011-C++-standard.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fallback-to-2011-C++-standard.patch new file mode 100644 index 000000000..7a0d286e1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fallback-to-2011-C++-standard.patch @@ -0,0 +1,42 @@ +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/recipes-extended/mozjs/mozjs_60.5.2.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb index 70bdbc168..33142d6fe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb @@ -17,6 +17,7 @@ SRC_URI = "https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 \ file://0001-To-fix-build-error-on-arm32BE.patch \ file://JS_PUBLIC_API.patch \ file://0001-riscv-Disable-atomic-operations.patch \ + file://fallback-to-2011-C++-standard.patch \ " SRC_URI_append_libc-musl = " \ file://0006-support-musl.patch \ @@ -54,6 +55,9 @@ EXTRA_OECONF = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ " +# Without this, JS_Init() will fail for mips64. +EXTRA_OECONF_append_mips64 = " --with-intl-api=build" + EXTRA_OECONF_append_mipsarch = " --disable-ion" EXTRA_OECONF_append_riscv64 = " --disable-ion" EXTRA_OECONF_append_riscv32 = " --disable-ion" diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index 737c13427..17ca26273 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -5,8 +5,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=4b92a3b497d7943042a6db40c088c3f2" -SRCREV = "fbb7d9232067eac3f4508a37a8f7ea0c4fcebacb" -PV = "1.9.0-git${SRCPV}" +SRCREV = "967585c9ea0e1a8818d2172d2395d8502f6180a2" +PV = "2.0.0+git${SRCPV}" SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb b/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb index 19a90ff07..595852a9f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb @@ -4,7 +4,7 @@ checking (as in assert.h) and logging (printf style debugging) in \ GNU C and C++." SECTION = "Development/Languages/C and C++" -SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${BP}.tar.gz \ +SRC_URI = "http://download.savannah.gnu.org/releases/${BPN}/${BP}.tar.gz \ file://change-mandir-to-DESTDIR.patch \ file://modify-acinclude.m4-and-configure.in.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch new file mode 100644 index 000000000..c9e1306af --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch @@ -0,0 +1,59 @@ +From 44e0647230b22cd136ae2fb252ce90eed4751970 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Wed, 4 Sep 2019 17:29:15 +0100 +Subject: [PATCH 1/2] Always enable trivial-httpd for tests + +When running tests we always need ostree-trivial-httpd, so enable it +unconditionally + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] +--- + Makefile.am | 1 + + ci/build.sh | 5 +++++ + ci/travis-build.sh | 1 + + 3 files changed, 7 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index cd04a055045a..673dbf88de55 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \ + --enable-gtk-doc \ + --enable-man \ + --disable-maintainer-mode \ ++ --enable-trivial-httpd-cmdline \ + $(NULL) + + GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make +diff --git a/ci/build.sh b/ci/build.sh +index 0901507498f2..806af050b780 100755 +--- a/ci/build.sh ++++ b/ci/build.sh +@@ -22,6 +22,11 @@ case "${CONFIGOPTS:-}" in + fi + ;; + esac ++# unless libsoup is disabled, enable trivial-httpd for the tests ++case "${CONFIGOPTS:-}" in ++ *--without-soup*) ;; ++ *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;; ++esac + + # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 + # NB: this disables the default set of flags from configure.ac +diff --git a/ci/travis-build.sh b/ci/travis-build.sh +index 3fd969bdced6..7c85313a2d32 100755 +--- a/ci/travis-build.sh ++++ b/ci/travis-build.sh +@@ -85,6 +85,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1" + + ../configure \ + --enable-always-build-tests \ ++ --enable-trivial-httpd-cmdline \ + ${ci_configopts} + "$@" + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch new file mode 100644 index 000000000..d8c044cb9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch @@ -0,0 +1,40 @@ +From 5a4f2ddb0a6c656b425a3caa41f5af766ed5f44b Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Mon, 9 Sep 2019 14:19:18 +0100 +Subject: [PATCH] macros: Add TEMP_FAILURE_RETRY for musl + +TEMP_FAILURE_RETRY is glibc specific, add a definition for musl. + +See https://github.com/ostreedev/ostree/issues/731 + +Signed-off-by: Leon Woestenberg <leon@sidebranch.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libglnx/commit/15c06468804014fc49f6f340132930703f919b19] +--- + glnx-macros.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libglnx.glnx-macros.h b/libglnx/glnx-macros.h +index 6d8aca93f8a3..700fc75ceed0 100644 +--- a/libglnx.glnx-macros.h ++++ b/libglnx/glnx-macros.h +@@ -31,6 +31,16 @@ G_BEGIN_DECLS + /* All of these are for C only. */ + #ifndef __GI_SCANNER__ + ++/* fixes builds against musl, taken from glibc unistd.h */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + /* Taken from https://github.com/systemd/systemd/src/basic/string-util.h + * at revision v228-666-gcf6c8c4 + */ +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch new file mode 100644 index 000000000..362b2f36a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch @@ -0,0 +1,51 @@ +From 2629328b39ae117876f4854409c2231220a30b9c Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 5 Sep 2019 13:22:15 +0100 +Subject: [PATCH 2/2] Gate ostree-trivial-httpd on BUILDOPT_TRIVIAL_HTTPD + +When building without --enable-trivial-httpd-cmdline, don't build or install +the ostree-trivial-httpd binary. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] +--- + Makefile-ostree.am | 3 ++- + configure.ac | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile-ostree.am b/Makefile-ostree.am +index 76f39cad4b74..7b53cb148960 100644 +--- a/Makefile-ostree.am ++++ b/Makefile-ostree.am +@@ -143,12 +143,13 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c + endif + + if USE_LIBSOUP +-# Eventually once we stop things from using this, we should support disabling this ++if BUILDOPT_TRIVIAL_HTTPD + ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c + pkglibexec_PROGRAMS += ostree-trivial-httpd + ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c + ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) + ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) ++endif + + if !USE_CURL + # This is necessary for the cookie jar bits +diff --git a/configure.ac b/configure.ac +index 069bab01752e..ffc67980d507 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -192,6 +192,9 @@ AC_ARG_ENABLE(trivial-httpd-cmdline, + [Continue to support "ostree trivial-httpd" [default=no]])],, + enable_trivial_httpd_cmdline=no) + AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) ++AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [ ++ AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd]) ++]) + AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, + [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] + ) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.3.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.3.bb new file mode 100644 index 000000000..1fe7dcf21 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.3.bb @@ -0,0 +1,157 @@ +SUMMARY = "Versioned Operating System Repository." +DESCRIPTION = "libostree is both a shared library and suite of command line \ +tools that combines a \"git-like\" model for committing and downloading \ +bootable filesystem trees, along with a layer for deploying them and managing \ +the bootloader configuration." +HOMEPAGE = "https://ostree.readthedocs.io" +LICENSE = "LGPLv2.1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +DEPENDS = " \ + glib-2.0 \ + gpgme \ + e2fsprogs \ + libcap \ + zlib \ + xz \ + bison-native \ +" + +# The Yocto mirror has an old export of ostree: +# http://downloads.yoctoproject.org/mirror/sources/git2_github.com.ostreedev.ostree.tar.gz +PREMIRRORS = "" + +SRC_URI = " \ + gitsm://github.com/ostreedev/ostree \ + file://0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch \ + file://0001-Always-enable-trivial-httpd-for-tests.patch \ + file://0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch \ +" +SRCREV = "5c1697da78ebf6250a7130b8b9e6cbfbeaa34296" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" + +S = "${WORKDIR}/git" + +inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig systemd + +# package configuration - match ostree defaults, but without rofiles-fuse +# otherwise we introduce a dependendency on meta-filesystems +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ + soup \ +" + +# We include soup because ostree can't (currently) be built without +# soup or curl - https://github.com/ostreedev/ostree/issues/1897 +PACKAGECONFIG_class-native ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + soup \ +" + +PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" +PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" +PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" +PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" +PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" +PACKAGECONFIG[man] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio" +PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2" +PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl" +PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse" +PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux" +PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" +PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" +PACKAGECONFIG[static] = "" +PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_unitdir}/system, --without-libsystemd, systemd" +PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" + +EXTRA_OECONF = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ +" + +# Makefile-libostree.am overrides this to avoid a build problem with clang, +# but that fix breaks cross compilation and we don't need it +EXTRA_OEMAKE = " \ + INTROSPECTION_SCANNER_ENV= \ +" + +EXTRA_OECONF_class-native = " \ + --with-builtin-grub2-mkconfig \ + --enable-wrpseudo-compat \ + --disable-otmpfile \ +" + +# Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the +# do_configure stage so we do depend on it +SYSROOT_DIR = "${STAGING_DIR_TARGET}" +SYSROOT_DIR_class-native = "${STAGING_DIR_NATIVE}" +do_configure[vardeps] += "SYSROOT_DIR" + +do_configure_prepend() { + # this reflects what autogen.sh does, but the OE wrappers for autoreconf + # allow it to work without the other gyrations which exist there + cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc + cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc +} + +do_install_append_class-native() { + create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" +} + +PACKAGES += " \ + ${PN}-dracut \ + ${PN}-grub \ + ${PN}-mkinitcpio \ + ${PN}-switchroot \ +" + +FILES_${PN} = " \ + ${bindir}/ostree \ + ${bindir}/rofiles-fuse \ + ${datadir}/${BPN} \ + ${datadir}/gir-1.0 \ + ${libdir}/${BPN}/ostree-remount \ + ${libdir}/girepository-1.0 \ + ${libdir}/lib*${SOLIBS} \ + ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \ + ${libexecdir}/libostree/ostree-trivial-httpd \ + ${sysconfdir}/ostree/remotes.d \ + ${systemd_unitdir}/system-generators/ostree-system-generator \ + ${systemd_unitdir}/system/ostree-finalize-staged.path \ + ${systemd_unitdir}/system/ostree-finalize-staged.service \ + ${systemd_unitdir}/system/ostree-remount.service \ +" +FILES_${PN}-dracut = " \ + ${sysconfdir}/dracut.conf.d \ + ${libdir}/dracut \ +" +FILES_${PN}-grub = " \ + ${sysconfdir}/grub.d \ + ${libexecdir}/libostree/grub2-15_ostree \ +" +FILES_${PN}-mkinitcpio = " \ + ${sysconfdir}/ostree-mkinitcpio.conf \ + ${libdir}/initcpio \ +" +FILES_${PN}-switchroot = " \ + ${libdir}/ostree/ostree-prepare-root \ + ${systemd_unitdir}/system/ostree-prepare-root.service \ +" + +RDEPENDS_${PN}-dracut = "bash" +RDEPENDS_${PN}-mkinitcpio = "bash" +RDEPENDS_${PN}_class-target = " \ + gnupg \ + ${PN}-switchroot \ +" + +RRECOMMENDS_${PN} += "kernel-module-overlay" + +SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" +SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb index c59a259fc..2fdadcbc9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -10,11 +10,10 @@ DEPENDS = "libpam openldap" inherit distro_features_check REQUIRED_DISTRO_FEATURES = "pam" -SRC_URI = "https://github.com/rmbreak/pam_ldapdb/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "2dd4f1370fcfe995ee0ad09611109b87" -SRC_URI[sha256sum] = "8ed92b36523556bb5d9bf3eb33a1035e46041d4be767c8d62136930c0ca0e45b" +SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" +SRC_URI = "git://github.com/rmbreak/pam_ldapdb" -S = "${WORKDIR}/pam_ldapdb-${PV}" +S = "${WORKDIR}/git" do_install () { oe_runmake install DESTDIR=${D} PAMDIR=${base_libdir}/security diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch new file mode 100644 index 000000000..0c79c4c09 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch @@ -0,0 +1,25 @@ +From 340110292b35d367205953a59e7eab28e1f4a0bb Mon Sep 17 00:00:00 2001 +From: Daniel Frey <d.frey@gmx.de> +Date: Sat, 7 Apr 2018 09:13:51 +0200 +Subject: [PATCH] Fix clang-warning about non-virtual dtor + +Upstream-Status: Backport [https://github.com/taocpp/PEGTL/commit/340110292b35d367205953a59e7eab28e1f4a0bb] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/example/pegtl/json_classes.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/example/pegtl/json_classes.hpp ++++ b/src/example/pegtl/json_classes.hpp +@@ -34,10 +34,7 @@ namespace examples + : type( in_type ) + { + } +- +- ~json_base() +- { +- } ++ virtual ~json_base() = default; + }; + + inline std::ostream& operator<<( std::ostream& o, const json_base& j ) diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb new file mode 100644 index 000000000..344a80524 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb @@ -0,0 +1,13 @@ +DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" +HOMEPAGE="https://github.com/taocpp/PEGTL" +LICENSE="MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=80cb066ab204c7fe022f1cfe0c2c6818" + +SRCREV = "776fa4a1e8bda860008524f6dd9473967c8375b1" +SRC_URI = "git://git@github.com/taocpp/PEGTL.git;protocol=https;branch=master \ + file://0001-Fix-clang-warning-about-non-virtual-dtor.patch \ + " + +inherit cmake + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch index 747538b0c..ca2a1f643 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch @@ -1,4 +1,4 @@ -From 2a22dc96c3bbb5c9bbcc008f58d4f5c64e3d19e6 Mon Sep 17 00:00:00 2001 +From 231eb4c75fbfaaf90bca7702bdaf55cf701a3527 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Mon, 23 Jul 2018 11:23:39 -0700 Subject: [PATCH] jemalloc/jemalloc.cfg: Specify the host when building @@ -25,5 +25,5 @@ index 196129de6..79ebbab1c 100644 --disable-munmap +--host=${HOST_SYS} -- -2.17.1 +2.14.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch new file mode 100644 index 000000000..33f25b6a6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch @@ -0,0 +1,33 @@ +From 7d0732d69a774e28bc46b8b487d9f61bdd8afbff Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 6 Oct 2019 18:15:44 -0700 +Subject: [PATCH] os_posix: Use __FreeBSD__ to control secure_getenv definition + +__USE_GNU does not cover all Linux platforms, e.g. when using musl as C +library, __USE_GNU may not be defined but it does provide secure_getenv +so instead of narrowing the else condition, lets speicifically check for +FreeBSD being the platform, since that seems to be the intention here +anyway + +Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/3999] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/common/os_posix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/os_posix.c b/src/common/os_posix.c +index a9a37ef84..052db2383 100644 +--- a/src/common/os_posix.c ++++ b/src/common/os_posix.c +@@ -346,7 +346,7 @@ os_setenv(const char *name, const char *value, int overwrite) + /* + * secure_getenv -- provide GNU secure_getenv for FreeBSD + */ +-#ifndef __USE_GNU ++#if defined(__FreeBSD__) + static char * + secure_getenv(const char *name) + { +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch index bd1b97c24..82b96cf95 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch @@ -1,7 +1,7 @@ -From 460a96e390cb80278784cfe36629e280fe7ffef7 Mon Sep 17 00:00:00 2001 +From 3863d8bd71d6a5638cf984f8d8f9cccac0c7f2a4 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Mon, 23 Jul 2018 11:31:17 -0700 -Subject: [PATCH 2/2] Makefile: Don't install the docs +Subject: [PATCH] Makefile: Don't install the docs Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Upstream-Status: Inappropriate [disable feature] @@ -10,17 +10,17 @@ Upstream-Status: Inappropriate [disable feature] 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index 224a315f6..ce7f84afb 100644 +index 47a447f12..7c0f9848f 100644 --- a/Makefile +++ b/Makefile -@@ -144,7 +144,6 @@ rpm dpkg: pkg-clean source +@@ -148,7 +148,6 @@ rpm dpkg: pkg-clean install uninstall: $(MAKE) -C src $@ - $(MAKE) -C doc $@ .PHONY: all clean clobber test check cstyle check-license install uninstall\ - source rpm dpkg pkg-clean pcheck check-remote format doc $(SUBDIRS) + source rpm dpkg pkg-clean pcheck check-remote format doc require-rpmem\ -- -2.17.1 +2.14.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch deleted file mode 100644 index f75d94197..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a7f07dca2468ea226d2f07fc0105166e75cadaf8 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Thu, 6 Sep 2018 16:18:50 -0700 -Subject: [PATCH] Makefile: Don't build the examples - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Inappropriate [disable feature] ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 4b50dd8b5..e00501e31 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -38,13 +38,13 @@ include $(TOP)/src/version.inc - - TARGETS = libpmem libvmem libpmemblk libpmemlog libpmemobj libpmempool\ - libpmemcto libvmmalloc tools --ALL_TARGETS = $(TARGETS) common librpmem examples benchmarks -+ALL_TARGETS = $(TARGETS) common librpmem benchmarks - - SCOPE_DIRS = $(TARGETS) common librpmem rpmem_common - - DEBUG_RELEASE_TARGETS = common libpmem libvmem libpmemblk libpmemlog libpmemobj\ - libpmempool libvmmalloc librpmem libpmemcto --RELEASE_TARGETS = tools examples benchmarks -+RELEASE_TARGETS = tools benchmarks - - CLEAN_NO_JE_TARGETS = $(ALL_TARGETS) rpmem_common test - CLEAN_TARGETS = $(CLEAN_NO_JE_TARGETS) jemalloc --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0004-os_posix-Manually-implement-secure_getenv-if-require.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0004-os_posix-Manually-implement-secure_getenv-if-require.patch deleted file mode 100644 index 624f17bd4..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0004-os_posix-Manually-implement-secure_getenv-if-require.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 33affa9ee97691efb73f439fcdba4adb8625a26a Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Mon, 10 Sep 2018 12:59:48 -0700 -Subject: [PATCH] os_posix: Manually implement secure_getenv() if required - -Manually implement the secure_getenv() if we need to, this is required -if using musl. - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Pending ---- - src/common/os_posix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/os_posix.c b/src/common/os_posix.c -index 2d70a0a29..fb09b6ce0 100644 ---- a/src/common/os_posix.c -+++ b/src/common/os_posix.c -@@ -261,7 +261,7 @@ os_setenv(const char *name, const char *value, int overwrite) - /* - * secure_getenv -- provide GNU secure_getenv for FreeBSD - */ --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || !HAVE___SECURE_GETENV - static char * - secure_getenv(const char *name) - { --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0005-pmempool-Remove-unused-__USE_UNIX98-define.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0005-pmempool-Remove-unused-__USE_UNIX98-define.patch deleted file mode 100644 index 75c35f865..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0005-pmempool-Remove-unused-__USE_UNIX98-define.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 92e63699ea83074298971b0251f002562be4dbd3 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Mon, 10 Sep 2018 13:23:37 -0700 -Subject: [PATCH 2/3] pmempool: Remove unused __USE_UNIX98 define - -Remove the unused __USE_UNIX98 to fix musl build failures. - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Pending ---- - src/tools/pmempool/info.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/tools/pmempool/info.c b/src/tools/pmempool/info.c -index b4010bf35..7b890a123 100644 ---- a/src/tools/pmempool/info.c -+++ b/src/tools/pmempool/info.c -@@ -45,9 +45,6 @@ - #include <inttypes.h> - #include <assert.h> - #include <sys/param.h> --#ifndef __FreeBSD__ --#define __USE_UNIX98 --#endif - #include <unistd.h> - #include <sys/mman.h> - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch deleted file mode 100644 index 2042fdb25..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a88e806f9ce8cc071e81abad688643d53f393176 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Mon, 10 Sep 2018 14:18:38 -0700 -Subject: [PATCH 3/3] Makefile.inc: Allow extra libs to be specified - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Pending ---- - src/Makefile.inc | 2 ++ - src/common.inc | 2 ++ - src/tools/Makefile.inc | 1 + - 3 files changed, 5 insertions(+) - -diff --git a/src/common.inc b/src/common.inc -index 032cb83ea..2d5c4bedf 100644 ---- a/src/common.inc -+++ b/src/common.inc -@@ -74,6 +74,8 @@ GCOV_CFLAGS=-fprofile-arcs -ftest-coverage --coverage - GCOV_LDFLAGS=-fprofile-arcs -ftest-coverage - GCOV_LIBS=-lgcov - -+LIBS += $(EXTRA_LIBS) -+ - osdep = $(1)_$(shell uname -s | tr "[:upper:]" "[:lower:]")$(2) - get_arch = $(shell $(CC) -dumpmachine | awk -F'[/-]' '{print $$1}') - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb index 3da22a970..96da266e6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb @@ -9,18 +9,15 @@ DEPENDS = "ndctl" # Required to have the fts.h header for musl DEPENDS_append_libc-musl = " fts" -SRC_URI = "https://github.com/pmem/${BPN}/archive/${PV}.tar.gz \ +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/pmem/pmdk.git \ file://0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch \ file://0002-Makefile-Don-t-install-the-docs.patch \ - file://0003-Makefile-Don-t-build-the-examples.patch \ - file://0005-pmempool-Remove-unused-__USE_UNIX98-define.patch \ - file://0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch \ + file://0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch \ " -SRC_URI_append_libc-musl = " file://0004-os_posix-Manually-implement-secure_getenv-if-require.patch" - -SRC_URI[md5sum] = "bde73bca9ef5b90911deb0fdcfb15ccf" -SRC_URI[sha256sum] = "df7e658e75d28cd80f6d2ff7b9fc9ae2885d52f8923fdbacecfd46215115fb4c" +SRCREV = "bc5e309485df61c452d08367e4b13ba9dfed5071" inherit autotools-brokensep pkgconfig @@ -29,36 +26,24 @@ inherit autotools-brokensep pkgconfig # | If you meant to cross compile, use `--host'. # # Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] -EXTRA_OEMAKE = "HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}'" +EXTRA_OEMAKE = "BUILD_EXAMPLES='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" # Fix the missing fts libs when using musl EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install - - # Copy these into the standard directories - install -d ${D}${bindir}/ - mv ${D}/usr/local/bin/pmempool ${D}${bindir}/ - mv ${D}/usr/local/bin/daxio ${D}${bindir}/ - - install -d ${D}${libdir} - mv ${D}/usr/local/lib/*so* ${D}${libdir}/ - - install -d ${D}${libdir}/pkgconfig - mv ${D}/usr/local/lib/pkgconfig/*.pc ${D}${libdir}/pkgconfig/ - - install -d ${D}${includedir} - mv ${D}/usr/local/include/* ${D}${includedir}/ + oe_runmake prefix=${prefix} DESTDIR=${D} install # Remove uneeded files - rm -rf ${D}/usr/local/ + rm -rf ${D}/usr/${baselib}/pmdk_debug } # Include these by default otherwise the SDK is not very useful FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" FILES_${PN} += "${libdir}/*so*" FILES_${PN} += "${libdir}/pkgconfig/*.pc" -FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/*" +FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" +FILES_${PN} += "/usr/etc" +FILES_${PN} += "/usr/share" COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch new file mode 100644 index 000000000..04af15dd8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch @@ -0,0 +1,32 @@ +From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 10 Sep 2019 20:04:26 -0700 +Subject: [PATCH] src: Do not reset FINAL_LIBS + +This helps case where additional libraries are needed to be passed from +environment to get it going + +e.g. -latomic is needed on clang/x86 to provide for 64bit atomics + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 7f7c625..c71dd3b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -66,7 +66,7 @@ endif + + FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) + FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) +-FINAL_LIBS=-lm ++FINAL_LIBS+=-lm + DEBUG=-g -ggdb + + ifeq ($(uname_S),SunOS) +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch new file mode 100644 index 000000000..82ca30739 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch @@ -0,0 +1,45 @@ +From c8ca71d40bc51e255457cd4374dd45ec9ebf8ae1 Mon Sep 17 00:00:00 2001 +From: Jun He <jun.he@arm.com> +Date: Mon, 3 Jul 2017 07:18:32 +0000 +Subject: [PATCH] Fixed stack trace generation on aarch64 + +Change-Id: I9801239c98cb7362ed07e8b9ec2ba7e45749dba7 +Signed-off-by: Jun He <jun.he@arm.com> + +* fixes also this error when building with -Werror=return-type: + debug.c:698:1: error: no return statement in function returning non-void [-Werror=return-type] + +Upstream-Status: Backport [https://github.com/antirez/redis/commit/c8ca71d40bc51e255457cd4374dd45ec9ebf8ae1] + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/Makefile | 2 +- + src/debug.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 24e960593eb..a1ff4258a9d 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -40,7 +40,7 @@ + endif + + # To get ARM stack traces if Redis crashes we need a special C flag. +-ifneq (,$(findstring armv,$(uname_M))) ++ifneq (,$(filter aarch64 armv,$(uname_M))) + CFLAGS+=-funwind-tables + endif + +diff --git a/src/debug.c b/src/debug.c +index a4caa49f285..c976d0ed919 100644 +--- a/src/debug.c ++++ b/src/debug.c +@@ -691,6 +691,8 @@ + return (void*) uc->uc_mcontext.sc_ip; + #elif defined(__arm__) /* Linux ARM */ + return (void*) uc->uc_mcontext.arm_pc; ++ #elif defined(__aarch64__) /* Linux AArch64 */ ++ return (void*) uc->uc_mcontext.pc; + #endif + #else + return NULL; diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb index 63ab44b6a..45ea29b70 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb @@ -10,6 +10,8 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://hiredis-use-default-CC-if-it-is-set.patch \ file://lua-update-Makefile-to-use-environment-build-setting.patch \ file://oe-use-libc-malloc.patch \ + file://Fixed-stack-trace-generation-on-aarch64.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://redis.conf \ file://init-redis-server \ file://redis.service \ @@ -24,11 +26,13 @@ SRC_URI[sha256sum] = "1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a08758 inherit autotools-brokensep update-rc.d systemd useradd +FINAL_LIBS_x86_toolchain-clang = "-latomic" +export FINAL_LIBS + USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" GROUPADD_PARAM_${PN} = "--system redis" - REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" do_compile_prepend() { diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb index 1962a2dd4..b39ceda80 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb @@ -32,7 +32,7 @@ am_cv_python_pyexecdir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packag --disable-python,python," PACKAGECONFIG[perl] = \ -"--enable-perl=yes --with-perl-options='INSTALLDIRS="vendor" CCFLAGS="${CFLAGS}" NO_PACKLIST=1' \ +"--enable-perl=yes --with-perl-options='INSTALLDIRS="vendor" CCFLAGS="${CFLAGS}" NO_PACKLIST=1 NO_PERLLOCAL=1' \ ac_cv_path_PERL_CC='${CC}', \ --disable-perl,perl," diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb index 9e57dd520..16c63a752 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb @@ -14,3 +14,5 @@ SRCREV = "e96443dda3c080fa991decec26bc4ac98d24b9a2" S = "${WORKDIR}/git" inherit autotools pkgconfig + +CPPFLAGS += "-Wno-error" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1903.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb index f1a6e8535..bbb4b119a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1903.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb @@ -29,9 +29,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "f0d454c79d4040e3f25fcd12f8f33fe2" -SRC_URI[sha256sum] = "d0d23a493dcec64c7b6807a1bb8ee864ed0f3760c2ff3088008bb661d304056f" - +SRC_URI[md5sum] = "6e9aa4ef4cad8ae49affa0a786cc9e2f" +SRC_URI[sha256sum] = "f8c8e53b651e03a011667c60bd2d4dba7a7cb6ec04b247c8ea8514115527863b" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" @@ -39,6 +38,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit autotools pkgconfig systemd update-rc.d ptest EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" +EXTRA_OECONF += "--enable-imfile-tests" # first line is default yes in configure PACKAGECONFIG ??= " \ diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch deleted file mode 100644 index e4bde80a0..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c51c2c543f3c78b2a68acc61f786f903f2e0fec8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Sun, 9 Sep 2018 07:28:09 -0400 -Subject: [PATCH] fix compile failure with libc musl - -The lack of random_r in musl: -[snip] -|main.c:1393:7: warning: implicit declaration of function 'random_r'; -did you mean 'random'? [-Wimplicit-function-declaration] -| rv = random_r(&rand_data, &val); -| ^~~~~~~~ -| random -|main.c:1408:30: error: invalid application of 'sizeof' to incomplete -type 'struct random_data' -| memset(&rand_data, 0, sizeof(rand_data)); -[snip] - -s/random_r/random/, s/initstate_r/initstate/ and remove `static struct -random_data rand_data' - -Here is the man of `random_r()': -[snip] -The random_r() function is like random(3), except that instead of using -state information maintained in a global variable -[snip] - -So use random without state information is OK. - -Upstream-Status: Submitted [sanlock-devel@lists.fedorahosted.org] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/main.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/src/main.c b/src/main.c -index f60b4d3..602c400 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -84,7 +84,6 @@ static char command[COMMAND_MAX]; - static int cmd_argc; - static char **cmd_argv; - static struct thread_pool pool; --static struct random_data rand_data; - static char rand_state[32]; - static pthread_mutex_t rand_mutex = PTHREAD_MUTEX_INITIALIZER; - static const char *run_dir = NULL; -@@ -1386,16 +1385,15 @@ int get_rand(int a, int b); - - int get_rand(int a, int b) - { -- int32_t val; -- int rv; -+ long int rv; - - pthread_mutex_lock(&rand_mutex); -- rv = random_r(&rand_data, &val); -+ rv = random(); - pthread_mutex_unlock(&rand_mutex); - if (rv < 0) - return rv; - -- return a + (int) (((float)(b - a + 1)) * val / (RAND_MAX+1.0)); -+ return a + (int) (((float)(b - a + 1)) * rv / (RAND_MAX+1.0)); - } - - static void setup_host_name(void) -@@ -1405,9 +1403,7 @@ static void setup_host_name(void) - uuid_t uu; - - memset(rand_state, 0, sizeof(rand_state)); -- memset(&rand_data, 0, sizeof(rand_data)); -- -- initstate_r(time(NULL), rand_state, sizeof(rand_state), &rand_data); -+ initstate(time(NULL), rand_state, sizeof(rand_state)); - - /* use host name from command line */ - --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb index c51bccce3..9f7ce9c57 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb @@ -11,10 +11,8 @@ SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" -SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ - file://0001-fix-compile-failure-with-libc-musl.patch \ - " -SRCREV = "90b2ffa77edd46bea007b7bb39bfd4d2db2ff7af" +SRC_URI = "git://pagure.io/sanlock.git;protocol=http" +SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f" S = "${WORKDIR}/git" DEPENDS = "libaio util-linux" diff --git a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index 77d3cfeef..b922bb1f1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -43,5 +43,5 @@ FILES_${PN}-diskmon = "${sbindir}/sgdiskmon ${sysconfdir}/init.d/sgdisk" FILES_${PN}-raidmon = "${sbindir}/sgraidmon ${sysconfdir}/init.d/sgraid" RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-diskmon += "${PN}" -RDEPENDS_${PN}-raidmon += "${PN}" +RDEPENDS_${PN}-diskmon += "${PN} bash" +RDEPENDS_${PN}-raidmon += "${PN} bash" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index 6ce3cab11..e40e1cd26 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -1,6 +1,6 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" -SRCREV = "6003f9997587e6a563cebf1f246bcd0eb6deff3d" +SRCREV = "b31bce98d65f894aad6427bcf6f3f7822e261a59" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https" @@ -10,3 +10,5 @@ S = "${WORKDIR}/git" inherit module EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" + +PNBLACKLIST[can-isotp] = "Kernel module Needs forward porting to kernel 5.2+" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch new file mode 100644 index 000000000..cbf3aee10 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch @@ -0,0 +1,106 @@ +From 20981c8a328747f823b7eef68d0c2812b3eaed30 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Sun, 14 Jul 2019 21:50:43 +0200 +Subject: [PATCH] fix include to find SIOCGSTAMP with latest kernel + +In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 +the asm-generic/sockios.h header no longer defines SIOCGSTAMP. +Instead it provides only SIOCGSTAMP_OLD. + +The linux/sockios.h header now defines SIOCGSTAMP using either +SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only +header file is not pulled so we get a build failure. + +canlogserver.c: In function 'main': +canlogserver.c:404:21: error: 'SIOCGSTAMP' undeclared (first use in this function); did you mean 'SIOCGRARP'? + if (ioctl(s[i], SIOCGSTAMP, &tv) < 0) + ^~~~~~~~~~ + SIOCGRARP +canlogserver.c:404:21: note: each undeclared identifier is reported only once for each function it appears in + +Fixes: + - http://autobuild.buildroot.org/results/363de7d9bf433be8bc47ba4ee52ae0bb80fa9021 + +Upstream-Status: Backport [https://github.com/linux-can/can-utils/commit/e9590b1ca75d360eaf3211bebd86058214d48064] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + canlogserver.c | 1 + + cansniffer.c | 1 + + isotpdump.c | 1 + + isotpperf.c | 1 + + isotpsniffer.c | 1 + + slcanpty.c | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/canlogserver.c b/canlogserver.c +index e3350b7..f53165c 100644 +--- a/canlogserver.c ++++ b/canlogserver.c +@@ -61,6 +61,7 @@ + + #include <linux/can.h> + #include <linux/can/raw.h> ++#include <linux/sockios.h> + #include <signal.h> + #include <errno.h> + +diff --git a/cansniffer.c b/cansniffer.c +index 7b0a3fa..bf7d72e 100644 +--- a/cansniffer.c ++++ b/cansniffer.c +@@ -61,6 +61,7 @@ + + #include <linux/can.h> + #include <linux/can/bcm.h> ++#include <linux/sockios.h> + + #include "terminal.h" + +diff --git a/isotpdump.c b/isotpdump.c +index b2b650a..36d8af3 100644 +--- a/isotpdump.c ++++ b/isotpdump.c +@@ -55,6 +55,7 @@ + + #include <linux/can.h> + #include <linux/can/raw.h> ++#include <linux/sockios.h> + #include "terminal.h" + + #define NO_CAN_ID 0xFFFFFFFFU +diff --git a/isotpperf.c b/isotpperf.c +index db3a2b7..5852a57 100644 +--- a/isotpperf.c ++++ b/isotpperf.c +@@ -56,6 +56,7 @@ + + #include <linux/can.h> + #include <linux/can/raw.h> ++#include <linux/sockios.h> + + #define NO_CAN_ID 0xFFFFFFFFU + #define PERCENTRES 2 /* resolution in percent for bargraph */ +diff --git a/isotpsniffer.c b/isotpsniffer.c +index f42e18b..d7a4c66 100644 +--- a/isotpsniffer.c ++++ b/isotpsniffer.c +@@ -55,6 +55,7 @@ + + #include <linux/can.h> + #include <linux/can/isotp.h> ++#include <linux/sockios.h> + #include "terminal.h" + + #define NO_CAN_ID 0xFFFFFFFFU +diff --git a/slcanpty.c b/slcanpty.c +index 431ca68..7dfaf5c 100644 +--- a/slcanpty.c ++++ b/slcanpty.c +@@ -40,6 +40,7 @@ + + #include <linux/can.h> + #include <linux/can/raw.h> ++#include <linux/sockios.h> + + /* maximum rx buffer len: extended CAN frame with timestamp */ + #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1) diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index a2d62c366..db5055fed 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=43;md5=390a2c9a3c5e3595a0 DEPENDS = "libsocketcan" -SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master" +SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master \ + file://0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch \ + " SRCREV = "4c8fb05cb4d6ddcd67299008db54af423f86fd05" PV = "0.0+gitr${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb index 60ca58016..0debe47e0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb @@ -5,7 +5,7 @@ SECTION = "libs/network" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1" -SRCREV = "51f1610160a1707f026f8c2d714a6f7aa3ca232b" +SRCREV = "0ff01ae7e4d271a7b81241e7a7026bfcea0add3f" SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git" diff --git a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch deleted file mode 100644 index 976e0380e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 81c1ba940415595584a837ab1078c64855072f0c Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Mon, 21 Nov 2011 12:00:54 +0100 -Subject: [PATCH] t1lib: add 5.1.2 - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- - configure.in | 95 ++++++++++++++++++++++++------------------------------------ - 1 file changed, 38 insertions(+), 57 deletions(-) - -diff --git a/configure.in b/configure.in -index eade4c0..e649ea9 100644 ---- a/configure.in -+++ b/configure.in -@@ -74,9 +74,9 @@ T1LIB_PATCHLEVEL=builtin(eval, MACRO_T1LIB_LT_REVISION) - T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\" - - --dnl We use this file by Andreas Zeller to check for libXaw --builtin(include, ac-tools/ice_find_athena.m4) --builtin(include, ac-tools/aclocal.m4) -+#dnl We use this file by Andreas Zeller to check for libXaw -+#builtin(include, ac-tools/ice_find_athena.m4) -+#builtin(include, ac-tools/aclocal.m4) - - dnl We want these before the checks, so the checks can modify their values. - test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS) -@@ -162,6 +162,7 @@ fi - - dnl **** Check for underscore on external symbols **** - -+AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix]) - AC_CACHE_CHECK("whether external symbols need an underscore prefix", - ac_cv_c_extern_prefix, - [saved_libs=$LIBS -@@ -179,68 +180,48 @@ then - AC_DEFINE(NEED_UNDERSCORE_PREFIX) - fi - --dnl **** Check which ANSI integer type is 16 bit -- --AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type, -- AC_TRY_RUN([ --int main(void) { -- if (sizeof(short)==2) -- return(0); -- else if (sizeof(int)==2) -- return(1); -- else -- return(2); --}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=)) --if test "$ac_16bit_type" = "short" --then -- T1_AA_TYPE16="-DT1_AA_TYPE16=short" -- T1_INT16="short" --else -- T1_AA_TYPE16="-DT1_AA_TYPE16=int" -- T1_INT16="int" -+dnl **** Check which ANSI integer type is 16 bit -+T1_AA_TYPE16="" -+for type in short int; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then -+ T1_AA_TYPE16="-DT1_AA_TYPE16=$type" -+ T1_INT16="$type" -+ break -+ fi -+done -+ -+if test x"$T1_AA_TYPE16" = "x"; then -+ AC_MSG_ERROR("Unable to determine which integer type is 16 bit.") - fi - -- - dnl **** Check which ANSI integer type is 32 bit -- --AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type, -- AC_TRY_RUN([ --int main(void) { -- if (sizeof(int)==4) -- return(0); -- else if (sizeof(long)==4) -- return(1); -- else -- return(2); --}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=)) --if test "$ac_32bit_type" = "int" --then -- T1_AA_TYPE32="-DT1_AA_TYPE32=int" -- T1_INT32="int" --else -- T1_AA_TYPE32="-DT1_AA_TYPE32=long" -- T1_INT32="long" -+T1_AA_TYPE32="" -+for type in int long; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then -+ T1_AA_TYPE32="-DT1_AA_TYPE32=$type" -+ T1_INT32="$type" -+ break -+ fi -+done -+ -+if test x"$T1_AA_TYPE32" = "x"; then -+ AC_MSG_ERROR("Unable to determine which integer type is 32 bit.") - fi - -- - dnl **** Check which ANSI integer type is 64 bit -- --AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type, -- AC_TRY_RUN([ --int main(void) { -- if (sizeof(long)==8) -- return(0); -- else -- return(1); --}], ac_64bit_type="long", ac_64bit_type="<none>")) --if test "$ac_64bit_type" = "long" --then -- T1_AA_TYPE64="-DT1_AA_TYPE64=long" --else -- T1_AA_TYPE64= -+T1_AA_TYPE64="" -+for type in long long_long; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then -+ AC_MSG_WARN("$type is 64 bit") -+ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\"" -+ break -+ fi -+done -+ -+if test x"$T1_AA_TYPE64" = "x"; then -+ AC_MSG_ERROR("Unable to determine which integer type is 64 bit.") - fi - -- - CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\"" - - dnl **** Check for functions and header files **** diff --git a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch deleted file mode 100644 index bc2476bfc..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch +++ /dev/null @@ -1,58 +0,0 @@ -From cea83003de3ffebde92becd1e599fe3b28f0a7c4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Mar 2017 23:13:36 -0800 -Subject: [PATCH] t1lib: Fix printf format string errors - -Fix printf formats to use format qualifiers -fixes - -error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - ---- - lib/t1lib/t1subset.c | 2 +- - lib/type1/objects.c | 2 +- - lib/type1/objects.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/t1lib/t1subset.c b/lib/t1lib/t1subset.c -index da427b2..e76974f 100644 ---- a/lib/t1lib/t1subset.c -+++ b/lib/t1lib/t1subset.c -@@ -759,7 +759,7 @@ char *T1_SubsetFont( int FontID, - tr_len); - T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf, - T1LOG_DEBUG); -- l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */ -+ l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */ - } - - /* compute size of output file */ -diff --git a/lib/type1/objects.c b/lib/type1/objects.c -index c413a0f..f828e6a 100644 ---- a/lib/type1/objects.c -+++ b/lib/type1/objects.c -@@ -957,7 +957,7 @@ struct xobject *TypeErr(name, obj, expect, ret) /* non-ANSI avoids overly strict - - sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", - name, TypeFmt(expect), TypeFmt(obj->type)); -- IfTrace0(TRUE,typemsg); -+ IfTrace1(TRUE, "%s", typemsg); - - ObjectPostMortem(obj); - -diff --git a/lib/type1/objects.h b/lib/type1/objects.h -index 13cbae7..3a1d337 100644 ---- a/lib/type1/objects.h -+++ b/lib/type1/objects.h -@@ -214,7 +214,7 @@ struct xobject { - /*SHARED*/ - /* NDW: personally, I want to see status and error messages! */ - #define IfTrace0(condition,model) \ -- {if (condition) printf(model);} -+ {if (condition) fputs(model,stdout);} - #define IfTrace1(condition,model,arg0) \ - {if (condition) printf(model,arg0);} - #define IfTrace2(condition,model,arg0,arg1) \ diff --git a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch deleted file mode 100644 index da54f87ab..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch +++ /dev/null @@ -1,144 +0,0 @@ -From bab41f5e1fc1fc809da1371e6a0222e0eb21e5f0 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Mon, 21 Nov 2011 12:00:54 +0100 -Subject: [PATCH] t1lib: add 5.1.2 - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- - Makefile.in | 5 +++-- - examples/Makefile.in | 5 +++-- - lib/Makefile.in | 6 ++++-- - lib/t1lib/Makefile.in | 6 ++++-- - lib/type1/Makefile.in | 6 ++++-- - type1afm/Makefile.in | 6 ++++-- - xglyph/Makefile.in | 6 ++++-- - 7 files changed, 26 insertions(+), 14 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 29c3468..396c020 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -18,7 +18,8 @@ - # Last modified: 2005-05-01 - # - --SHELL = /bin/sh -+SHELL = @SHELL@ -+LIBTOOL = @LIBTOOL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -@@ -149,7 +150,7 @@ distclean: clean - $(RM) examples/Makefile - $(RM) xglyph/Makefile - $(RM) doc/Makefile -- $(RM) libtool -+ $(RM) $(LIBTOOL) - - - # The following two targets are for building and cleaning the python- -diff --git a/examples/Makefile.in b/examples/Makefile.in -index b301db5..7a6a514 100644 ---- a/examples/Makefile.in -+++ b/examples/Makefile.in -@@ -14,9 +14,10 @@ - # Last modified: 2001-04-01 - # - -+top_builddir = @top_builddir@ - --LIBTOOL = ../libtool --SHELL = /bin/sh -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/lib/Makefile.in b/lib/Makefile.in -index 89e5e86..6e0f960 100644 ---- a/lib/Makefile.in -+++ b/lib/Makefile.in -@@ -15,8 +15,10 @@ - # - # Contributions by H.Kakugawa to use libtool! - --LIBTOOL = ../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/lib/t1lib/Makefile.in b/lib/t1lib/Makefile.in -index a6c2478..32434b3 100644 ---- a/lib/t1lib/Makefile.in -+++ b/lib/t1lib/Makefile.in -@@ -14,8 +14,10 @@ - # - # Modified by H.Kakugawa to use libtool - --LIBTOOL = ../../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/lib/type1/Makefile.in b/lib/type1/Makefile.in -index 241f124..42efa94 100644 ---- a/lib/type1/Makefile.in -+++ b/lib/type1/Makefile.in -@@ -14,8 +14,10 @@ - # - # Modified by H.Kakugawa to use libtool - --LIBTOOL = ../../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/type1afm/Makefile.in b/type1afm/Makefile.in -index 61611e1..9b51406 100644 ---- a/type1afm/Makefile.in -+++ b/type1afm/Makefile.in -@@ -15,8 +15,10 @@ - # - # Modified by H.Kakugawa to use libtool - --LIBTOOL = ../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/xglyph/Makefile.in b/xglyph/Makefile.in -index 8da9b63..741334c 100644 ---- a/xglyph/Makefile.in -+++ b/xglyph/Makefile.in -@@ -15,8 +15,10 @@ - # - # Modified by H.Kakugawa to use libtool - --LIBTOOL = ../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ diff --git a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb deleted file mode 100644 index 826dbda85..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A Type1 Font Rastering Library" -SECTION = "libs" -DEPENDS = "virtual/libx11 libxaw" - -LICENSE = "LGPLv2 & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \ - file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \ -" - -SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \ - file://configure.patch \ - file://libtool.patch \ - file://format_security.patch" -SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c" -SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59" - -inherit autotools-brokensep distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -# Fix GNU_HASH problem -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OECONF = "--with-x --without-athena" -EXTRA_OEMAKE = "without_doc" - -FILES_${PN} += " ${datadir}/t1lib/t1lib.config" -FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf" - diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch new file mode 100644 index 000000000..39f899cf1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch @@ -0,0 +1,66 @@ +From 4e4c8c7a1cca2125e2bf2a67cbab0bdbd78fdb86 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Tue, 30 Jul 2019 13:24:22 +0800 +Subject: [PATCH] ptts: Set recv buffer size too max to receive as many + packets as possible + +Flooding multicast may make the rcv buffer overrun and is considered +premature messages later and thus cause the following error. + +"Ignoring premature msg 16, currently handling 12" + +This patch sets SO_RCVBUF the of socket to max int value to receive as many +packets as possible, and give a hint to user when possible overrun occurs. Note +that the value of SO_RCVBUF will be limited up to min(INT_MAX/2, +sysctl_rmem_max) in kernel. + +Signed-off-by: He Zhe <zhe.he@windriver.com> + +Upstream-Status: Backport + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + ptts/tipc_ts_server.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/ptts/tipc_ts_server.c b/ptts/tipc_ts_server.c +index a286daa..3a2f96f 100644 +--- a/ptts/tipc_ts_server.c ++++ b/ptts/tipc_ts_server.c +@@ -641,8 +641,9 @@ void server_mcast + if (rc < 0) + err("multicast message not received"); + if (msgno != *(int*) buf) { +- dbg1("Ignoring premature msg %u, currently handling %u\n", +- *(int*)buf, msgno); ++ dbg1("Ignoring premature msg %u, currently handling %u\n" ++ "You can enlarge /proc/sys/net/core/rmem_max and try again\n", ++ *(int*)buf, msgno); + continue; + } + rc = recvfrom(sd[i], buf, expected_szs[numSubTest], +@@ -687,8 +688,21 @@ void server_test_multicast(void) + FD_ZERO(&readfds); + + for (i = 0; i < TIPC_MCAST_SOCKETS; i++) { ++ int optval = (int)(~0U >> 1); ++ socklen_t optlen = sizeof(optval); ++ int rc = 0; ++ + sd[i] = createSocketTIPC (SOCK_RDM); + FD_SET(sd[i], &readfds); ++ ++ /* ++ * Flooding multicast may make the rcv buffer overrun and considered premature msg later. ++ * Set SO_RCVBUF to max int value to receive as many packets as possible. ++ * Note that it will be limited up to min(INT_MAX/2, sysctl_rmem_max) in kernel. ++ */ ++ rc = setsockopt(sd[i], SOL_SOCKET, SO_RCVBUF, (const char*)&optval, optlen); ++ if(rc != 0) ++ printf("Failed to set SO_RCVBUF of %d: %s\n", sd[i], strerror(errno)); + } + + server_bindMulticast( 0, 99, sd[0]); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 054e0acc8..637770af2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -6,6 +6,7 @@ SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ + file://0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch \ " SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" PV = "2.2.0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch deleted file mode 100644 index 4b17087ef..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d314f26e024aaf15bf4ab22ceb98501148d0eac8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 7 May 2018 19:53:33 -0700 -Subject: [PATCH] Replace strncpy with memcpy - -gcc8 detects that strncpy is overwiritng the null terminating character -the source strings are already initialized to 0 so memcpy would do the same -job - -Fixes -rn2903.c:153:5: error: 'strncpy' output may be truncated copying 16 bytes from a string of length 511 [-Werror=stringop-truncation] - strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ecezo/ecezo.c | 2 +- - src/rn2903/rn2903.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ecezo/ecezo.c b/src/ecezo/ecezo.c -index 6a195fc1..56c6dab3 100644 ---- a/src/ecezo/ecezo.c -+++ b/src/ecezo/ecezo.c -@@ -488,7 +488,7 @@ int ecezo_send_command(const ecezo_context dev, char *cmd, char *buffer, - // our write buffer - char writeBuffer[ECEZO_MAX_BUFFER_LEN]; - -- strncpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN); -+ memcpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN-1); - writeBuffer[ECEZO_MAX_BUFFER_LEN - 1] = 0; - - int writelen = strlen(writeBuffer); -diff --git a/src/rn2903/rn2903.c b/src/rn2903/rn2903.c -index f30a33ae..01a011da 100644 ---- a/src/rn2903/rn2903.c -+++ b/src/rn2903/rn2903.c -@@ -150,7 +150,7 @@ static rn2903_context _rn2903_postinit(rn2903_context dev, - rn2903_close(dev); - return NULL; - } -- strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); -+ memcpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); - - return dev; - } --- -2.17.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Use-stdint-types.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Use-stdint-types.patch new file mode 100644 index 000000000..40856fcf0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Use-stdint-types.patch @@ -0,0 +1,139 @@ +From 5a1e731d71d577f56a2c013e4a75a8e90188e63b Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 9 Jul 2019 05:21:59 -0700 +Subject: [PATCH] Use stdint types + +Fixes compilation with musl. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + src/bma250e/bma250e.cxx | 16 ++++++++-------- + src/bmg160/bmg160.cxx | 10 +++++----- + src/bmi160/bosch_bmi160.h | 2 +- + src/bmm150/bmm150.cxx | 8 ++++---- + 4 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/src/bma250e/bma250e.cxx b/src/bma250e/bma250e.cxx +index a8792782..1b3ecdd8 100644 +--- a/src/bma250e/bma250e.cxx ++++ b/src/bma250e/bma250e.cxx +@@ -195,35 +195,35 @@ BMA250E::BMA250E(std::string initStr) : mraaIo(initStr) + fifoConfig(mode, axes); + } + if(tok.substr(0, 20) == "setInterruptEnable0:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(20), nullptr, 0); + setInterruptEnable0(bits); + } + if(tok.substr(0, 20) == "setInterruptEnable1:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(20), nullptr, 0); + setInterruptEnable1(bits); + } + if(tok.substr(0, 20) == "setInterruptEnable2:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(20), nullptr, 0); + setInterruptEnable2(bits); + } + if(tok.substr(0, 17) == "setInterruptMap0:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap0(bits); + } + if(tok.substr(0, 17) == "setInterruptMap1:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap1(bits); + } + if(tok.substr(0, 17) == "setInterruptMap2:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap2(bits); + } + if(tok.substr(0, 16) == "setInterruptSrc:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(16), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(16), nullptr, 0); + setInterruptSrc(bits); + } + if(tok.substr(0, 26) == "setInterruptOutputControl:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(26), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(26), nullptr, 0); + setInterruptOutputControl(bits); + } + if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { +diff --git a/src/bmg160/bmg160.cxx b/src/bmg160/bmg160.cxx +index 1a0939f8..2438c399 100644 +--- a/src/bmg160/bmg160.cxx ++++ b/src/bmg160/bmg160.cxx +@@ -173,23 +173,23 @@ BMG160::BMG160(std::string initStr) : mraaIo(initStr) + fifoConfig(mode, axes); + } + if(tok.substr(0, 20) == "setInterruptEnable0:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(20), nullptr, 0); + setInterruptEnable0(bits); + } + if(tok.substr(0, 17) == "setInterruptMap0:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap0(bits); + } + if(tok.substr(0, 17) == "setInterruptMap1:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap1(bits); + } + if(tok.substr(0, 16) == "setInterruptSrc:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(16), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(16), nullptr, 0); + setInterruptSrc(bits); + } + if(tok.substr(0, 26) == "setInterruptOutputControl:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(26), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(26), nullptr, 0); + setInterruptOutputControl(bits); + } + if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { +diff --git a/src/bmi160/bosch_bmi160.h b/src/bmi160/bosch_bmi160.h +index 87ca2249..cd9efe6f 100644 +--- a/src/bmi160/bosch_bmi160.h ++++ b/src/bmi160/bosch_bmi160.h +@@ -81,7 +81,7 @@ typedef int16_t s16;/**< used for signed 16bit */ + typedef int32_t s32;/**< used for signed 32bit */ + typedef int64_t s64;/**< used for signed 64bit */ + +-typedef u_int8_t u8;/**< used for unsigned 8bit */ ++typedef uint8_t u8;/**< used for unsigned 8bit */ + typedef u_int16_t u16;/**< used for unsigned 16bit */ + typedef u_int32_t u32;/**< used for unsigned 32bit */ + typedef u_int64_t u64;/**< used for unsigned 64bit */ +diff --git a/src/bmm150/bmm150.cxx b/src/bmm150/bmm150.cxx +index 234ebf92..02436788 100644 +--- a/src/bmm150/bmm150.cxx ++++ b/src/bmm150/bmm150.cxx +@@ -170,19 +170,19 @@ BMM150::BMM150(std::string initStr) : mraaIo(initStr) + setOpmode(opmode); + } + if(tok.substr(0, 19) == "setInterruptEnable:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(19), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(19), nullptr, 0); + setInterruptEnable(bits); + } + if(tok.substr(0, 19) == "setInterruptConfig:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(19), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(19), nullptr, 0); + setInterruptConfig(bits); + } + if(tok.substr(0, 17) == "setRepetitionsXY:") { +- u_int8_t reps = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t reps = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setRepetitionsXY(reps); + } + if(tok.substr(0, 16) == "setRepetitionsZ:") { +- u_int8_t reps = (u_int8_t)std::stoul(tok.substr(16), nullptr, 0); ++ uint8_t reps = (uint8_t)std::stoul(tok.substr(16), nullptr, 0); + setRepetitionsZ(reps); + } + if(tok.substr(0, 14) == "setPresetMode:") { diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch deleted file mode 100644 index a0a47411d..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 48a580bd402cf6a3ee9e42013653219bfeb3caf6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 21 Jun 2018 18:39:16 -0700 -Subject: [PATCH] include sys/types.h for uint definition - -uint is defined in sys/types.h, therefore this -header needs to be included, it gets exposed with -musl where this header is not getting included indirectly -as it is happening when building on glibc - -Fixes build errors on musl e.g. -upm/src/kx122/kx122.hpp:456:31: error: 'uint' has not been declared -| void setBufferThreshold(uint samples); -| ^~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [https://github.com/intel-iot-devkit/upm/pull/656] - src/kx122/kx122.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/kx122/kx122.h b/src/kx122/kx122.h -index 1622ed50..56e5215e 100644 ---- a/src/kx122/kx122.h -+++ b/src/kx122/kx122.h -@@ -31,6 +31,7 @@ extern "C"{ - #include <assert.h> - #include <unistd.h> - #include <math.h> -+#include <sys/types.h> - - #include <mraa/i2c.h> - #include <mraa/spi.h> diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb index 8854a33bc..a6b379ec3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -7,13 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" DEPENDS = "libjpeg-turbo mraa" -SRCREV = "dc45cd78595c7c24c8a8574c63bb48b5bb99c5aa" -PV = "1.6.0-git${SRCPV}" +SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" +PV = "2.0.0+git${SRCPV}" SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ - file://0001-Replace-strncpy-with-memcpy.patch \ - file://0001-include-sys-types.h-for-uint-definition.patch \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ + file://0001-Use-stdint-types.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb index 398ca5c21..3103748e4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb @@ -31,8 +31,7 @@ PACKAGECONFIG ??= "python3" PACKAGECONFIG[python] = "--with-python,--without-python,python,python" PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3" -RDEPENDS_python3-${PN} += "${PN}" - -PACKAGES += "python3-${PN}" -FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python3-${BPN} += "${PN}" +PACKAGES += "python3-${BPN}" +FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/*" diff --git a/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_git.bb b/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb index 9a8101621..831d514a4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb @@ -13,8 +13,7 @@ SRC_URI = "git://github.com/berke/wipe.git;branch=master \ file://support-cross-compile-for-linux.patch \ file://makefile-add-ldflags.patch \ " -SRCREV = "d9c100c9cd0b1cbbe4359e4d6c9a035d11e7597c" -PV = "0.23+git${SRCPV}" +SRCREV = "796b62293e007546e051619bd03f5ba338ef28e5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch deleted file mode 100644 index 71a989103..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b97f62fdf3b78eb5cfcb3a1b12c6fd62f735717b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 15 Jul 2017 09:29:33 -0700 -Subject: [PATCH] event.c: Cast pthread_t to unsigned long instead of unsigned - int - -On 64bit machines it ends up in errors - -event.c:85:67: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] - a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/event.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/event.c b/src/event.c -index 8f988b5..c632c33 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -82,7 +82,7 @@ zlog_event_t *zlog_event_new(int time_cache_count) - a_event->tid = pthread_self(); - - a_event->tid_str_len = sprintf(a_event->tid_str, "%lu", (unsigned long)a_event->tid); -- a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); -+ a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%lu", (unsigned long)a_event->tid); - - //zlog_event_profile(a_event, ZC_DEBUG); - return a_event; --- -2.13.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb index de7516457..b94664c33 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb @@ -3,12 +3,8 @@ HOMEPAGE = "https://github.com/HardySimpson/zlog" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -PV = "1.2.12+git${SRCPV}" - -SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" -SRC_URI = "git://github.com/HardySimpson/zlog \ - file://0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch \ - " +SRCREV = "8fc78c3c65cb705953a2f3f9a813c3ef3c8b2270" +SRC_URI = "git://github.com/HardySimpson/zlog" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/dev-zram0.swap b/meta-openembedded/meta-oe/recipes-extended/zram/zram/dev-zram0.swap new file mode 100644 index 000000000..05eae7eed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/dev-zram0.swap @@ -0,0 +1,10 @@ +[Unit] +Description=Enable compressed swap in memory using zram +Requires=zram-swap.service +After=zram-swap.service + +[Swap] +What=/dev/zram0 + +[Install] +WantedBy=swap.target diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-deinit b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-deinit new file mode 100755 index 000000000..46248c401 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-deinit @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +device=$1 +if [ "$device" = "" ]; then + echo "Usage: zram-swap-deinit <device>" + exit 1 +fi + +sysblockdev=/sys/block/$(basename $device) +if [ ! -d $sysblockdev ]; then + echo "Block device not found in sysfs" + exit 1 +fi + +# zramctl -r is not suitable as it also removes the actual device. Recreating +# it is non-trivial, especially if not /dev/zram0 is used... +echo 1 > ${sysblockdev}/reset + diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init new file mode 100755 index 000000000..0643dbca2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init @@ -0,0 +1,26 @@ +#!/bin/sh +set -e + +device=$1 +if [ "$device" = "" ]; then + echo "Usage: zram-swap-init <device>" + exit 1 +fi + +# Allocate zram to be size of actual system memory +# Note: zram is only allocated when used. When swapped pages compress with a +# a 2:1 ratio zram will require 50% of system memory (while allowing to use +# 150% memory). +ZRAM_SIZE_PERCENT=100 +ZRAM_ALGORITHM=lz4 + +[ -f /etc/default/zram ] && ./etc/default/zram || true + +memtotal=$(grep MemTotal /proc/meminfo | awk ' { print $2 } ') +memzram=$(($memtotal*${ZRAM_SIZE_PERCENT}/100)) + +# Try loading zram module +modprobe -q zram || true + +zramctl -a ${ZRAM_ALGORITHM} -s ${memzram}KB $device +mkswap -L "zram-swap" $device diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap.service b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap.service new file mode 100644 index 000000000..a4dc9514e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap.service @@ -0,0 +1,10 @@ +[Unit] +Description=Create compressed swap in memory using zram +DefaultDependencies=no + +[Service] +Type=oneshot +RemainAfterExit=yes +TimeoutStartSec=30sec +ExecStart=@LIBEXECDIR@/zram-swap-init /dev/zram0 +ExecStop=@LIBEXECDIR@/zram-swap-deinit /dev/zram0 diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service deleted file mode 100644 index 4a19367d9..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Enable zram compressed in-memory swap. -After=multi-user.target - -[Service] -RemainAfterExit=yes -ExecStart=/usr/bin/zram-load.sh --load -ExecStop=/usr/bin/zram-load.sh --unload -Type=oneshot - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zramstop b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zramstop new file mode 100644 index 000000000..07777978e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zramstop @@ -0,0 +1,5 @@ +#!/bin/sh + +for i in $(grep '^/dev/zram' /proc/swaps | awk '{ print $1 }'); do + swapoff "$i" && zramctl --reset "$i" +done diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb b/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb deleted file mode 100644 index dfd75e71c..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Linux zram compressed in-memory swap" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit update-rc.d systemd - -RDEPENDS_${PN} = "util-linux-swaponoff kmod" -RRECOMMENDS_${PN} = "kernel-module-zram" - -PR = "r3" - -SRC_URI = " \ - file://init \ - file://zram.service \ -" - -do_install () { - # Sysvinit - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system -} - -FILES_${PN} = "${sysconfdir}" -INITSCRIPT_NAME = "zram" -INITSCRIPT_PARAMS = "start 05 2 3 4 5 . stop 22 0 1 6 ." - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "zram.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb new file mode 100644 index 000000000..98c47af7a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb @@ -0,0 +1,50 @@ +SUMMARY = "Linux zram compressed in-memory swap" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit update-rc.d systemd + +RDEPENDS_${PN} = "kmod \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','util-linux','util-linux-swaponoff',d)}" +RRECOMMENDS_${PN} = "kernel-module-zram" + +PR = "r3" + +SRC_URI = " \ + file://init \ + file://zram-swap-init \ + file://zram-swap-deinit \ + file://zram-swap.service \ + file://dev-zram0.swap \ +" + +do_install () { + # Install systemd related configuration file + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${libexecdir} + install -m 0755 ${WORKDIR}/zram-swap-init ${D}${libexecdir} + install -m 0755 ${WORKDIR}/zram-swap-deinit ${D}${libexecdir} + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/zram-swap.service ${D}${systemd_unitdir}/system/zram-swap.service + sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/zram-swap.service + install -m 0644 ${WORKDIR}/dev-zram0.swap ${D}${systemd_unitdir}/system/dev-zram0.swap + fi +} + +FILES_${PN} = " \ + ${sysconfdir} \ + ${systemd_unitdir} \ + ${libexecdir} \ +" +INITSCRIPT_NAME = "zram" +INITSCRIPT_PARAMS = "start 05 2 3 4 5 . stop 22 0 1 6 ." + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "dev-zram0.swap" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb new file mode 100644 index 000000000..e97b4efb2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb @@ -0,0 +1,35 @@ +SUMMARY = "Zstandard - Fast real-time compression algorithm" +DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ +real-time compression scenarios at zlib-level and better compression ratios. \ +It's backed by a very fast entropy stage, provided by Huff0 and FSE library." +HOMEPAGE = "http://www.zstd.net/" +SECTION = "console/utils" + +LICENSE = "BSD-3-Clause & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" + +SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" + +SRCREV = "a3d655d2255481333e09ecca9855f1b37f757c52" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" +PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" +PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" + +# See programs/README.md for how to use this +ZSTD_LEGACY_SUPPORT ??= "4" + +do_compile () { + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} + +BBCLASSEXTEND = "native nativesdk" |