From a2681d9b6ff6eb6e4456d769b8d76e77b2c4d51d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 16 Oct 2020 10:17:07 -0500 Subject: meta-openembedded: subtree update:bccd3277e4..2258c9a767 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alejandro Enedino Hernandez Samaniego (1): gedit: Add gsettings-desktop-schemas to RDEPENDS Alexander Vickberg (1): wolfssl: upgrade 4.4.0 -> 4.5.0 Andreas Müller (11): gnome-settings-daemon: Remove wrong RDEPEND gnome-desktop3: upgrade 3.36.5 -> 3.36.6 grilo: upgrade 0.3.12 -> 0.3.13 gspell: upgrade 1.8.3 -> 1.8.4 libgdata: upgrade 0.17.12 -> 0.17.13 tracker: upgrade 2.3.4 -> 2.3.6 tracker-miners: upgrade 2.3.3 -> 2.3.5 gjs: upgrade 1.58.7 -> 1.58.8 xfce4-notifyd: upgrade 0.6.1 -> 0.6.2 live555: upgrade 20200721 -> 20200819 vlc: upgrade 3.0.11 -> 3.0.11.1 Andrey Zhizhikin (1): python3-pybind11: extend to native and nativesdk Armin Kuster (3): cmocka: add recipe musl-nscd: add package add musl-nscd to pkg grps Bartosz Golaszewski (2): libgpiod: drop support for 0.3.3 libgpiod: consolidate the recipe files Diego Rondini (1): README: fix incorrect links Geoff Parker (1): multipath-tools: replace perl with sed in libdmmp/Makefile for pseudo Gianfranco Costamagna (1): vboxguestdrivers: upgrade 6.1.12 -> 6.1.14 Drop kernel 5.8 compatibility patch, now part of upstream codebase Hongxu Jia (4): python3-argcomplete: add recipe 1.12.0 python3-dateutil/python3-pykwalify: add nativesdk support python3-pykwalify: fix missing comma python3-docopt: add version 0.6.2 Kai Kang (2): python3-iniconfig: add recipe python3-pytest: 5.4.3 -> 6.1.0 Khem Raj (3): st: Use update alternatives numactl: Link with libatomic on rv64/rv32 ubi-utils-klibc: Remove trailing slash from S Lee Chee Yang (4): ace : improve reproducibility libgphoto2: improve reproducibility tbb: improve reproducibility glog : improve reproducibility Leon Anavi (57): python3-langtable: Upgrade 0.0.52 -> 0.0.53 python3-sentry-sdk: Upgrade 0.17.5 -> 0.17.6 python3-cmd2: Upgrade 1.3.9 -> 1.3.10 python3-rfc3339-validator: Upgrade 0.1.1 -> 0.1.2 python3-h2: Upgrade 3.2.0 -> 4.0.0 python3-luma-core: Upgrade 1.16.1 -> 1.16.2 python3-isort: Upgrade 5.5.2 -> 5.5.3 python3-xlsxwriter: Upgrade 1.3.3 -> 1.3.4 python3-flask-uploads: Consolidate in a single file python3-paho-mqtt: Upgrade 1.5.0 -> 1.5.1 python3-sentry-sdk: Upgrade 0.17.6 -> 0.17.7 python3-importlib-metadata: Upgrade 1.7.0 -> 2.0.0 python3-pint: Upgrade 0.16 -> 0.16.1 python3-zipp: Upgrade 3.1.0 -> 3.2.0 python3-xlsxwriter: Upgrade 1.3.4 -> 1.3.5 python3-greenlet: Upgrade 0.4.16 -> 0.4.17 python3-xlsxwriter: Upgrade 1.3.5 -> 1.3.6 python3-yarl: Upgrade 1.5.1 -> 1.6.0 python3-sentry-sdk: Upgrade 0.17.7 -> 0.17.8 python3-google-api-python-client: Upgrade 1.12.1 -> 1.12.2 python3-cryptography: Upgrade 3.1 -> 3.1.1 python3-cryptography-vectors: Upgrade 3.1 -> 3.1.1 python3-gevent: Upgrade 20.6.2 -> 20.9.0 python3-pycrypto: Consolidate in a single file python3-pychromecast: Upgrade 7.3.0 -> 7.5.0 python3-beautifulsoup4: Upgrade 4.9.1 -> 4.9.2 python3-tqdm: Upgrade 4.49.0 -> 4.50.0 python3-argcomplete: Upgrade 1.12.0 -> 1.12.1 python3-luma-core: Upgrade 1.16.2 -> 1.17.1 python3-luma-oled: Upgrade 3.5.0 -> 3.6.0 python3-regex: Upgrade 2020.7.14 -> 2020.9.27 python3-djangorestframework: Upgrade 3.11.1 -> 3.12.1 python3-isort: Upgrade 5.5.3 -> 5.5.4 python3-cbor2: Upgrade 5.1.2 -> 5.2.0 python3-humanize: Upgrade 2.6.0 -> 3.0.0 python3-pystemd: Upgrade 0.7.0 -> 0.8.0 python3-sentry-sdk: Upgrade 0.17.8 -> 0.18.0 python3-nocasedict: Upgrade 1.0.0 -> 1.0.1 python3-google-api-python-client: Upgrade 1.12.2 -> 1.12.3 beautifulsoup4: Upgrade 4.9.2 -> 4.9.3 python3-humanize: Upgrade 3.0.0 -> 3.0.1 python3-zipp: Upgrade 3.2.0 -> 3.3.0 python3-cmd2: Upgrade 1.3.10 -> 1.3.11 python3-pywbemtools: Upgrade 0.7.1 -> 0.7.2 python3-prettytable: Upgrade 0.7.2 -> 1.0.0 python3-nocaselist: Upgrade 1.0.2 -> 1.0.3 python3-pandas: Upgrade 1.1.2 -> 1.1.3 python3-configparser: Upgrade 5.0.0 -> 5.0.1 python3-pywbemtools: Upgrade 0.7.2 -> 0.7.3 python3-colorlog: Upgrade 4.2.1 -> 4.4.0 python3-markdown: Upgrade 3.2.2 -> 3.3 python3-tqdm: Upgrade 4.50.0 -> 4.50.2 python3-pywbem: Upgrade 1.0.2 -> 1.1.0 python3-regex: Upgrade 2020.9.27 -> 2020.10.11 python3-multidict: Upgrade 4.7.6 -> 5.0.0 python3-prettytable: Upgrade 1.0.0 -> 1.0.1 python3-pyperclip: Upgrade 1.8.0 -> 1.8.1 Lim Siew Hoon (1): Alliance for Open Media: new library Martin Jansa (4): libhugetlbfs: revert one commit from 2.23 to work around build error on arm netkit-rsh: inherit update-alternatives ssmtp: adjust u-a utouch-*, ifenslave, iozone3, ttf-honkyfonts, python3-smbus: don't use trailing slash in S Michael Vetter (3): jasper: use correct homepage jasper: upgrade 2.0.20 -> 2.0.21 jasper: upgrade 2.0.21 -> 2.0.22 Mingli Yu (3): smartmontools: Remove obsolete setting regarding the Standard Output ippool: Remove obsolete setting in service file strongswan: Remove obsolete setting regarding the Standard Output Naveen Saini (1): tbb: upgrade 2020.2 -> 2020.3 Pascal Bach (1): rocksdb: 6.6.4 -> 6.11.4 Pierre-Jean Texier (1): cppzmq: upgrade 4.6.0 -> 4.7.0 Ricardo Salveti (1): pcsc-lite: upgrade 1.8.26 -> 1.9.0 Richard Purdie (1): minifi-cpp: Adapt to potential psuedo changes Robert Yang (1): crda: rdepends on wireless-regdb-static Romain Naour (1): libiec61850: add recipe for libiec61850 Ross Burton (1): mpv: don't remove lua for aarch64 twice Sakib Sajal (1): libssh2: enable ptest Sinan Kaya (1): collectd: make rrdtool and rrdcached optional Tim Orling (3): python3-markupsafe: bbappend for ptest python3-jinja2: bbappend for ptest packagegroup-meta-python: -jinja2 -markupsafe => ptest Todd Cunningham (1): firewalld: upgrade 0.8.3 -> 0.9.0 Vladimir Zapolskiy (1): cifs-utils: remove explicitly set PV variable Winfried Dobbe (1): firewalld: Add missing rdep on nftables-python Yi Zhao (2): minifi-cpp: do not download source during compile minifi-cpp: set the default repositories location to /var/lib Zang Ruochen (6): byacc: upgrade 20200330 -> 20200910 memtester: upgrade 4.3.0 -> 4.4.0 redis: upgrade 6.0.7 -> 6.0.8 znc: upgrade 1.8.1 -> 1.8.2 arno-iptables-firewall: upgrade 2.1.0 -> 2.1.1 numactl: upgrade 2.0.13 -> 2.0.14 Zheng Ruoqin (1): dnf-plugin-tui: upgrade 1.1 -> 1.2 Zig Globulin (1): libuvc: add recipe Signed-off-by: Andrew Geissler Change-Id: I67cbdcd31a7ead9641a4bce3477ff706f33bb253 --- .../0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 39 +++++++------ .../recipes-extended/byacc/byacc_20200330.bb | 11 ---- .../recipes-extended/byacc/byacc_20200910.bb | 11 ++++ .../recipes-extended/collectd/collectd_5.12.0.bb | 2 + ...keLists.txt-use-curl-local-source-tarball.patch | 34 +++++++++++ ...SSL.cmake-use-libressl-local-source-tarba.patch | 32 +++++++++++ ...edOSSPUUID.cmake-use-ossp-uuid-local-sour.patch | 34 +++++++++++ .../minifi-cpp/files/minifi.service | 2 +- .../minifi-cpp/files/systemd-volatile.conf | 1 - .../minifi-cpp/files/sysvinit-volatile.conf | 1 - .../minifi-cpp/minifi-cpp_0.7.0.bb | 45 ++++++++------- .../meta-oe/recipes-extended/redis/redis_6.0.7.bb | 66 ---------------------- .../meta-oe/recipes-extended/redis/redis_6.0.8.bb | 66 ++++++++++++++++++++++ .../smartmontools/files/smartd.service | 1 - 14 files changed, 227 insertions(+), 118 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200330.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-CMakeLists.txt-use-curl-local-source-tarball.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb (limited to 'meta-openembedded/meta-oe/recipes-extended') diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index c7830ed903..5dcc6afdfe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -15,16 +15,19 @@ Signed-off-by: Zheng Ruoqin Update for 20191103. Signed-off-by: Zheng Ruoqin + +Update for 20200910. +Signed-off-by: Zang Ruochen --- aclocal.m4 | 1 - - configure | 259 ------------------------------------------------------------- + configure | 259 ----------------------------------------------------- 2 files changed, 260 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index b90cfe6..413ea9c 100644 +index 1c6a3ee..2f7e9b5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1232,7 +1232,6 @@ CF_GCC_VERSION +@@ -1317,7 +1317,6 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -33,20 +36,20 @@ index b90cfe6..413ea9c 100644 dnl --------------------------------------------------------------------------- dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/configure b/configure -index ec77bba..234f271 100755 +index 378f27d..8f40229 100755 --- a/configure +++ b/configure -@@ -2059,265 +2059,6 @@ esac +@@ -2066,265 +2066,6 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} --echo "$as_me:2062: checking \$CFLAGS variable" >&5 +-echo "$as_me:2069: checking \$CFLAGS variable" >&5 -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 -case "x$CFLAGS" in -(*-[IUD]*) -- echo "$as_me:2066: result: broken" >&5 +- echo "$as_me:2073: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2068: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +- { echo "$as_me:2075: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} - cf_flags="$CFLAGS" - CFLAGS= @@ -154,18 +157,18 @@ index ec77bba..234f271 100755 - done - ;; -(*) -- echo "$as_me:2176: result: ok" >&5 +- echo "$as_me:2183: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - --echo "$as_me:2181: checking \$CC variable" >&5 +-echo "$as_me:2188: checking \$CC variable" >&5 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in -(*[\ \ ]-*) -- echo "$as_me:2185: result: broken" >&5 +- echo "$as_me:2192: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2187: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +- { echo "$as_me:2194: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -282,26 +285,26 @@ index ec77bba..234f271 100755 - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - --echo "${as_me:-configure}:2304: testing resulting CC: '$CC' ..." 1>&5 +-echo "${as_me:-configure}:2311: testing resulting CC: '$CC' ..." 1>&5 - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - --echo "${as_me:-configure}:2308: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2315: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - --echo "${as_me:-configure}:2312: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2319: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; -(*) -- echo "$as_me:2316: result: ok" >&5 +- echo "$as_me:2323: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - - echo "$as_me:2321: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo "$as_me:2328: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200330.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200330.bb deleted file mode 100644 index 975311c926..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200330.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Sigh. This is one of those places where everyone licenses it differently. Someone -# even apply UCB to it (Free/Net/OpenBSD). The maintainer states that: -# "I've found no reliable source which states that byacc must bear a UCB copyright." -# Setting to PD as this is what the upstream has it as. - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=262857ec5923f073fa06a1f1812225ea" -require byacc.inc - -SRC_URI[md5sum] = "decf6e6b82ea2efae6bbad32d7777da8" -SRC_URI[sha256sum] = "e099e2dd8a684d739ac6b9a0e43d468314a5bc34fd21466502d120b18df51fb0" diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb new file mode 100644 index 0000000000..b7640ffca6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb @@ -0,0 +1,11 @@ +# Sigh. This is one of those places where everyone licenses it differently. Someone +# even apply UCB to it (Free/Net/OpenBSD). The maintainer states that: +# "I've found no reliable source which states that byacc must bear a UCB copyright." +# Setting to PD as this is what the upstream has it as. + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=262857ec5923f073fa06a1f1812225ea" +require byacc.inc + +SRC_URI[md5sum] = "5726a5a655c6fd4e8f950552cceeae29" +SRC_URI[sha256sum] = "0a5906073aeaf23ddc20aaac0ea61cb5ccc18572870b113375dec4ffe85ecf30" diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index 40a8442a53..b9e735f27d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -49,6 +49,8 @@ PACKAGECONFIG[libesmtp] = "--with-libesmtp,--without-libesmtp,libesmtp" PACKAGECONFIG[libmnl] = "--with-libmnl,--without-libmnl,libmnl" PACKAGECONFIG[libatasmart] = "--with-libatasmart,--without-libatasmart,libatasmart" PACKAGECONFIG[ldap] = "--enable-openldap --with-libldap,--disable-openldap --without-libldap, openldap" +PACKAGECONFIG[rrdtool] = "--enable-rrdtool,--disable-rrdtool,rrdtool" +PACKAGECONFIG[rrdcached] = "--enable-rrdcached,--disable-rrdcached,rrdcached" EXTRA_OECONF = " \ ${FPLAYOUT} \ diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-CMakeLists.txt-use-curl-local-source-tarball.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-CMakeLists.txt-use-curl-local-source-tarball.patch new file mode 100644 index 0000000000..183a006e81 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-CMakeLists.txt-use-curl-local-source-tarball.patch @@ -0,0 +1,34 @@ +From 8d99edeefb23c9d7574a0b5a0e2e3f41b0433490 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 10 Sep 2020 16:14:10 +0800 +Subject: [PATCH] CMakeLists.txt: use curl local source tarball + +Do not download curl source during compile. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7cd550fb..215a4ef4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -314,11 +314,7 @@ endif() + + ExternalProject_Add( + curl-external +- GIT_REPOSITORY "https://github.com/curl/curl.git" +- GIT_TAG "f3294d9d86e6a7915a967efff2842089b8b0d071" # Version 7.64.0 +- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-src" +- LIST_SEPARATOR % # This is needed for passing semicolon-separated lists +- TLS_VERIFY OFF ++ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/curl-7.64.0" + CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} + "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-install" + "-DCMAKE_INSTALL_LIBDIR=lib${LIBSUFFIX}" +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch new file mode 100644 index 0000000000..da5ee97540 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch @@ -0,0 +1,32 @@ +From 5a5317044b0039e9e19aabcecb7b666a3f13e136 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 10 Sep 2020 15:08:19 +0800 +Subject: [PATCH] cmake/LibreSSL.cmake: use libressl local source tarball + +Do not download libressl source during compile. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + cmake/LibreSSL.cmake | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/cmake/LibreSSL.cmake b/cmake/LibreSSL.cmake +index 57319e40..bab30129 100644 +--- a/cmake/LibreSSL.cmake ++++ b/cmake/LibreSSL.cmake +@@ -43,9 +43,7 @@ function(use_libre_ssl SOURCE_DIR BINARY_DIR) + + ExternalProject_Add( + libressl-portable +- URL https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://gentoo.osuosl.org/distfiles/libressl-2.8.3.tar.gz +- URL_HASH "SHA256=9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477" +- SOURCE_DIR "${BINARY_DIR}/thirdparty/libressl-src" ++ SOURCE_DIR "${SOURCE_DIR}/thirdparty/libressl-2.8.3" + PATCH_COMMAND ${PATCH} + CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} + "-DCMAKE_INSTALL_PREFIX=${BINARY_DIR}/thirdparty/libressl-install" +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch new file mode 100644 index 0000000000..a39e15b791 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch @@ -0,0 +1,34 @@ +From 74ade26f7ccd0dbc4ad97cb3082204118a67c92b Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 10 Sep 2020 15:12:41 +0800 +Subject: [PATCH] cmake/BundledOSSPUUID.cmake: use ossp-uuid local source + tarball + +Do not download ossp-uuid source during compile. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + cmake/BundledOSSPUUID.cmake | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/cmake/BundledOSSPUUID.cmake b/cmake/BundledOSSPUUID.cmake +index 1103156d..0cf4bac0 100644 +--- a/cmake/BundledOSSPUUID.cmake ++++ b/cmake/BundledOSSPUUID.cmake +@@ -47,10 +47,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR) + + ExternalProject_Add( + ossp-uuid-external +- URL "https://deb.debian.org/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz" +- URL_HASH "SHA256=11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" + BUILD_IN_SOURCE true +- SOURCE_DIR "${BINARY_DIR}/thirdparty/ossp-uuid-src" ++ SOURCE_DIR "${SOURCE_DIR}/thirdparty/uuid-1.6.2" + BUILD_COMMAND make + CMAKE_COMMAND "" + UPDATE_COMMAND "" +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service index 5802a7b2fd..059cdbcc23 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service @@ -5,7 +5,7 @@ RequiresMountsFor=/var [Service] Type=simple -WorkingDirectory=@LOCALSTATEDIR@/run/minifi +WorkingDirectory=@LOCALSTATEDIR@/lib/minifi Environment=MINIFI_HOME=@SYSCONFDIR@/minifi ExecStart=@BINDIR@/minifi diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf index c828b49fa3..6da442da3f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf @@ -1,2 +1 @@ -d @MINIFI_RUN@ 0755 root root - d @MINIFI_LOG@ 0755 root root - diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf index 2ad14e677b..db149d01f9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf @@ -1,2 +1 @@ -d root root 0755 @MINIFI_RUN@ none d root root 0755 @MINIFI_LOG@ none 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 37036ebbb4..5127e11d81 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 @@ -12,6 +12,9 @@ RDEPENDS_${PN} = "python3-core" SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a" SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ + https://curl.haxx.se/download/curl-7.64.0.tar.bz2;name=curl;subdir=git/thirdparty \ + https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz;name=libressl;subdir=git/thirdparty \ + ${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=git/thirdparty \ file://fix-minifi-compile.patch \ file://fix-libressl-compile.patch \ file://fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch \ @@ -21,10 +24,21 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ file://fix-rocksdb-cross-compile.patch \ file://remove_const_due_to_std_lock_guard.patch \ file://0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch \ + file://0001-CMakeLists.txt-use-curl-local-source-tarball.patch \ + file://0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch \ + file://0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ " + +SRC_URI[curl.md5sum] = "d0bcc586873cfef08b4b9594e5395a33" +SRC_URI[curl.sha256sum] = "d573ba1c2d1cf9d8533fadcce480d778417964e8d04ccddcc76e591d544cf2eb" +SRC_URI[libressl.md5sum] = "0f1127bd21b4aa8495a910379c2ad936" +SRC_URI[libressl.sha256sum] = "9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477" +SRC_URI[ossp-uuid.md5sum] = "5db0d43a9022a6ebbbc25337ae28942f" +SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" + S = "${WORKDIR}/git" inherit pkgconfig cmake systemd @@ -52,19 +66,20 @@ TARGET_CXXFLAGS_append_riscv32 += "-fpic" TARGET_CFLAGS_append_riscv64 += "-fpic" TARGET_CXXFLAGS_append_riscv64 += "-fpic" +do_install[cleandirs] += "${WORKDIR}/minifi-install" do_install() { - DESTDIR='${B}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} - - MINIFI_BIN=${base_prefix}${bindir} - MINIFI_HOME=${base_prefix}${sysconfdir}/minifi - MINIFI_RUN=${base_prefix}${localstatedir}/run/minifi - MINIFI_LOG=${base_prefix}${localstatedir}/log/minifi + DESTDIR='${WORKDIR}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} + MINIFI_BIN=${bindir} + MINIFI_HOME=${sysconfdir}/minifi + MINIFI_RUN=${localstatedir}/lib/minifi + MINIFI_LOG=${localstatedir}/log/minifi install -d ${D}${MINIFI_BIN} install -d ${D}${MINIFI_HOME}/conf - cp -a ${B}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ - cp -a ${B}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ + install -m 755 -d ${D}${localstatedir}/lib/minifi + cp -a ${WORKDIR}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ + cp -a ${WORKDIR}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ sed -i 's|#appender.rolling.directory=.*|appender.rolling.directory='${MINIFI_LOG}'|g' \ ${D}${MINIFI_HOME}/conf/minifi-log.properties @@ -79,11 +94,11 @@ do_install() { sed -i 's|export MINIFI_HOME=.*|export MINIFI_HOME='${MINIFI_HOME}'|g' ${D}${MINIFI_BIN}/minifi.sh sed -i 's|bin_dir=${MINIFI_HOME}/bin|bin_dir='${MINIFI_BIN}'|g' ${D}${MINIFI_BIN}/minifi.sh - sed -i 's|pid_file=${bin_dir}|pid_file='${MINIFI_RUN}'|g' ${D}${MINIFI_BIN}/minifi.sh + sed -i 's|pid_file=${bin_dir}/.|pid_file='${localstatedir}/run/'|g' ${D}${MINIFI_BIN}/minifi.sh if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/minifi.conf install -m 0755 -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/minifi.service ${D}${systemd_unitdir}/system/ @@ -91,14 +106,12 @@ do_install() { sed -i 's|@SYSCONFDIR@|${sysconfdir}|g' ${D}${systemd_unitdir}/system/minifi.service sed -i 's|@BINDIR@|${bindir}|g' ${D}${systemd_unitdir}/system/minifi.service - sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf - sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf + sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/tmpfiles.d/minifi.conf elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi - sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi fi } @@ -112,9 +125,3 @@ pkg_postinst_${PN}() { fi fi } - -FILES_${PN} = " \ - ${bindir} \ - ${sysconfdir} \ - ${systemd_unitdir} \ - " diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.7.bb deleted file mode 100644 index 791e41e6e8..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.7.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Redis key-value store" -DESCRIPTION = "Redis is an open source, advanced key-value store." -HOMEPAGE = "http://redis.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" -DEPENDS = "readline lua ncurses" - -SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ - 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://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE.patch \ - " - -SRC_URI[md5sum] = "ac57b7188b771bbc08e8d7d6dddb3a80" -SRC_URI[sha256sum] = "c2aaa1a4c7e72c70adedf976fdd5e1d34d395989283dab9d7840e0a304bb2393" - -inherit autotools-brokensep update-rc.d systemd useradd - -FINAL_LIBS_x86_toolchain-clang = "-latomic" -FINAL_LIBS_mips = "-latomic" -FINAL_LIBS_arm = "-latomic" -FINAL_LIBS_powerpc = "-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() { - (cd deps && oe_runmake hiredis lua linenoise) -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ - chown redis.redis ${D}/var/lib/redis/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service - - if [ "${REDIS_ON_SYSTEMD}" = true ]; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf - fi -} - -CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb new file mode 100644 index 0000000000..64b137c1be --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb @@ -0,0 +1,66 @@ +SUMMARY = "Redis key-value store" +DESCRIPTION = "Redis is an open source, advanced key-value store." +HOMEPAGE = "http://redis.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" +DEPENDS = "readline lua ncurses" + +SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ + 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://0001-src-Do-not-reset-FINAL_LIBS.patch \ + file://GNU_SOURCE.patch \ + " + +SRC_URI[md5sum] = "70113b4b8ea7ee4c7e148be62b5d1e0b" +SRC_URI[sha256sum] = "04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce868d68" + +inherit autotools-brokensep update-rc.d systemd useradd + +FINAL_LIBS_x86_toolchain-clang = "-latomic" +FINAL_LIBS_mips = "-latomic" +FINAL_LIBS_arm = "-latomic" +FINAL_LIBS_powerpc = "-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() { + (cd deps && oe_runmake hiredis lua linenoise) +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/redis + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -d ${D}/var/lib/redis/ + chown redis.redis ${D}/var/lib/redis/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service + + if [ "${REDIS_ON_SYSTEMD}" = true ]; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf + fi +} + +CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service index f3db946c81..e90a7c4def 100644 --- a/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service @@ -6,7 +6,6 @@ After=syslog.target EnvironmentFile=-@SYSCONFDIR@/smartmontools ExecStart=@SBINDIR@/smartd -n $smart_opts ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID -StandardOutput=syslog [Install] WantedBy=multi-user.target -- cgit v1.2.3