summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/rsyslog
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-07-29 17:04:53 +0200
committerKhem Raj <raj.khem@gmail.com>2021-08-03 10:21:25 -0700
commitc61dc077bbd81260e4f167fa2251643ba0ba6974 (patch)
tree66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-extended/rsyslog
parentc5f7cfb8db54cfa4257797db5bd87828dea43296 (diff)
downloadmeta-openembedded-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz
Convert to new override syntax
This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog')
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb52
1 files changed, 26 insertions, 26 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb
index 37f391356f..9d7e494d08 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb
@@ -27,7 +27,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t
27 file://0001-tests-disable-the-check-for-inotify.patch \ 27 file://0001-tests-disable-the-check-for-inotify.patch \
28" 28"
29 29
30SRC_URI_append_libc-musl = " \ 30SRC_URI:append:libc-musl = " \
31 file://0001-Include-sys-time-h.patch \ 31 file://0001-Include-sys-time-h.patch \
32" 32"
33 33
@@ -41,9 +41,9 @@ inherit autotools pkgconfig systemd update-rc.d ptest
41 41
42EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" 42EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes"
43EXTRA_OECONF += "--enable-imfile-tests" 43EXTRA_OECONF += "--enable-imfile-tests"
44EXTRA_OECONF_remove_mipsarch = "ap_cv_atomic_builtins=yes" 44EXTRA_OECONF:remove:mipsarch = "ap_cv_atomic_builtins=yes"
45EXTRA_OECONF_remove_powerpc = "ap_cv_atomic_builtins=yes" 45EXTRA_OECONF:remove:powerpc = "ap_cv_atomic_builtins=yes"
46EXTRA_OECONF_remove_riscv32 = "ap_cv_atomic_builtins=yes" 46EXTRA_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
49PACKAGECONFIG ??= " \ 49PACKAGECONFIG ??= " \
@@ -132,7 +132,7 @@ do_install_ptest() {
132 sed -i -e s:${HOSTTOOLS_DIR}:${bindir}:g ${D}${PTEST_PATH}/tests/set-envvars 132 sed -i -e s:${HOSTTOOLS_DIR}:${bindir}:g ${D}${PTEST_PATH}/tests/set-envvars
133} 133}
134 134
135do_install_append() { 135do_install:append() {
136 install -d "${D}${sysconfdir}/init.d" 136 install -d "${D}${sysconfdir}/init.d"
137 install -d "${D}${sysconfdir}/logrotate.d" 137 install -d "${D}${sysconfdir}/logrotate.d"
138 install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog 138 install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog
@@ -155,51 +155,51 @@ do_install_append() {
155 fi 155 fi
156} 156}
157 157
158FILES_${PN} += "${bindir}" 158FILES:${PN} += "${bindir}"
159 159
160INITSCRIPT_NAME = "syslog" 160INITSCRIPT_NAME = "syslog"
161INITSCRIPT_PARAMS = "defaults" 161INITSCRIPT_PARAMS = "defaults"
162 162
163CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" 163CONFFILES:${PN} = "${sysconfdir}/rsyslog.conf"
164 164
165RCONFLICTS_${PN} = "busybox-syslog sysklogd syslog-ng" 165RCONFLICTS:${PN} = "busybox-syslog sysklogd syslog-ng"
166 166
167RPROVIDES_${PN} += "${PN}-systemd" 167RPROVIDES:${PN} += "${PN}-systemd"
168RREPLACES_${PN} += "${PN}-systemd" 168RREPLACES:${PN} += "${PN}-systemd"
169RCONFLICTS_${PN} += "${PN}-systemd" 169RCONFLICTS:${PN} += "${PN}-systemd"
170SYSTEMD_SERVICE_${PN} = "${BPN}.service" 170SYSTEMD_SERVICE:${PN} = "${BPN}.service"
171 171
172RDEPENDS_${PN} += "logrotate" 172RDEPENDS:${PN} += "logrotate"
173 173
174# for rsyslog-ptest 174# for rsyslog-ptest
175VALGRIND = "valgrind" 175VALGRIND = "valgrind"
176 176
177# valgrind supports armv7 and above 177# valgrind supports armv7 and above
178VALGRIND_armv4 = '' 178VALGRIND:armv4 = ''
179VALGRIND_armv5 = '' 179VALGRIND:armv5 = ''
180VALGRIND_armv6 = '' 180VALGRIND:armv6 = ''
181 181
182# X32 isn't supported by valgrind at this time 182# X32 isn't supported by valgrind at this time
183VALGRIND_linux-gnux32 = '' 183VALGRIND:linux-gnux32 = ''
184VALGRIND_linux-muslx32 = '' 184VALGRIND:linux-muslx32 = ''
185 185
186# Disable for some MIPS variants 186# Disable for some MIPS variants
187VALGRIND_mipsarchr6 = '' 187VALGRIND:mipsarchr6 = ''
188VALGRIND_linux-gnun32 = '' 188VALGRIND:linux-gnun32 = ''
189 189
190# Disable for powerpc64 with musl 190# Disable for powerpc64 with musl
191VALGRIND_libc-musl_powerpc64 = '' 191VALGRIND:libc-musl:powerpc64 = ''
192VALGRIND_libc-musl_powerpc64le = '' 192VALGRIND:libc-musl:powerpc64le = ''
193 193
194# RISC-V support for valgrind is not there yet 194# RISC-V support for valgrind is not there yet
195VALGRIND_riscv64 = "" 195VALGRIND:riscv64 = ""
196VALGRIND_riscv32 = "" 196VALGRIND:riscv32 = ""
197 197
198# util-linux: logger needs the -d option 198# util-linux: logger needs the -d option
199RDEPENDS_${PN}-ptest += "\ 199RDEPENDS:${PN}-ptest += "\
200 make diffutils gzip bash gawk coreutils procps \ 200 make diffutils gzip bash gawk coreutils procps \
201 libgcc python3-core python3-io python3-json \ 201 libgcc python3-core python3-io python3-json \
202 curl util-linux shadow \ 202 curl util-linux shadow \
203 " 203 "
204 204
205RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" 205RRECOMMENDS:${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}"