diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-webserver/recipes-httpd | |
parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
download | meta-openembedded-contrib-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-webserver/recipes-httpd')
7 files changed, 60 insertions, 60 deletions
diff --git a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb index 0ef2bd7f45..884d467eec 100644 --- a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb +++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb @@ -7,7 +7,7 @@ LICENSE = "Apache-2.0" inherit autotools-brokensep pkgconfig DEPENDS = "apache2 apache2-native pbzip2-native" -RDEPENDS_${PN} += "apache2" +RDEPENDS:${PN} += "apache2" # Original (github.com/disconnect/apache-websocket) is dead since 2012, the # fork contains patches from the modules ML and fixes CVE compliance issues @@ -29,5 +29,5 @@ do_install() { install -m 755 ${B}/.libs/mod_websocket.so ${D}${libexecdir}/apache2/modules } -FILES_${PN} += " ${libexecdir}/apache2/modules/* " -FILES_${PN}-dbg += " ${libexecdir}/apache2/modules/.debug/* " +FILES:${PN} += " ${libexecdir}/apache2/modules/* " +FILES:${PN}-dbg += " ${libexecdir}/apache2/modules/.debug/* " diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb index 3a851167cf..1ac4fcbf26 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb @@ -17,7 +17,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0001-support-apxs.in-force-destdir-to-be-empty-string.patch \ " -SRC_URI_append_class-target = " \ +SRC_URI:append:class-target = " \ file://0008-apache2-do-not-use-relative-path-for-gen_test_char.patch \ file://init \ file://apache2-volatile.conf \ @@ -44,9 +44,9 @@ PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselin PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib" -CFLAGS_append = " -DPATH_MAX=4096" +CFLAGS:append = " -DPATH_MAX=4096" -EXTRA_OECONF_class-target = "\ +EXTRA_OECONF:class-target = "\ --enable-layout=Debian \ --prefix=${base_prefix} \ --exec_prefix=${exec_prefix} \ @@ -68,7 +68,7 @@ EXTRA_OECONF_class-target = "\ ac_cv_have_threadsafe_pollset=no \ " -EXTRA_OECONF_class-native = "\ +EXTRA_OECONF:class-native = "\ --prefix=${prefix} \ --includedir=${includedir}/${BPN} \ --sysconfdir=${sysconfdir}/${BPN} \ @@ -78,11 +78,11 @@ EXTRA_OECONF_class-native = "\ --localstatedir=${localstatedir} \ " -do_configure_prepend() { +do_configure:prepend() { sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout } -do_install_append_class-target() { +do_install:append:class-target() { install -d ${D}/${sysconfdir}/init.d cat ${WORKDIR}/init | \ @@ -144,12 +144,12 @@ do_install_append_class-target() { chown -R root:root ${D} } -do_install_append_class-native() { +do_install:append:class-native() { install -d ${D}${bindir} ${D}${libdir} install -m 755 server/gen_test_char ${D}${bindir} } -SYSROOT_PREPROCESS_FUNCS_append_class-target = " apache_sysroot_preprocess" +SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess" apache_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} @@ -172,15 +172,15 @@ apache_sysroot_preprocess() { INITSCRIPT_NAME = "apache2" INITSCRIPT_PARAMS = "defaults 91 20" -SYSTEMD_SERVICE_${PN} = "apache2.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_SERVICE:${PN} = "apache2.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" -ALTERNATIVE_${PN}-doc = "htpasswd.1" +ALTERNATIVE:${PN}-doc = "htpasswd.1" ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" -CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \ +CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \ ${sysconfdir}/${BPN}/magic \ ${sysconfdir}/${BPN}/mime.types \ ${sysconfdir}/${BPN}/extra/*" @@ -188,7 +188,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \ # We override here rather than append so that .so links are # included in the runtime package rather than here (-dev) # and to get build, icons, error into the -dev package -FILES_${PN}-dev = "${datadir}/${BPN}/build \ +FILES:${PN}-dev = "${datadir}/${BPN}/build \ ${datadir}/${BPN}/icons \ ${datadir}/${BPN}/error \ ${includedir}/${BPN} \ @@ -196,26 +196,26 @@ FILES_${PN}-dev = "${datadir}/${BPN}/build \ " # Add the manual to -doc -FILES_${PN}-doc += " ${datadir}/${BPN}/manual" +FILES:${PN}-doc += " ${datadir}/${BPN}/manual" -FILES_${PN}-scripts += "${bindir}/dbmmanage" +FILES:${PN}-scripts += "${bindir}/dbmmanage" # Override this too - here is the default, less datadir -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir} \ +FILES:${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir} \ ${sysconfdir} ${libdir}/${BPN}" # We want htdocs and cgi-bin to go with the binary -FILES_${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin" +FILES:${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin" -FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug" +FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug" -RDEPENDS_${PN} += "openssl libgcc" -RDEPENDS_${PN}-scripts += "perl ${PN}" -RDEPENDS_${PN}-dev = "perl" +RDEPENDS:${PN} += "openssl libgcc" +RDEPENDS:${PN}-scripts += "perl ${PN}" +RDEPENDS:${PN}-dev = "perl" BBCLASSEXTEND = "native" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ -z "$D" ]; then if type systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index 7424467946..7077d76d7a 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb @@ -1,5 +1,5 @@ SUMMARY = "Cherokee Web Server fast and secure" -SUMMARY_cget = "Small downloader based in the Cherokee client library" +SUMMARY:cget = "Small downloader based in the Cherokee client library" HOMEPAGE = "http://www.cherokee-project.com/" SECTION = "network" LICENSE = "GPLv2" @@ -34,7 +34,7 @@ EXTRA_OECONF = "--disable-static \ --with-wwwroot=${localstatedir}/www/cherokee \ " -do_install_append () { +do_install:append () { install -m 0755 -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee @@ -50,15 +50,15 @@ do_install_append () { # Put -dev near the front so we can move the .la files into it with a wildcard PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget" -FILES_cget = "${bindir}/cget" -FILES_libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}" -FILES_libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}" -FILES_libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}" +FILES:cget = "${bindir}/cget" +FILES:libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}" +FILES:libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}" +FILES:libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}" # Pack the htdocs -FILES_${PN} += "${localstatedir}/www/cherokee" +FILES:${PN} += "${localstatedir}/www/cherokee" -CONFFILES_${PN} = " \ +CONFFILES:${PN} = " \ ${sysconfdir}/cherokee/cherokee.conf \ ${sysconfdir}/init.d/cherokee \ " @@ -66,10 +66,10 @@ CONFFILES_${PN} = " \ INITSCRIPT_NAME = "cherokee" INITSCRIPT_PARAMS = "defaults 91 91" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "cherokee.service" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "cherokee.service" python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb index 4b902bfda6..f66ec7d736 100644 --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f INITSCRIPT_NAME = "hiawatha" INITSCRIPT_PARAMS = "defaults 70" -SYSTEMD_SERVICE_${PN} = "hiawatha.service" +SYSTEMD_SERVICE:${PN} = "hiawatha.service" inherit cmake update-rc.d systemd @@ -35,7 +35,7 @@ EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ -DCMAKE_INSTALL_LIBDIR=${libdir} \ -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=${localstatedir}" -do_install_append() { +do_install:append() { # Copy over init script and sed in the correct sbin path sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init mkdir -p ${D}${sysconfdir}/init.d @@ -53,7 +53,7 @@ do_install_append() { rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" "${D}${localstatedir}/run" } -CONFFILES_${PN} = " \ +CONFFILES:${PN} = " \ ${sysconfdir}/hiawatha/cgi-wrapper.conf \ ${sysconfdir}/hiawatha/hiawatha.conf \ ${sysconfdir}/hiawatha/index.xslt \ @@ -61,4 +61,4 @@ CONFFILES_${PN} = " \ ${sysconfdir}/hiawatha/php-fcgi.conf \ " -FILES_${PN}-dev = "${libdir}/hiawatha/*${SOLIBSDEV}" +FILES:${PN}-dev = "${libdir}/hiawatha/*${SOLIBSDEV}" diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index 698f8608fd..1386770c8a 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -26,7 +26,7 @@ EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ -DWITH_SYSTEM_MALLOC=1 \ " -EXTRA_OECMAKE_append_libc-musl = " -DWITH_MUSL=1 " +EXTRA_OECMAKE:append:libc-musl = " -DWITH_MUSL=1 " # GCC-10+ defaults to -fno-common CFLAGS += "-fcommon" @@ -37,7 +37,7 @@ inherit cmake pkgconfig update-rc.d systemd OECMAKE_GENERATOR = "Unix Makefiles" -do_install_append() { +do_install:append() { rm -rf ${D}/run rm -rf ${D}${localstatedir}/run install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey @@ -50,16 +50,16 @@ do_install_append() { INITSCRIPT_NAME = "monkey" INITSCRIPT_PARAMS = "defaults 70" -SYSTEMD_SERVICE_${PN} = "monkey.service" +SYSTEMD_SERVICE:${PN} = "monkey.service" PACKAGES += "${PN}-plugins" -FILES_${PN}-plugins = "${libdir}/monkey-*.so" +FILES:${PN}-plugins = "${libdir}/monkey-*.so" -FILES_${PN} += "${localstatedir}/www/monkey/ /run" +FILES:${PN} += "${localstatedir}/www/monkey/ /run" -CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ +CONFFILES:${PN} = "${sysconfdir}/monkey/monkey.conf \ ${sysconfdir}/monkey/sites/default \ ${sysconfdir}/monkey/monkey.mime \ ${sysconfdir}/monkey/plugins.load \ diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index de080a2b01..ab37fa3146 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -26,10 +26,10 @@ SRC_URI = " \ inherit siteinfo update-rc.d useradd systemd -SYSTEMD_SERVICE_${PN} = "nginx.service" +SYSTEMD_SERVICE:${PN} = "nginx.service" -CFLAGS_append = " -fPIE -pie" -CXXFLAGS_append = " -fPIE -pie" +CFLAGS:append = " -fPIE -pie" +CXXFLAGS:append = " -fPIE -pie" NGINX_WWWDIR ?= "${localstatedir}/www/localhost" NGINX_USER ?= "www" @@ -143,7 +143,7 @@ do_install () { rm -rf ${D}${localstatedir}/log/ } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" ]; then if type systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create @@ -153,12 +153,12 @@ pkg_postinst_${PN} () { fi } -FILES_${PN} += " \ +FILES:${PN} += " \ ${localstatedir}/ \ ${systemd_unitdir}/system/nginx.service \ " -CONFFILES_${PN} = " \ +CONFFILES:${PN} = " \ ${sysconfdir}/nginx/nginx.conf \ ${sysconfdir}/nginx/fastcgi.conf \ ${sysconfdir}/nginx/fastcgi_params \ @@ -174,7 +174,7 @@ INITSCRIPT_NAME = "nginx" INITSCRIPT_PARAMS = "defaults 92 20" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = " \ +USERADD_PARAM:${PN} = " \ --system --no-create-home \ --home ${NGINX_WWWDIR} \ --groups www-data \ diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb index 560dd9b6e4..8a30b74c81 100644 --- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/git" inherit autotools update-rc.d systemd update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN}-doc = "htpasswd.1" +ALTERNATIVE:${PN}-doc = "htpasswd.1" ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" SRV_DIR ?= "${servicedir}/www" @@ -29,12 +29,12 @@ SRV_DIR ?= "${servicedir}/www" # but ${SRV_DIR} is not installed chgrp'd to the group by default. WEBGROUP ?= "www-data" -do_configure_prepend () { +do_configure:prepend () { export WEBDIR=${SRV_DIR} export WEBGROUP=${WEBGROUP} } -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/init.d install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/thttpd install -c -m 755 ${WORKDIR}/thttpd.conf ${D}${sysconfdir} @@ -52,7 +52,7 @@ do_install_append () { INITSCRIPT_NAME = "thttpd" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "thttpd.service" +SYSTEMD_SERVICE:${PN} = "thttpd.service" -FILES_${PN} += "${SRV_DIR}" -FILES_${PN}-dbg += "${SRV_DIR}/cgi-bin/.debug" +FILES:${PN} += "${SRV_DIR}" +FILES:${PN}-dbg += "${SRV_DIR}/cgi-bin/.debug" |