summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-daemons/squid
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-networking/recipes-daemons/squid
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-networking/recipes-daemons/squid')
-rw-r--r--meta-networking/recipes-daemons/squid/squid_4.15.bb26
1 files changed, 13 insertions, 13 deletions
diff --git a/meta-networking/recipes-daemons/squid/squid_4.15.bb b/meta-networking/recipes-daemons/squid/squid_4.15.bb
index 8ba10674c9..5af00d6269 100644
--- a/meta-networking/recipes-daemons/squid/squid_4.15.bb
+++ b/meta-networking/recipes-daemons/squid/squid_4.15.bb
@@ -27,7 +27,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2
27 file://0001-Fix-build-on-Fedora-Rawhide-772.patch \ 27 file://0001-Fix-build-on-Fedora-Rawhide-772.patch \
28 " 28 "
29 29
30SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" 30SRC_URI:remove:toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch"
31 31
32SRC_URI[sha256sum] = "71635811e766ce8b155225a9e3c7757cfc7ff93df26b28d82e5e6fc021b9a605" 32SRC_URI[sha256sum] = "71635811e766ce8b155225a9e3c7757cfc7ff93df26b28d82e5e6fc021b9a605"
33 33
@@ -38,13 +38,13 @@ DEPENDS = "libtool krb5 openldap db cyrus-sasl"
38 38
39inherit autotools pkgconfig useradd ptest perlnative 39inherit autotools pkgconfig useradd ptest perlnative
40 40
41LDFLAGS_append_mipsarch = " -latomic" 41LDFLAGS:append:mipsarch = " -latomic"
42LDFLAGS_append_powerpc = " -latomic" 42LDFLAGS:append:powerpc = " -latomic"
43LDFLAGS_append_riscv64 = " -latomic" 43LDFLAGS:append:riscv64 = " -latomic"
44LDFLAGS_append_riscv32 = " -latomic" 44LDFLAGS:append:riscv32 = " -latomic"
45 45
46USERADD_PACKAGES = "${PN}" 46USERADD_PACKAGES = "${PN}"
47USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" 47USERADD_PARAM:${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid"
48 48
49PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ 49PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
50 " 50 "
@@ -68,7 +68,7 @@ export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
68 68
69TESTDIR = "test-suite" 69TESTDIR = "test-suite"
70 70
71do_configure_prepend() { 71do_configure:prepend() {
72 export SYSROOT=$PKG_CONFIG_SYSROOT_DIR 72 export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
73} 73}
74 74
@@ -92,7 +92,7 @@ do_install_ptest() {
92 sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile 92 sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
93} 93}
94 94
95do_install_append() { 95do_install:append() {
96 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 96 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
97 install -d ${D}${sysconfdir}/tmpfiles.d 97 install -d ${D}${sysconfdir}/tmpfiles.d
98 echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf 98 echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
@@ -109,9 +109,9 @@ do_install_append() {
109 rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" 109 rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log"
110} 110}
111 111
112FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" 112FILES:${PN} += "${libdir} ${datadir}/errors ${datadir}/icons"
113FILES_${PN}-dbg += "/usr/src/debug" 113FILES:${PN}-dbg += "/usr/src/debug"
114FILES_${PN}-doc += "${datadir}/*.txt" 114FILES:${PN}-doc += "${datadir}/*.txt"
115 115
116RDEPENDS_${PN} += "perl" 116RDEPENDS:${PN} += "perl"
117RDEPENDS_${PN}-ptest += "make" 117RDEPENDS:${PN}-ptest += "make"