diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
| commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
| tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-connectivity/bind | |
| parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
| download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz | |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bind')
| -rw-r--r-- | meta/recipes-connectivity/bind/bind_9.16.18.bb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-connectivity/bind/bind_9.16.18.bb b/meta/recipes-connectivity/bind/bind_9.16.18.bb index e7a1c5d9e9..353178ea0d 100644 --- a/meta/recipes-connectivity/bind/bind_9.16.18.bb +++ b/meta/recipes-connectivity/bind/bind_9.16.18.bb | |||
| @@ -44,7 +44,7 @@ EXTRA_OECONF = " --with-libtool --disable-devpoll --disable-auto-validation --en | |||
| 44 | --sysconfdir=${sysconfdir}/bind \ | 44 | --sysconfdir=${sysconfdir}/bind \ |
| 45 | --with-openssl=${STAGING_DIR_HOST}${prefix} \ | 45 | --with-openssl=${STAGING_DIR_HOST}${prefix} \ |
| 46 | " | 46 | " |
| 47 | LDFLAGS_append = " -lz" | 47 | LDFLAGS:append = " -lz" |
| 48 | 48 | ||
| 49 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)} | 49 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)} |
| 50 | 50 | ||
| @@ -52,15 +52,15 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutil | |||
| 52 | REMOVE_LIBTOOL_LA = "0" | 52 | REMOVE_LIBTOOL_LA = "0" |
| 53 | 53 | ||
| 54 | USERADD_PACKAGES = "${PN}" | 54 | USERADD_PACKAGES = "${PN}" |
| 55 | USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ | 55 | USERADD_PARAM:${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ |
| 56 | --user-group bind" | 56 | --user-group bind" |
| 57 | 57 | ||
| 58 | INITSCRIPT_NAME = "bind" | 58 | INITSCRIPT_NAME = "bind" |
| 59 | INITSCRIPT_PARAMS = "defaults" | 59 | INITSCRIPT_PARAMS = "defaults" |
| 60 | 60 | ||
| 61 | SYSTEMD_SERVICE_${PN} = "named.service" | 61 | SYSTEMD_SERVICE:${PN} = "named.service" |
| 62 | 62 | ||
| 63 | do_install_append() { | 63 | do_install:append() { |
| 64 | 64 | ||
| 65 | install -d -o bind "${D}${localstatedir}/cache/bind" | 65 | install -d -o bind "${D}${localstatedir}/cache/bind" |
| 66 | install -d "${D}${sysconfdir}/bind" | 66 | install -d "${D}${sysconfdir}/bind" |
| @@ -94,7 +94,7 @@ do_install_append() { | |||
| 94 | oe_multilib_header isc/platform.h | 94 | oe_multilib_header isc/platform.h |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | CONFFILES_${PN} = " \ | 97 | CONFFILES:${PN} = " \ |
| 98 | ${sysconfdir}/bind/named.conf \ | 98 | ${sysconfdir}/bind/named.conf \ |
| 99 | ${sysconfdir}/bind/named.conf.local \ | 99 | ${sysconfdir}/bind/named.conf.local \ |
| 100 | ${sysconfdir}/bind/named.conf.options \ | 100 | ${sysconfdir}/bind/named.conf.options \ |
| @@ -105,25 +105,25 @@ CONFFILES_${PN} = " \ | |||
| 105 | ${sysconfdir}/bind/db.root \ | 105 | ${sysconfdir}/bind/db.root \ |
| 106 | " | 106 | " |
| 107 | 107 | ||
| 108 | ALTERNATIVE_${PN}-utils = "nslookup" | 108 | ALTERNATIVE:${PN}-utils = "nslookup" |
| 109 | ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup" | 109 | ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup" |
| 110 | ALTERNATIVE_PRIORITY = "100" | 110 | ALTERNATIVE_PRIORITY = "100" |
| 111 | 111 | ||
| 112 | PACKAGE_BEFORE_PN += "${PN}-utils" | 112 | PACKAGE_BEFORE_PN += "${PN}-utils" |
| 113 | FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate" | 113 | FILES:${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate" |
| 114 | FILES_${PN}-dev += "${bindir}/isc-config.h" | 114 | FILES:${PN}-dev += "${bindir}/isc-config.h" |
| 115 | FILES_${PN} += "${sbindir}/generate-rndc-key.sh" | 115 | FILES:${PN} += "${sbindir}/generate-rndc-key.sh" |
| 116 | 116 | ||
| 117 | PACKAGE_BEFORE_PN += "${PN}-libs" | 117 | PACKAGE_BEFORE_PN += "${PN}-libs" |
| 118 | # special arrangement below due to | 118 | # special arrangement below due to |
| 119 | # https://github.com/isc-projects/bind9/commit/0e25af628cd776f98c04fc4cc59048f5448f6c88 | 119 | # https://github.com/isc-projects/bind9/commit/0e25af628cd776f98c04fc4cc59048f5448f6c88 |
| 120 | FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so" | 120 | FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so" |
| 121 | FILES_${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so" | 121 | FILES:${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so" |
| 122 | FILES_${PN}-staticdev += "${libdir}/*.la" | 122 | FILES:${PN}-staticdev += "${libdir}/*.la" |
| 123 | 123 | ||
| 124 | PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" | 124 | PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" |
| 125 | FILES_python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \ | 125 | FILES:python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \ |
| 126 | ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}" | 126 | ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}" |
| 127 | 127 | ||
| 128 | RDEPENDS_${PN}-dev = "" | 128 | RDEPENDS:${PN}-dev = "" |
| 129 | RDEPENDS_python3-bind = "python3-core python3-ply" | 129 | RDEPENDS:python3-bind = "python3-core python3-ply" |
