From ee4e4eb16a3729dcafad075c42aec1695b8ea15f Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Thu, 21 Jul 2022 18:54:01 +0100 Subject: [PATCH] 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. Signed-off-by: Alex Kiernan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bind/bind_9.18.4.bb | 13 ------------- 1 file changed, 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 c68816c06ec..8c62fc771d4 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 \ " LDFLAGS:append = " -lz" -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native setuptools3-base', '', d)} - # dhcp needs .la so keep them REMOVE_LIBTOOL_LA = "0" @@ -67,12 +65,6 @@ do_install:append() { install -d "${D}${sysconfdir}/init.d" install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/" install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind" - if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then - sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \ - ${D}${sbindir}/dnssec-coverage \ - ${D}${sbindir}/dnssec-checkds \ - ${D}${sbindir}/dnssec-keymgr - fi # Install systemd related files install -d ${D}${sbindir} @@ -119,9 +111,4 @@ FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so" FILES:${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so" FILES:${PN}-staticdev += "${libdir}/*.la" -PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" -FILES:python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \ - ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}" - DEV_PKG_DEPENDENCY = "" -RDEPENDS:python3-bind = "python3-core python3-ply" -- 2.47.2