From: Wang Mingyu <[email protected]> Signed-off-by: Wang Mingyu <[email protected]> --- .../0001-tests-disable-the-check-for-inotify.patch | 11 ++++------- .../rsyslog/use-pkgconfig-to-check-libgcrypt.patch | 7 +++---- .../{rsyslog_8.2404.0.bb => rsyslog_8.2406.0.bb} | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) rename meta-oe/recipes-extended/rsyslog/{rsyslog_8.2404.0.bb => rsyslog_8.2406.0.bb} (98%)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch index c1480406f..4c41da518 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch @@ -1,4 +1,4 @@ -From 194e199ce08acc2192f6a63420ff24d9064666e5 Mon Sep 17 00:00:00 2001 +From 9e36463b8a03e7de7468035e2dc63b36b5fd1965 Mon Sep 17 00:00:00 2001 From: Yi Fan Yu <[email protected]> Date: Sat, 27 Mar 2021 19:18:25 -0400 Subject: [PATCH] tests: disable the check for inotify @@ -20,10 +20,10 @@ Signed-off-by: Yi Fan Yu <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/diag.sh b/tests/diag.sh -index 6cd60ea88..7424f48c5 100755 +index f30290c..2c4f6f0 100755 --- a/tests/diag.sh +++ b/tests/diag.sh -@@ -2672,7 +2672,7 @@ case $1 in +@@ -2933,7 +2933,7 @@ case $1 in fi ;; 'check-inotify') # Check for inotify/fen support @@ -32,7 +32,7 @@ index 6cd60ea88..7424f48c5 100755 echo [inotify mode] elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h -@@ -2687,7 +2687,7 @@ case $1 in +@@ -2948,7 +2948,7 @@ case $1 in fi ;; 'check-inotify-only') # Check for ONLY inotify support @@ -41,6 +41,3 @@ index 6cd60ea88..7424f48c5 100755 echo [inotify mode] else echo [inotify not supported, skipping...] --- -2.29.2 - diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch index 035258726..cda2d99c0 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch @@ -1,4 +1,4 @@ -From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001 +From 5d200bd8ccb6acb8636dadc47eefc6763c0001d0 Mon Sep 17 00:00:00 2001 From: Roy Li <[email protected]> Date: Wed, 18 Jun 2014 13:46:52 +0800 Subject: [PATCH] use pkgconfig to check libgcrypt @@ -10,16 +10,15 @@ libgcrypt does no longer provide libgcrypt-config, and provide Signed-off-by: Roy Li <[email protected]> Signed-off-by: Wenzong Fan <[email protected]> - --- configure.ac | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac -index 62178c3..b56c9c7 100644 +index a4506ec..46013cc 100644 --- a/configure.ac +++ b/configure.ac -@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt, +@@ -1181,20 +1181,7 @@ AC_ARG_ENABLE(libgcrypt, [enable_libgcrypt=yes] ) if test "x$enable_libgcrypt" = "xyes"; then diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2406.0.bb similarity index 98% rename from meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb rename to meta-oe/recipes-extended/rsyslog/rsyslog_8.2406.0.bb index 8f46e0cd0..b0c2fb298 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2406.0.bb @@ -32,7 +32,7 @@ SRC_URI:append:libc-musl = " \ file://0001-Include-sys-time-h.patch \ file://disable-omfile-outchannel.patch \ " -SRC_URI[sha256sum] = "30528d140ec1b1f079224081fa37df6e06587ff42b02e3e61f2daa0526c54d33" +SRC_URI[sha256sum] = "1343e0269dd32166ffde04d7ceebfa0e7146cf1dbc6962c56bf428c61f01a7df" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags"; UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#111573): https://lists.openembedded.org/g/openembedded-devel/message/111573 Mute This Topic: https://lists.openembedded.org/mt/107747873/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
