diff options
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb (renamed from meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb) | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb index c3948a40e..af46cc14d 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb | |||
@@ -32,7 +32,7 @@ SRC_URI:append:libc-musl = " \ | |||
32 | file://disable-omfile-outchannel.patch \ | 32 | file://disable-omfile-outchannel.patch \ |
33 | " | 33 | " |
34 | 34 | ||
35 | SRC_URI[sha256sum] = "f6283efaadc609540a56e6bec88a362c966e77f29fe48e6b734bd6c1123e0be5" | 35 | SRC_URI[sha256sum] = "acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba" |
36 | 36 | ||
37 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" | 37 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" |
38 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 38 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
@@ -47,7 +47,7 @@ EXTRA_OECONF:remove:riscv32 = "ap_cv_atomic_builtins=yes" | |||
47 | 47 | ||
48 | # first line is default yes in configure | 48 | # first line is default yes in configure |
49 | PACKAGECONFIG ??= " \ | 49 | PACKAGECONFIG ??= " \ |
50 | rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ | 50 | rsyslogd rsyslogrt klog inet regexp uuid libcap-ng libgcrypt \ |
51 | fmhttp imdiag openssl imfile \ | 51 | fmhttp imdiag openssl imfile \ |
52 | ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ | 52 | ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ |
53 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ | 53 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ |
@@ -60,6 +60,7 @@ PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,," | |||
60 | PACKAGECONFIG[fmhttp] = "--enable-fmhttp,--disable-fmhttp,curl," | 60 | PACKAGECONFIG[fmhttp] = "--enable-fmhttp,--disable-fmhttp,curl," |
61 | PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,," | 61 | PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,," |
62 | PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," | 62 | PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," |
63 | PACKAGECONFIG[libcap-ng] = "--enable-libcap-ng,--disable-libcap-ng,libcap-ng," | ||
63 | PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," | 64 | PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," |
64 | PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," | 65 | PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," |
65 | PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt," | 66 | PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt," |
@@ -72,14 +73,12 @@ PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," | |||
72 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," | 73 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," |
73 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," | 74 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," |
74 | PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl," | 75 | PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl," |
75 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," | 76 | PACKAGECONFIG[systemd] = "--enable-libsystemd,--disable-libsystemd,systemd," |
76 | PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," | 77 | PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," |
77 | PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse," | 78 | PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse," |
78 | PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," | 79 | PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," |
79 | PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," | 80 | PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," |
80 | PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," | 81 | PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," |
81 | # For libcap-ng, see commit log and https://github.com/rsyslog/rsyslog/issues/5091 | ||
82 | PACKAGECONFIG[libcap-ng] = "--enable-libcap-ng,--disable-libcap-ng,libcap-ng," | ||
83 | PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," | 82 | PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," |
84 | PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind," | 83 | PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind," |
85 | PACKAGECONFIG[imhttp] = "--enable-imhttp,--disable-imhttp,civetweb," | 84 | PACKAGECONFIG[imhttp] = "--enable-imhttp,--disable-imhttp,civetweb," |