diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2022-07-21 18:54:01 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-23 13:55:26 +0100 |
| commit | 10fc34c85e36fb4da0fe273d767a42f896147cdf (patch) | |
| tree | 9cdd03b05f0d26e1b89a6b8570cd22386ffcb494 | |
| parent | 54ba1dbbe9a535898283777775d5a6681a62b14f (diff) | |
| download | poky-10fc34c85e36fb4da0fe273d767a42f896147cdf.tar.gz | |
bind: Remove legacy python3 PACKAGECONFIG code
Python support was dropped upstream and removed in 8a9a5885995c ("bind:
update 9.16.26 -> 9.18.1"), clean up the remaining pieces of python3 in
the recipe.
(From OE-Core rev: ee4e4eb16a3729dcafad075c42aec1695b8ea15f)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/bind/bind_9.18.4.bb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/meta/recipes-connectivity/bind/bind_9.18.4.bb b/meta/recipes-connectivity/bind/bind_9.18.4.bb index c68816c06e..8c62fc771d 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.4.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.4.bb | |||
| @@ -46,8 +46,6 @@ EXTRA_OECONF = " --disable-devpoll --disable-auto-validation --enable-epoll \ | |||
| 46 | " | 46 | " |
| 47 | LDFLAGS:append = " -lz" | 47 | LDFLAGS:append = " -lz" |
| 48 | 48 | ||
| 49 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native setuptools3-base', '', d)} | ||
| 50 | |||
| 51 | # dhcp needs .la so keep them | 49 | # dhcp needs .la so keep them |
| 52 | REMOVE_LIBTOOL_LA = "0" | 50 | REMOVE_LIBTOOL_LA = "0" |
| 53 | 51 | ||
| @@ -67,12 +65,6 @@ do_install:append() { | |||
| 67 | install -d "${D}${sysconfdir}/init.d" | 65 | install -d "${D}${sysconfdir}/init.d" |
| 68 | install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/" | 66 | install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/" |
| 69 | install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind" | 67 | install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind" |
| 70 | if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then | ||
| 71 | sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \ | ||
| 72 | ${D}${sbindir}/dnssec-coverage \ | ||
| 73 | ${D}${sbindir}/dnssec-checkds \ | ||
| 74 | ${D}${sbindir}/dnssec-keymgr | ||
| 75 | fi | ||
| 76 | 68 | ||
| 77 | # Install systemd related files | 69 | # Install systemd related files |
| 78 | install -d ${D}${sbindir} | 70 | install -d ${D}${sbindir} |
| @@ -119,9 +111,4 @@ FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so" | |||
| 119 | FILES:${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so" | 111 | FILES:${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so" |
| 120 | FILES:${PN}-staticdev += "${libdir}/*.la" | 112 | FILES:${PN}-staticdev += "${libdir}/*.la" |
| 121 | 113 | ||
| 122 | PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" | ||
| 123 | FILES:python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \ | ||
| 124 | ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}" | ||
| 125 | |||
| 126 | DEV_PKG_DEPENDENCY = "" | 114 | DEV_PKG_DEPENDENCY = "" |
| 127 | RDEPENDS:python3-bind = "python3-core python3-ply" | ||
