diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
11 files changed, 181 insertions, 8 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb index 68beec670..3933355ab 100644 --- a/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb +++ b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb @@ -1,6 +1,6 @@ SUMMARY = "inputattach configuration file" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://inputattach.conf" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-cxxopts-Add-limits-header.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-cxxopts-Add-limits-header.patch new file mode 100644 index 000000000..ef26c475d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-cxxopts-Add-limits-header.patch @@ -0,0 +1,34 @@ +From fda0713ce3e07786757a057abe7ebf2146d33780 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Mar 2021 18:31:45 -0800 +Subject: [PATCH] cxxopts: Add limits header + +needed for numeric_limits + +Upstream-Status: Submitted [https://github.com/apache/nifi-minifi-cpp/pull/1021] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + thirdparty/cxxopts/include/cxxopts.hpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/thirdparty/cxxopts/include/cxxopts.hpp ++++ b/thirdparty/cxxopts/include/cxxopts.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include <cctype> + #include <exception> + #include <iostream> ++#include <limits> + #include <map> + #include <memory> + #include <regex> +--- a/libminifi/src/utils/StringUtils.cpp ++++ b/libminifi/src/utils/StringUtils.cpp +@@ -21,6 +21,8 @@ + #include <Windows.h> + #endif + ++#include <limits> ++ + namespace org { + namespace apache { + namespace nifi { diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 34090cf28..322b58477 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -28,6 +28,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ file://0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch \ file://0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch \ file://0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch \ + file://0001-cxxopts-Add-limits-header.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb index 4059fd47e..8b7a8d06e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} += "hiredis" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "a9f9c301f8de1c181e6d45c573b5d1fe7b8200b1" +SRCREV = "8ac506e6eb0e5c5b2625785b67400bde705773a1" SRC_URI = "git://github.com/sewenew/redis-plus-plus" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.service b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.service new file mode 100644 index 000000000..0aacff32d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.service @@ -0,0 +1,21 @@ +[Unit] +Description=System Logging Service +Requires=syslog.socket +Wants=network.target network-online.target +After=network.target network-online.target +Documentation=man:rsyslogd(8) +Documentation=http://www.rsyslog.com/doc/ + +[Service] +Type=notify +ExecStart=@sbindir@/rsyslogd -n -iNONE +StandardOutput=null +Restart=on-failure + +# Increase the default a bit in order to allow many simultaneous +# files to be monitored, we might need a lot of fds. +LimitNOFILE=16384 + +[Install] +WantedBy=multi-user.target +Alias=syslog.service diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb index b6c2a991f..15e31cec8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t file://initscript \ file://rsyslog.conf \ file://rsyslog.logrotate \ + file://rsyslog.service \ file://use-pkgconfig-to-check-libgcrypt.patch \ file://run-ptest \ " @@ -29,8 +30,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "33de768941953ceeca9d1a437b47891b" -SRC_URI[sha256sum] = "d9589e64866f2fdc5636af4cae9d60ebf1e3257bb84b81ee953ede6a05878e97" +SRC_URI[md5sum] = "1f6150dfd2ef38db37c2165e98d2f2b1" +SRC_URI[sha256sum] = "94ee0d0312c2edea737665594cbe4a9475e4e3b593e12b5b8ae3a743ac9c72a7" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" @@ -77,6 +78,7 @@ PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind," +PACKAGECONFIG[imhttp] = "--enable-imhttp,--disable-imhttp,civetweb," do_configure_prepend() { sed -i -e 's|python |python3 |g' ${S}/tests/*.sh @@ -147,8 +149,9 @@ do_install_append() { echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - sed -i -e "s#;Requires=syslog.socket#Requires=syslog.socket#g" ${D}${systemd_system_unitdir}/rsyslog.service - sed -i -e "s#;Alias=syslog.service#Alias=syslog.service#g" ${D}${systemd_system_unitdir}/rsyslog.service + install -d ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/rsyslog.service ${D}${systemd_system_unitdir} + sed -i -e "s,@sbindir\@,$(sbindir),g" ${D}${systemd_system_unitdir}/rsyslog.service fi } diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb b/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb index 369e2f6f4..4fd516bc2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb @@ -13,7 +13,7 @@ PACKAGECONFIG ??= "decode" inherit autotools pkgconfig mime-xdg SRC_URI = "http://sigrok.org/download/source/sigrok-cli/sigrok-cli-${PV}.tar.gz" -SRC_URI[md5sum] = "3f45ce664bad529d8b3f78a61b017d75" -SRC_URI[sha256sum] = "f52413429f47d457c333db0fd068416ab7a3f9e35ca76de8624dc5ac6fb07797" +SRC_URI[md5sum] = "856fd496cd99d1091aa128405c522a36" +SRC_URI[sha256sum] = "71d0443f36897bf565732dec206830dbea0f2789b6601cf10536b286d1140ab8" FILES_${PN} += "${datadir}/icons/hicolor" diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch new file mode 100644 index 000000000..87c0e1458 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch @@ -0,0 +1,84 @@ +From b621a313e0bc67803abfba18e1ae15e7a8b9b59f Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Mon, 22 Feb 2021 17:21:33 +0200 +Subject: [PATCH] smartmontools: Improve reproducibility + +Backport changes added to master smartmontools. +https://github.com/smartmontools/smartmontools/commit/24838916b4c0e91f5c897d44fcdeedb22848f684 + +Upstream-Status: Backported +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + ChangeLog | 8 ++++++++ + configure.ac | 12 ++++++++++++ + utility.cpp | 10 ++++++++++ + 3 files changed, 30 insertions(+) + +diff --git a/ChangeLog b/ChangeLog +index 39eac2d..6a3b4ee 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,13 @@ + $Id: ChangeLog 5155 2020-12-30 16:49:18Z chrfranke $ + ++2021-02-07 Christian Franke <franke@computer.org> ++ ++ Improve reproducibility if SOURCE_DATE_EPOCH if set (GH pull/89). ++ configure.ac: Define SOURCE_DATE_EPOCH in CPPFLAGS. ++ utility.cpp: Print SOURCE_DATE_EPOCH value if specified. ++ Don't include configure arguments then. ++ cppcheck.sh: Silence related 'ConfigurationNotChecked' message. ++ + 2020-12-30 Christian Franke <franke@computer.org> + + smartmontools 7.2 +diff --git a/configure.ac b/configure.ac +index ee6f0e5..c37c9bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -61,6 +61,18 @@ case "${host}" in + ;; + esac + ++AC_MSG_CHECKING([whether reproducible build is selected (SOURCE_DATE_EPOCH)]) ++res=no ++if test -n "$SOURCE_DATE_EPOCH"; then ++ res=yes ++ test -z "`echo "$SOURCE_DATE_EPOCH" | sed 's,[[0-9]]*,,'`" || res=error ++fi ++AC_MSG_RESULT([$res]) ++case $res in ++ error) AC_MSG_ERROR([Malformed SOURCE_DATE_EPOCH]) ;; ++ yes) CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-DSOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH" ;; ++esac ++ + # Check for SVN. + AC_MSG_CHECKING([whether this is a build from SVN]) + is_svn_build=no +diff --git a/utility.cpp b/utility.cpp +index 0483c6f..8ab38c9 100644 +--- a/utility.cpp ++++ b/utility.cpp +@@ -134,9 +134,19 @@ std::string format_version_info(const char * prog_name, bool full /*= false*/) + #endif + "\n" + "smartmontools configure arguments:" ++#ifdef SOURCE_DATE_EPOCH ++ " [hidden in reproducible builds]\n" ++ "reproducible build SOURCE_DATE_EPOCH: " ++#endif + ; ++#ifdef SOURCE_DATE_EPOCH ++ char ts[32]; struct tm tmbuf; ++ strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S", time_to_tm_local(&tmbuf, SOURCE_DATE_EPOCH)); ++ info += strprintf("%u (%s)", (unsigned)SOURCE_DATE_EPOCH, ts); ++#else + info += (sizeof(SMARTMONTOOLS_CONFIGURE_ARGS) > 1 ? + SMARTMONTOOLS_CONFIGURE_ARGS : " [no arguments given]"); ++#endif + info += '\n'; + + return info; +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb index 3c01e589c..cd9793359 100644 --- a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb @@ -16,6 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ file://initd.smartd \ file://smartmontools.default \ file://smartd.service \ + file://0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)}" 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 bc930ac9d..3b2b6a9da 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 @@ -14,6 +14,33 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig update-alternatives +PACKAGES =+ "${PN}-access ${PN}-isotp ${PN}-j1939 ${PN}-cantest ${PN}-slcan ${PN}-log" + +FILES_${PN}-access = " \ + ${bindir}/cangw \ + ${bindir}/canlogserver \ + ${bindir}/bcmserver \ + ${bindir}/socketcand \ + ${bindir}/cannelloni \ +" + +FILES_${PN}-isotp = "${bindir}/isotp*" + +FILES_${PN}-j1939 = " \ + ${bindir}/j* \ + ${bindir}/testj1939 \ +" + +FILES_${PN}-cantest = " \ + ${bindir}/canbusload \ + ${bindir}/can-calc-bit-timing \ + ${bindir}/canfdtest \ +" + +FILES_${PN}-slcan = "${bindir}/slcan*" + +FILES_${PN}-log = "${bindir}/*log*" + ALTERNATIVE_${PN} = "candump cansend cansequence" ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb index cd0b471e1..d0cc625aa 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb @@ -9,6 +9,8 @@ LICENSE = "BSD-3-Clause & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" +inherit lib_package + SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1 \ file://0001-Fix-legacy-build-after-2103.patch \ " |