Skip to contentSkip to conversation

log4cplus: move meta-oe pkg to core

PATCH In review akuster 8 participants 24 messages Sep 1, 2020 – Oct 21, 2020

lore
Share & tools
lore

akuster

author
#0 lore raw

PATCH 1/8 log4cplus: move meta-oe pkg to core

pkg need for kea

---
 .../log4cplus/log4cplus_2.0.5.bb              | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta/recipes-devtools/log4cplus/log4cplus_2.0.5.bb
meta/recipes-devtools/log4cplus/log4cplus_2.0.5.bb new file +19 -0
new file mode 100644
index 00000000000..967ac7623a3
@@ -0,0 +1,19 @@
+SUMMARY = "log4cplus provides a simple C++ logging API for log management"
+SECTION = "libs"
+HOMEPAGE = "http://sourceforge.net/projects/log4cplus/"
+BUGTRACKER = "http://sourceforge.net/p/log4cplus/bugs/"
+
+LICENSE = "Apache-2.0 & BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \
+          "
+SRC_URI[md5sum] = "71dd956bf686195127559671f1426cff"
+SRC_URI[sha256sum] = "c07115c23219390633798def30b7b51a0f79fdeb857e4b49632f17746d0ceb97"
+
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/"
+UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P<pver>\d+(\.\d+)+)/"
+
+inherit autotools pkgconfig
+
+BBCLASSEXTEND = "native"
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/8 kea: Move from meta-networking

---
 .../kea/files/0001-remove-AC_TRY_RUN.patch    | 34 ++++++++++
 .../kea/files/kea-dhcp-ddns.service           | 13 ++++
 .../kea/files/kea-dhcp4.service               | 13 ++++
 .../kea/files/kea-dhcp6.service               | 13 ++++
 meta/recipes-connectivity/kea/kea_1.7.7.bb    | 67 +++++++++++++++++++
 5 files changed, 140 insertions(+)
 create mode 100644 meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch
 create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service
 create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp4.service
 create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp6.service
 create mode 100644 meta/recipes-connectivity/kea/kea_1.7.7.bb
meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch new file +34 -0
new file mode 100644
index 00000000000..d7ca9ff8fa5
@@ -0,0 +1,34 @@
+From 9d6b8321c5b46199baca907f3d42bdcaaf1958a8 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <[email protected]>
+Date: Thu, 23 May 2019 23:59:42 -0700
+Subject: [PATCH] remove AC_TRY_RUN
+
+AC_TRY_RUN doesn't work in cross compile env,
+use AC_COMPILE_IFELSE instead to fix below configure
+error:
+ | checking for usuable C++11 regex... configure: error: in `/builddir/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build':
+ | configure: error: cannot run test program while cross compiling
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mingli Yu <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c880b77..dd40c7c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -580,7 +580,7 @@ AC_TRY_COMPILE([
+         AC_MSG_RESULT(no))
+ 
+ AC_MSG_CHECKING(for usuable C++11 regex)
+-AC_TRY_RUN([
++AC_COMPILE_IFELSE([
+ #include <regex>
+ #include <iostream>
+ int main() {
+-- 
+2.21.0
+
meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service new file +13 -0
new file mode 100644
index 00000000000..91aa2eb14f0
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCP-DDNS Server
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea
+ExecStart=@SBINDIR@/kea-dhcp-ddns -c @SYSCONFDIR@/kea/kea-dhcp-ddns.conf
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/kea/files/kea-dhcp4.service new file +13 -0
new file mode 100644
index 00000000000..b851ea71c53
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCPv4 Server
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
+ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/kea/files/kea-dhcp6.service new file +13 -0
new file mode 100644
index 00000000000..0f9f0ef8d98
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCPv6 Server
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
+ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/kea/kea_1.7.7.bb new file +67 -0

67 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/8 maintainers.inc: Add me as kea & log4plus maintainer.

In reply to akuster
---
 meta/conf/distro/include/maintainers.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/conf/distro/include/maintainers.inc +2 -0
index c3a1f273328..b83be2c5f9e 100644
@@ -287,6 +287,7 @@ RECIPE_MAINTAINER_pn-json-c = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-jquery = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin <[email protected]>"
+RECIPE_MAINTAINER_pn-kea = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-kexec-tools = "Armin Kuster <[email protected]>"
@@ -450,6 +451,7 @@ RECIPE_MAINTAINER_pn-linux-yocto-rt = "Bruce Ashfield <[email protected]>
 RECIPE_MAINTAINER_pn-linux-yocto-tiny = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-llvm = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-logrotate = "Yi Zhao <[email protected]>"
+RECIPE_MAINTAINER_pn-log4cplus = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-lrzsz = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-lsb-release = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-lsof = "Ross Burton <[email protected]>"
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 4/8 dhcpd: move from meta-network need a client

In reply to akuster
---
 .../dhcpcd/dhcpcd_9.1.4.bb                    | 28 ++++++++++++
 ...e-INCLUDEDIR-to-prevent-build-issues.patch | 45 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb
 create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
meta/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb new file +28 -0
new file mode 100644
index 00000000000..defd3420f02
@@ -0,0 +1,28 @@
+SECTION = "console/network"
+SUMMARY = "dhcpcd - a DHCP client"
+DESCRIPTION = "dhcpcd runs on your machine and silently configures your \
+               computer to work on the attached networks without trouble \
+               and mostly without configuration."
+
+HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/"
+
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2"
+
+UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
+
+SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
+           file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch"
+
+SRC_URI[sha256sum] = "5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820"
+
+inherit pkgconfig autotools-brokensep
+
+PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+
+PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
+
+EXTRA_OECONF = "--enable-ipv4"
+
+FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch new file +45 -0

45 lines not on this page · raw message

Signature · 1 line
2.17.1
#4 lore raw

Re: [OE-core] [PATCH 4/8] dhcpd: move from meta-network need a client

The title uses 'dhcpd' but the recipe's name is 'dhcpcd'. [Patch 5/8] also uses 'dhcpd'.

One more thing to confirm. We are using dhcpcd to replace dhcp, right?

Best Regards,
Chen Qi

Quoted 96 lines · akuster
---
  .../dhcpcd/dhcpcd_9.1.4.bb                    | 28 ++++++++++++
  ...e-INCLUDEDIR-to-prevent-build-issues.patch | 45 +++++++++++++++++++
  2 files changed, 73 insertions(+)

create mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb
create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch

meta/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb new file +28 -0
new file mode 100644
index 00000000000..defd3420f02
@@ -0,0 +1,28 @@
+SECTION = "console/network"
+SUMMARY = "dhcpcd - a DHCP client"
+DESCRIPTION = "dhcpcd runs on your machine and silently configures your \
+               computer to work on the attached networks without trouble \
+               and mostly without configuration."
+
+HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/"
+
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2"
+
+UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
+
+SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
+           file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch"
+
+SRC_URI[sha256sum] = "5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820"
+
+inherit pkgconfig autotools-brokensep
+
+PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+
+PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
+
+EXTRA_OECONF = "--enable-ipv4"
+
+FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch new file +45 -0
new file mode 100644
index 00000000000..37d2344438a
@@ -0,0 +1,45 @@
+From aa9e3982c1e75ad49945a62f5e262279c7a905a4 Mon Sep 17 00:00:00 2001
+From: Stefano Cappa <[email protected]>
+Date: Sun, 13 Jan 2019 01:50:52 +0100
+Subject: [PATCH] remove INCLUDEDIR to prevent build issues
+
+Upstream-Status: Pending
+
+Signed-off-by: Stefano Cappa <[email protected]>
+---
+ configure | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/configure b/configure
+index 6c81e0db..32dea2b4 100755
+--- a/configure
++++ b/configure
+@@ -20,7 +20,6 @@ BUILD=
+ HOST=
+ HOSTCC=
+ TARGET=
+-INCLUDEDIR=
+ DEBUG=
+ FORK=
+ STATIC=
+@@ -72,7 +71,6 @@ for x do
+ 	--mandir) MANDIR=$var;;
+ 	--datadir) DATADIR=$var;;
+ 	--with-ccopts|CFLAGS) CFLAGS=$var;;
+-	-I|--includedir) INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }-I$var";;
+ 	CC) CC=$var;;
+ 	CPPFLAGS) CPPFLAGS=$var;;
+ 	PKG_CONFIG) PKG_CONFIG=$var;;
+@@ -309,9 +307,6 @@ if [ -n "$CPPFLAGS" ]; then
+ 	echo "CPPFLAGS=" >>$CONFIG_MK
+ 	echo "CPPFLAGS+=	$CPPFLAGS" >>$CONFIG_MK
+ fi
+-if [ -n "$INCLUDEDIR" ]; then
+-	echo "CPPFLAGS+=	$INCLUDEDIR" >>$CONFIG_MK
+-fi
+ if [ -n "$LDFLAGS" ]; then
+ 	echo "LDFLAGS=" >>$CONFIG_MK
+ 	echo "LDFLAGS+=	$LDFLAGS" >>$CONFIG_MK
+--
+2.17.2 (Apple Git-113)
+
#5 lore raw

Re: [OE-core] [PATCH 4/8] dhcpd: move from meta-network need a client

Quoted 5 lines · Chen Qi

The title uses 'dhcpd' but the recipe's name is 'dhcpcd'. [Patch 5/8] also uses 'dhcpd'.

One more thing to confirm. We are using dhcpcd to replace dhcp, right?

kea replaces dhcp-server, dhcpcd replaces dhcp-client.

I tried to fix the naming in the patches that merged.

Cheers,

Richard

author
#6 lore raw

PATCH 5/8 maintainers.inc: Add me as dhcpd maintainer

In reply to akuster
---
 meta/conf/distro/include/maintainers.inc | 1 +
 1 file changed, 1 insertion(+)
meta/conf/distro/include/maintainers.inc +1 -0
index b83be2c5f9e..27e3474da8b 100644
@@ -144,6 +144,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <[email protected]>"
 RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia <[email protected]>"
+RECIPE_MAINTAINER_pn-dhcpd = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-diffstat = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-diffutils = "Chen Qi <[email protected]>"
Signature · 1 line
2.17.1
author
#7 lore raw

PATCH 6/8 dhcp: remove from core

In reply to akuster

update maintainers.inc too

---
 meta/conf/distro/include/maintainers.inc      |   1 -
 meta/recipes-connectivity/dhcp/dhcp.inc       | 149 ------------------
 ...TH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  27 ----
 ...-limitation-in-linux-dhclient-script.patch |  65 --------
 .../dhcp/dhcp/0002-dhclient-dbus.patch        | 117 --------------
 .../dhcp/dhcp/0003-link-with-lcrypto.patch    |  35 ----
 .../dhcp/0004-Fix-out-of-tree-builds.patch    |  95 -----------
 ...invoke-dhclient-script-failed-on-Rea.patch |  36 -----
 ...gument-to-make-the-libxml2-dependenc.patch |  62 --------
 ...move-dhclient-script-bash-dependency.patch |  28 ----
 ...ct-the-intention-for-xml2-lib-search.patch |  34 ----
 .../dhcp/dhcp/0013-fixup_use_libbind.patch    |  64 --------
 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb  |  23 ---
 .../dhcp/files/default-relay                  |  12 --
 .../dhcp/files/default-server                 |   7 -
 .../dhcp/files/dhclient-systemd-wrapper       |  39 -----
 .../dhcp/files/dhclient.conf                  |  50 ------
 .../dhcp/files/dhclient.service               |  13 --
 .../dhcp/files/dhcpd.conf                     | 108 -------------
 .../dhcp/files/dhcpd.service                  |  15 --
 .../dhcp/files/dhcpd6.service                 |  15 --
 .../dhcp/files/dhcrelay.service               |  10 --
 .../dhcp/files/init-relay                     |  44 ------
 .../dhcp/files/init-server                    |  44 ------
 24 files changed, 1093 deletions(-)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp.inc
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
 delete mode 100644 meta/recipes-connectivity/dhcp/files/default-relay
 delete mode 100644 meta/recipes-connectivity/dhcp/files/default-server
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.conf
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd.conf
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd6.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcrelay.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/init-relay
 delete mode 100644 meta/recipes-connectivity/dhcp/files/init-server
meta/conf/distro/include/maintainers.inc +0 -1
index 27e3474da8b..a55dbfa13c9 100644
@@ -143,7 +143,6 @@ RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <[email protected]>"
 RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-dhcpd = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-diffstat = "Chen Qi <[email protected]>"
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -149

149 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch deleted +0 -27
deleted file mode 100644
index d1b57f0bb41..00000000000
@@ -1,27 +0,0 @@
-From 7cc29144535a622fc671dc86eb1da65b0473a7c4 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 16:14:22 +0800
-Subject: [PATCH 01/11] define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
-
-Upstream-Status: Inappropriate [OE specific]
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- includes/site.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/includes/site.h
-===================================================================
---- dhcp-4.4.1.orig/includes/site.h
-+++ dhcp-4.4.1/includes/site.h
-@@ -148,7 +148,8 @@
- /* Define this if you want the dhcpd.conf file to go somewhere other than
-    the default location.   By default, it goes in /etc/dhcpd.conf. */
- 
--/* #define _PATH_DHCPD_CONF	"/etc/dhcpd.conf" */
-+#define _PATH_DHCPD_CONF	"/etc/dhcp/dhcpd.conf"
-+#define _PATH_DHCLIENT_CONF	"/etc/dhcp/dhclient.conf"
- 
- /* Network API definitions.   You do not need to choose one of these - if
-    you don't choose, one will be chosen for you in your system's config
meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch deleted +0 -65

65 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -117

117 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch deleted +0 -35
deleted file mode 100644
index 5b35933a54a..00000000000
@@ -1,35 +0,0 @@
-From d80bd792323dbd56269309f85b4506eb6b1b60e9 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <[email protected]>
-Date: Tue, 15 Aug 2017 15:05:47 +0800
-Subject: [PATCH 03/11] link with lcrypto
-
-From 4.2.0 final release, -lcrypto check was removed and we compile
-static libraries
-from bind that are linked to libcrypto. This is why i added a patch in
-order to add
--lcrypto to LIBS.
-
-Upstream-Status: Pending
-Signed-off-by: Andrei Gherzan <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -612,6 +612,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
- # Look for optional headers.
- AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
- 
-+# find an MD5 library
-+AC_SEARCH_LIBS(MD5_Init, [crypto])
-+AC_SEARCH_LIBS(MD5Init, [crypto])
-+
- # Solaris needs some libraries for functions
- AC_SEARCH_LIBS(socket, [socket])
- AC_SEARCH_LIBS(inet_ntoa, [nsl])
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -95

95 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch deleted +0 -36
deleted file mode 100644
index dd56381b1dc..00000000000
@@ -1,36 +0,0 @@
-From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 15:24:14 +0800
-Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on
- Read-only file system
-
-In read-only file system, '/etc' is on the readonly partition,
-and '/etc/resolv.conf' is symlinked to a separate writable
-partition.
-
-In this situation, we create temp files 'resolv.conf.dhclient-new'
-in /tmp dir.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3d447b6..3122a75 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -40,7 +40,7 @@ make_resolv_conf() {
-     # DHCPv4
-     if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
-        [ -n "$new_domain_name_servers" ]; then
--        new_resolv_conf=/etc/resolv.conf.dhclient-new
-+        new_resolv_conf=/tmp/resolv.conf.dhclient-new
-         rm -f $new_resolv_conf
- 
-         if [ -n "$new_domain_name" ]; then
--- 
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -62

62 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch deleted +0 -28
deleted file mode 100644
index 912b6d6312c..00000000000
@@ -1,28 +0,0 @@
-From f3f8b7726e50e24ef3edf5fa5a17e31d39118d7e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-Date: Tue, 15 Aug 2017 15:49:31 +0800
-Subject: [PATCH 09/11] remove dhclient-script bash dependency
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andre McCurdy <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3122a75..1712d7d 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # dhclient-script for Linux. Dan Halbert, March, 1997.
- # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
- # No guarantees about this. I'm a novice at the details of Linux
--- 
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch deleted +0 -34
deleted file mode 100644
index 39ba65fbc46..00000000000
@@ -1,34 +0,0 @@
-From 501543b3ef715488a142e3d301ff2733aa33eec7 Mon Sep 17 00:00:00 2001
-From: Awais Belal <[email protected]>
-Date: Wed, 25 Oct 2017 21:00:05 +0500
-Subject: [PATCH] dhcp: correct the intention for xml2 lib search
-
-A missing case breaks the build when libxml2 is
-required and found appropriately. The third argument
-to the function AC_SEARCH_LIB is action-if-found which
-was mistakenly been used for the case where the library
-is not found and hence breaks the configure phase
-where it shoud actually pass.
-We now pass on silently when action-if-found is
-executed.
-
-Upstream-Status: Pending
-
-Signed-off-by: Awais Belal <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -647,7 +647,7 @@ AC_ARG_WITH(libxml2,
- 	with_libxml2="$withval", with_libxml2="no")
- 
- if test x$with_libxml2 != xno; then
--	AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
-+	AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
- 		[if test x$with_libxml2 != xauto; then
- 			AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
- 		fi])
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -64

64 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -23
deleted file mode 100644
index cf4af826099..00000000000
@@ -1,23 +0,0 @@
-require dhcp.inc
-
-SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
-            file://0002-dhclient-dbus.patch \
-            file://0003-link-with-lcrypto.patch \
-            file://0004-Fix-out-of-tree-builds.patch \
-            file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \
-            file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \
-            file://0009-remove-dhclient-script-bash-dependency.patch \
-            file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
-            file://0013-fixup_use_libbind.patch \
-            file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \
-"
-
-SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
-SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
-
-LDFLAGS_append = " -pthread"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
-
-CFLAGS += "-fcommon"
meta/recipes-connectivity/dhcp/files/default-relay deleted +0 -12
deleted file mode 100644
index 7961f014bef..00000000000
@@ -1,12 +0,0 @@
-# Defaults for dhcp-relay initscript
-# sourced by /etc/init.d/dhcp-relay
-
-# What servers should the DHCP relay forward requests to?
-# e.g: SERVERS="192.168.0.1"
-SERVERS=""
-
-# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests?
-INTERFACES=""
-
-# Additional options that are passed to the DHCP relay daemon?
-OPTIONS=""
meta/recipes-connectivity/dhcp/files/default-server deleted +0 -7
deleted file mode 100644
index 0385d169922..00000000000
@@ -1,7 +0,0 @@
-# Defaults for dhcp initscript
-# sourced by /etc/init.d/dhcp-server
-# installed at /etc/default/dhcp-server by the maintainer scripts
-
-# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
-#       Separate multiple interfaces with spaces, e.g. "eth0 eth1".
-INTERFACES=""
meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper deleted +0 -39
deleted file mode 100644
index 7d0e224a1df..00000000000
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# In case the interface is used for nfs, skip it.
-nfsroot=0
-interfaces=""
-exec 9<&0 < /proc/mounts
-while read dev mtpt fstype rest; do
-    if test $mtpt = "/" ; then
-        case $fstype in
-            nfs | nfs4)
-                nfsroot=1
-                nfs_addr=`echo $rest | sed -e 's/^.*addr=\([0-9.]*\).*$/\1/'`
-                break
-                ;;
-            *)
-                ;;
-        esac
-    fi
-done
-exec 0<&9 9<&-
-
-if [ $nfsroot -eq 0 ]; then
-    interfaces="$INTERFACES"
-else
-    if [ -x /bin/ip -o -x /sbin/ip ] ; then
-	nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'`
-    fi
-    for i in $INTERFACES; do
-	if test "x$i" = "x$nfs_iface"; then
-            echo "dhclient skipping nfsroot interface $i"
-	else
-	    interfaces="$interfaces $i"
-	fi
-    done
-fi
-
-if test "x$interfaces" != "x"; then
-    /sbin/dhclient -d -cf /etc/dhcp/dhclient.conf -q -lf /var/lib/dhcp/dhclient.leases $interfaces
-fi
meta/recipes-connectivity/dhcp/files/dhclient.conf deleted +0 -50

50 lines not on this page · raw message

meta/recipes-connectivity/dhcp/files/dhclient.service deleted +0 -13
deleted file mode 100644
index 9ddb4d1dfe9..00000000000
@@ -1,13 +0,0 @@
-[Unit]
-Description=Dynamic Host Configuration Protocol (DHCP)
-Wants=network.target
-Before=network.target
-After=systemd-udevd.service
-
-[Service]
-EnvironmentFile=-@SYSCONFDIR@/default/dhcp-client
-ExecStart=@BASE_SBINDIR@/dhclient-systemd-wrapper
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/dhcpd.conf deleted +0 -108

108 lines not on this page · raw message

meta/recipes-connectivity/dhcp/files/dhcpd.service deleted +0 -15
deleted file mode 100644
index ae4f93eca5b..00000000000
@@ -1,15 +0,0 @@
-[Unit]
-Description=DHCPv4 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-PIDFile=@localstatedir@/run/dhcpd.pid
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
-EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcp-server
-ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd.leases
-ExecStart=@SBINDIR@/dhcpd -f -cf @SYSCONFDIR@/dhcp/dhcpd.conf -pf @localstatedir@/run/dhcpd.pid $DHCPDARGS -q $INTERFACES
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/dhcpd6.service deleted +0 -15
deleted file mode 100644
index 52a6224dc2c..00000000000
@@ -1,15 +0,0 @@
-[Unit]
-Description=DHCPv6 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-PIDFile=@localstatedir@/run/dhcpd6.pid
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
-EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcpd6
-ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd6.leases
-ExecStart=@SBINDIR@/dhcpd -f -6 -cf @SYSCONFDIR@/dhcp/dhcpd6.conf -pf @localstatedir@/run/dhcpd6.pid $DHCPDARGS -q $INTERFACES
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/dhcrelay.service deleted +0 -10
deleted file mode 100644
index 15ff927d346..00000000000
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCP Relay Agent Daemon
-After=network.target
-
-[Service]
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay
-ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/init-relay deleted +0 -44

44 lines not on this page · raw message

meta/recipes-connectivity/dhcp/files/init-server deleted +0 -44

44 lines not on this page · raw message

Signature · 1 line
2.17.1
#8 lore raw

Re: [OE-core] [PATCH 6/8] dhcp: remove from core

it seems its used by
build-appliance-image and packagegroup-core-base-utils so you need to take care of that as well. in meta-networking networkmanager recipe depends on it too which I think I can take care.

Quoted 1,300 lines · akuster

update maintainers.inc too

---
 meta/conf/distro/include/maintainers.inc      |   1 -
 meta/recipes-connectivity/dhcp/dhcp.inc       | 149 ------------------
 ...TH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  27 ----
 ...-limitation-in-linux-dhclient-script.patch |  65 --------
 .../dhcp/dhcp/0002-dhclient-dbus.patch        | 117 --------------
 .../dhcp/dhcp/0003-link-with-lcrypto.patch    |  35 ----
 .../dhcp/0004-Fix-out-of-tree-builds.patch    |  95 -----------
 ...invoke-dhclient-script-failed-on-Rea.patch |  36 -----
 ...gument-to-make-the-libxml2-dependenc.patch |  62 --------
 ...move-dhclient-script-bash-dependency.patch |  28 ----
 ...ct-the-intention-for-xml2-lib-search.patch |  34 ----
 .../dhcp/dhcp/0013-fixup_use_libbind.patch    |  64 --------
 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb  |  23 ---
 .../dhcp/files/default-relay                  |  12 --
 .../dhcp/files/default-server                 |   7 -
 .../dhcp/files/dhclient-systemd-wrapper       |  39 -----
 .../dhcp/files/dhclient.conf                  |  50 ------
 .../dhcp/files/dhclient.service               |  13 --
 .../dhcp/files/dhcpd.conf                     | 108 -------------
 .../dhcp/files/dhcpd.service                  |  15 --
 .../dhcp/files/dhcpd6.service                 |  15 --
 .../dhcp/files/dhcrelay.service               |  10 --
 .../dhcp/files/init-relay                     |  44 ------
 .../dhcp/files/init-server                    |  44 ------
 24 files changed, 1093 deletions(-)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp.inc
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
 delete mode 100644 meta/recipes-connectivity/dhcp/files/default-relay
 delete mode 100644 meta/recipes-connectivity/dhcp/files/default-server
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.conf
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd.conf
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd6.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcrelay.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/init-relay
 delete mode 100644 meta/recipes-connectivity/dhcp/files/init-server
meta/conf/distro/include/maintainers.inc +0 -1
index 27e3474da8b..a55dbfa13c9 100644
@@ -143,7 +143,6 @@ RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <[email protected]>"
 RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-dhcpd = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-diffstat = "Chen Qi <[email protected]>"
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -149
deleted file mode 100644
index d46130d49b9..00000000000
@@ -1,149 +0,0 @@
-SECTION = "console/network"
-SUMMARY = "Internet Software Consortium DHCP package"
-DESCRIPTION = "DHCP (Dynamic Host Configuration Protocol) is a protocol \
-which allows individual devices on an IP network to get their own \
-network configuration information from a server.  DHCP helps make it \
-easier to administer devices."
-
-HOMEPAGE = "http://www.isc.org/"
-
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"
-
-DEPENDS = "openssl bind"
-
-SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
-           file://init-relay file://default-relay \
-           file://init-server file://default-server \
-           file://dhclient.conf file://dhcpd.conf \
-           file://dhclient-systemd-wrapper \
-           file://dhclient.service \
-           file://dhcpd.service file://dhcrelay.service \
-           file://dhcpd6.service \
-           "
-UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
-
-inherit autotools-brokensep systemd useradd update-rc.d
-
-USERADD_PACKAGES = "${PN}-server"
-USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}"
-
-SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay ${PN}-client"
-SYSTEMD_SERVICE_${PN}-server = "dhcpd.service dhcpd6.service"
-SYSTEMD_AUTO_ENABLE_${PN}-server = "disable"
-
-SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service"
-SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable"
-
-SYSTEMD_SERVICE_${PN}-client = "dhclient.service"
-SYSTEMD_AUTO_ENABLE_${PN}-client = "disable"
-
-INITSCRIPT_PACKAGES = "dhcp-server"
-INITSCRIPT_NAME_dhcp-server = "dhcp-server"
-INITSCRIPT_PARAMS_dhcp-server = "defaults"
-
-CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
-                --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
-                --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
-                --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
-                --enable-paranoia --disable-static \
-                --with-randomdev=/dev/random \
-                --with-libbind=${STAGING_DIR_HOST} \
-               --enable-libtool \
-               "
-
-#Enable shared libs per dhcp README
-do_configure_prepend () {
-       cp configure.ac+lt configure.ac
-}
-
-do_install_append () {
-       install -d ${D}${sysconfdir}/init.d
-       install -d ${D}${sysconfdir}/default
-       install -d ${D}${sysconfdir}/dhcp
-       install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay
-       install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay
-       install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server
-       install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
-
-       rm -f ${D}${sysconfdir}/dhclient.conf*
-       rm -f ${D}${sysconfdir}/dhcpd.conf*
-       install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
-       install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
-
-       install -d ${D}${base_sbindir}/
-       if [ "${sbindir}" != "${base_sbindir}" ]; then
-               mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
-       fi
-       install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
-
-       # Install systemd unit files
-       install -d ${D}${systemd_unitdir}/system
-       install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
-       install -m 0644 ${WORKDIR}/dhcpd6.service ${D}${systemd_unitdir}/system
-       install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
-       sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service ${D}${systemd_unitdir}/system/dhcrelay.service
-       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-       sed -i -e 's,@base_bindir@,${base_bindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-       sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service
-
-       install -d ${D}${base_sbindir}
-       install -m 0755 ${WORKDIR}/dhclient-systemd-wrapper ${D}${base_sbindir}/dhclient-systemd-wrapper
-       install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
-       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhclient.service
-       sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g' ${D}${systemd_unitdir}/system/dhclient.service
-}
-
-PACKAGES += "dhcp-libs dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
-
-PACKAGES_remove = "${PN}"
-RDEPENDS_${PN}-client += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'iproute2', '', d)}"
-RDEPENDS_${PN}-dev = ""
-RDEPENDS_${PN}-staticdev = ""
-FILES_${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0* ${libdir}/libdhcp.so.0*"
-
-FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
-RRECOMMENDS_${PN}-server = "dhcp-server-config"
-
-FILES_${PN}-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
-
-FILES_${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
-
-FILES_${PN}-client = "${base_sbindir}/dhclient \
-                      ${base_sbindir}/dhclient-script \
-                      ${sysconfdir}/dhcp/dhclient.conf \
-                      ${base_sbindir}/dhclient-systemd-wrapper \
-                     "
-
-FILES_${PN}-omshell = "${bindir}/omshell"
-
-pkg_postinst_dhcp-server() {
-    mkdir -p $D/${localstatedir}/lib/dhcp
-    touch $D/${localstatedir}/lib/dhcp/dhcpd.leases
-    touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases
-}
-
-pkg_postinst_dhcp-client() {
-    mkdir -p $D/${localstatedir}/lib/dhcp
-}
-
-pkg_postrm_dhcp-server() {
-    rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
-    rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
-
-    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
-        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
-    fi
-}
-
-pkg_postrm_dhcp-client() {
-    rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
-    rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
-
-    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
-        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
-    fi
-}
meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch deleted +0 -27
deleted file mode 100644
index d1b57f0bb41..00000000000
@@ -1,27 +0,0 @@
-From 7cc29144535a622fc671dc86eb1da65b0473a7c4 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 16:14:22 +0800
-Subject: [PATCH 01/11] define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
-
-Upstream-Status: Inappropriate [OE specific]
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- includes/site.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/includes/site.h
-===================================================================
---- dhcp-4.4.1.orig/includes/site.h
-+++ dhcp-4.4.1/includes/site.h
-@@ -148,7 +148,8 @@
- /* Define this if you want the dhcpd.conf file to go somewhere other than
-    the default location.   By default, it goes in /etc/dhcpd.conf. */
-
--/* #define _PATH_DHCPD_CONF   "/etc/dhcpd.conf" */
-+#define _PATH_DHCPD_CONF      "/etc/dhcp/dhcpd.conf"
-+#define _PATH_DHCLIENT_CONF   "/etc/dhcp/dhclient.conf"
-
- /* Network API definitions.   You do not need to choose one of these - if
-    you don't choose, one will be chosen for you in your system's config
meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch deleted +0 -65
deleted file mode 100644
index 2359381b938..00000000000
@@ -1,65 +0,0 @@
-From eec0503cfc36f63d777f5cb3f2719cecedcb8468 Mon Sep 17 00:00:00 2001
-From: Haris Okanovic <[email protected]>
-Date: Mon, 7 Jan 2019 13:22:09 -0600
-Subject: [PATCH] Workaround busybox limitation in Linux dhclient-script
-
-Busybox is a lightweight implementation of coreutils commonly used on
-space-constrained embedded Linux distributions. It's implementation of
-chown and chmod doesn't provide a "--reference" option added to
-client/scripts/linux as of commit 9261cb14. This change works around
-that limitation by using stat to read ownership and permissions flags
-and simple chown/chmod calls supported in both coreutils and busybox.
-
-    modified:   client/scripts/linux
-
-Signed-off-by: Haris Okanovic <[email protected]>
-Upstream-Status: Pending [ISC-Bugs #48771]
----
- client/scripts/linux | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 0c429697..2435a44b 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -32,6 +32,17 @@
- # if your system holds ip tool in a non-standard location.
- ip=/sbin/ip
-
-+chown_chmod_by_reference() {
-+    local reference_file="$1"
-+    local target_file="$2"
-+
-+    local owner=$(stat -c "%u:%g" "$reference_file")
-+    local perm=$(stat -c "%a" "$reference_file")
-+
-+    chown "$owner" "$target_file"
-+    chmod "$perm" "$target_file"
-+}
-+
- # update /etc/resolv.conf based on received values
- # This updated version mostly follows Debian script by Andrew Pollock et al.
- make_resolv_conf() {
-@@ -74,8 +85,7 @@ make_resolv_conf() {
-         fi
-
-       if [ -f /etc/resolv.conf ]; then
--          chown --reference=/etc/resolv.conf $new_resolv_conf
--          chmod --reference=/etc/resolv.conf $new_resolv_conf
-+          chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf
-       fi
-         mv -f $new_resolv_conf /etc/resolv.conf
-     # DHCPv6
-@@ -101,8 +111,7 @@ make_resolv_conf() {
-         fi
-
-       if [ -f /etc/resolv.conf ]; then
--            chown --reference=/etc/resolv.conf $new_resolv_conf
--            chmod --reference=/etc/resolv.conf $new_resolv_conf
-+          chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf
-       fi
-         mv -f $new_resolv_conf /etc/resolv.conf
-     fi
---
-2.20.0
-
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -117
deleted file mode 100644
index 101c33f677a..00000000000
@@ -1,117 +0,0 @@
-From be7540d31c356e80ee02e90e8bf162b7ac6e5ba5 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 14:56:56 +0800
-Subject: [PATCH 02/11] dhclient dbus
-
-Upstream-Status: Inappropriate [distribution]
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/bsdos   | 5 +++++
- client/scripts/freebsd | 5 +++++
- client/scripts/linux   | 5 +++++
- client/scripts/netbsd  | 5 +++++
- client/scripts/openbsd | 5 +++++
- client/scripts/solaris | 5 +++++
- 6 files changed, 30 insertions(+)
-
-diff --git a/client/scripts/bsdos b/client/scripts/bsdos
-index d69d0d8..095b143 100755
---- a/client/scripts/bsdos
-+++ b/client/scripts/bsdos
-@@ -45,6 +45,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/freebsd b/client/scripts/freebsd
-index 8f3e2a2..ad7fb44 100755
---- a/client/scripts/freebsd
-+++ b/client/scripts/freebsd
-@@ -89,6 +89,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 5fb1612..3d447b6 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -174,6 +174,11 @@ exit_with_hooks() {
-         exit_status=$?
-     fi
-
-+    if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+        dbus-send --system --dest=com.redhat.dhcp \
-+           --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+           'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+    fi
-     exit $exit_status
- }
-
-diff --git a/client/scripts/netbsd b/client/scripts/netbsd
-index 07383b7..aaba8e8 100755
---- a/client/scripts/netbsd
-+++ b/client/scripts/netbsd
-@@ -45,6 +45,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/openbsd b/client/scripts/openbsd
-index e7f4746..56b980c 100644
---- a/client/scripts/openbsd
-+++ b/client/scripts/openbsd
-@@ -45,6 +45,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/solaris b/client/scripts/solaris
-index af553b9..4a2aa69 100755
---- a/client/scripts/solaris
-+++ b/client/scripts/solaris
-@@ -26,6 +26,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
---
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch deleted +0 -35
deleted file mode 100644
index 5b35933a54a..00000000000
@@ -1,35 +0,0 @@
-From d80bd792323dbd56269309f85b4506eb6b1b60e9 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <[email protected]>
-Date: Tue, 15 Aug 2017 15:05:47 +0800
-Subject: [PATCH 03/11] link with lcrypto
-
-From 4.2.0 final release, -lcrypto check was removed and we compile
-static libraries
-from bind that are linked to libcrypto. This is why i added a patch in
-order to add
--lcrypto to LIBS.
-
-Upstream-Status: Pending
-Signed-off-by: Andrei Gherzan <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -612,6 +612,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
- # Look for optional headers.
- AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
-
-+# find an MD5 library
-+AC_SEARCH_LIBS(MD5_Init, [crypto])
-+AC_SEARCH_LIBS(MD5Init, [crypto])
-+
- # Solaris needs some libraries for functions
- AC_SEARCH_LIBS(socket, [socket])
- AC_SEARCH_LIBS(inet_ntoa, [nsl])
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -95
deleted file mode 100644
index 7b57730ffb7..00000000000
@@ -1,95 +0,0 @@
-From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 15:08:22 +0800
-Subject: [PATCH 04/11] Fix out of tree builds
-
-Upstream-Status: Pending
-
-RP 2013/03/21
-
-Rebase to 4.3.6
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/Makefile.am  | 4 ++--
- common/Makefile.am  | 3 ++-
- dhcpctl/Makefile.am | 2 ++
- omapip/Makefile.am  | 1 +
- relay/Makefile.am   | 2 +-
- server/Makefile.am  | 2 +-
- 6 files changed, 9 insertions(+), 5 deletions(-)
-
-Index: dhcp-4.4.1/common/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/common/Makefile.am
-+++ dhcp-4.4.1/common/Makefile.am
-@@ -1,4 +1,5 @@
--AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
-+
- AM_CFLAGS = $(LDAP_CFLAGS)
-
- lib_LIBRARIES = libdhcp.a
-Index: dhcp-4.4.1/dhcpctl/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/dhcpctl/Makefile.am
-+++ dhcp-4.4.1/dhcpctl/Makefile.am
-@@ -3,6 +3,8 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@
- BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
- BINDLIBISCDIR=@BINDLIBISCDIR@
-
-+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
-+
- bin_PROGRAMS = omshell
- lib_LIBRARIES = libdhcpctl.a
- noinst_PROGRAMS = cltest
-Index: dhcp-4.4.1/server/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/server/Makefile.am
-+++ dhcp-4.4.1/server/Makefile.am
-@@ -4,7 +4,7 @@
- # production code. Sadly, we are not there yet.
- SUBDIRS = . tests
-
--AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
-
- dist_sysconf_DATA = dhcpd.conf.example
- sbin_PROGRAMS = dhcpd
-Index: dhcp-4.4.1/client/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/client/Makefile.am
-+++ dhcp-4.4.1/client/Makefile.am
-@@ -5,7 +5,7 @@
- SUBDIRS = . tests
-
- AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"'
--AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"'
-+AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
-
- dist_sysconf_DATA = dhclient.conf.example
- sbin_PROGRAMS = dhclient
-Index: dhcp-4.4.1/omapip/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/omapip/Makefile.am
-+++ dhcp-4.4.1/omapip/Makefile.am
-@@ -2,6 +2,7 @@ BINDLIBIRSDIR=@BINDLIBIRSDIR@
- BINDLIBDNSDIR=@BINDLIBDNSDIR@
- BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
- BINDLIBISCDIR=@BINDLIBISCDIR@
-+AM_CPPFLAGS = -I$(top_srcdir)/includes
-
- lib_LIBRARIES = libomapi.a
- noinst_PROGRAMS = svtest
-Index: dhcp-4.4.1/relay/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/relay/Makefile.am
-+++ dhcp-4.4.1/relay/Makefile.am
-@@ -1,6 +1,6 @@
- SUBDIRS = . tests
-
--AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
-
- sbin_PROGRAMS = dhcrelay
- dhcrelay_SOURCES = dhcrelay.c
meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch deleted +0 -36
deleted file mode 100644
index dd56381b1dc..00000000000
@@ -1,36 +0,0 @@
-From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 15:24:14 +0800
-Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on
- Read-only file system
-
-In read-only file system, '/etc' is on the readonly partition,
-and '/etc/resolv.conf' is symlinked to a separate writable
-partition.
-
-In this situation, we create temp files 'resolv.conf.dhclient-new'
-in /tmp dir.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3d447b6..3122a75 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -40,7 +40,7 @@ make_resolv_conf() {
-     # DHCPv4
-     if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
-        [ -n "$new_domain_name_servers" ]; then
--        new_resolv_conf=/etc/resolv.conf.dhclient-new
-+        new_resolv_conf=/tmp/resolv.conf.dhclient-new
-         rm -f $new_resolv_conf
-
-         if [ -n "$new_domain_name" ]; then
---
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -62
deleted file mode 100644
index feb0754fff4..00000000000
@@ -1,62 +0,0 @@
-From 7107511fd209f08f9a96f8938041ae48f3295895 Mon Sep 17 00:00:00 2001
-From: Christopher Larson <[email protected]>
-Date: Tue, 15 Aug 2017 16:17:49 +0800
-Subject: [PATCH 07/11] Add configure argument to make the libxml2 dependency
- explicit and determinisitic.
-
-Upstream-Status: Pending
-
-Signed-off-by: Christopher Larson <[email protected]>
-
-Rebase to 4.3.6
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- configure.ac | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -642,6 +642,17 @@ if test "$have_nanosleep" = "rt"; then
-       LIBS="-lrt $LIBS"
- fi
-
-+AC_ARG_WITH(libxml2,
-+      AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
-+      with_libxml2="$withval", with_libxml2="no")
-+
-+if test x$with_libxml2 != xno; then
-+      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
-+              [if test x$with_libxml2 != xauto; then
-+                      AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
-+              fi])
-+fi
-+
- # check for /dev/random (declares HAVE_DEV_RANDOM)
- AC_MSG_CHECKING(for random device)
- AC_ARG_WITH(randomdev,
-Index: dhcp-4.4.1/configure.ac+lt
-===================================================================
---- dhcp-4.4.1.orig/configure.ac+lt
-+++ dhcp-4.4.1/configure.ac+lt
-@@ -909,6 +909,18 @@ elif test "$want_libtool" = "yes" -a "$u
- fi
- AM_CONDITIONAL(INSTALL_BIND, test "$want_install_bind" = "yes")
-
-+AC_ARG_WITH(libxml2,
-+      AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
-+      with_libxml2="$withval", with_libxml2="no")
-+
-+if test x$with_libxml2 != xno; then
-+      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
-+              [if test x$with_libxml2 != xauto; then
-+                      AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
-+              fi])
-+fi
-+
-+
- # OpenLDAP support.
- AC_ARG_WITH(ldap,
-     AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]),
meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch deleted +0 -28
deleted file mode 100644
index 912b6d6312c..00000000000
@@ -1,28 +0,0 @@
-From f3f8b7726e50e24ef3edf5fa5a17e31d39118d7e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-Date: Tue, 15 Aug 2017 15:49:31 +0800
-Subject: [PATCH 09/11] remove dhclient-script bash dependency
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andre McCurdy <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3122a75..1712d7d 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # dhclient-script for Linux. Dan Halbert, March, 1997.
- # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
- # No guarantees about this. I'm a novice at the details of Linux
---
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch deleted +0 -34
deleted file mode 100644
index 39ba65fbc46..00000000000
@@ -1,34 +0,0 @@
-From 501543b3ef715488a142e3d301ff2733aa33eec7 Mon Sep 17 00:00:00 2001
-From: Awais Belal <[email protected]>
-Date: Wed, 25 Oct 2017 21:00:05 +0500
-Subject: [PATCH] dhcp: correct the intention for xml2 lib search
-
-A missing case breaks the build when libxml2 is
-required and found appropriately. The third argument
-to the function AC_SEARCH_LIB is action-if-found which
-was mistakenly been used for the case where the library
-is not found and hence breaks the configure phase
-where it shoud actually pass.
-We now pass on silently when action-if-found is
-executed.
-
-Upstream-Status: Pending
-
-Signed-off-by: Awais Belal <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -647,7 +647,7 @@ AC_ARG_WITH(libxml2,
-       with_libxml2="$withval", with_libxml2="no")
-
- if test x$with_libxml2 != xno; then
--      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
-+      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
-               [if test x$with_libxml2 != xauto; then
-                       AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
-               fi])
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -64
deleted file mode 100644
index fcec010bd01..00000000000
@@ -1,64 +0,0 @@
-lib and include path is hardcoded for use_libbind
-
-use libdir and includedir vars
-
-Upstream-Status: Pending
-Signed-off-by: Armin Kuster <[email protected]>
-
-Index: dhcp-4.4.1/configure.ac+lt
-===================================================================
---- dhcp-4.4.1.orig/configure.ac+lt
-+++ dhcp-4.4.1/configure.ac+lt
-@@ -801,22 +801,22 @@ no)
-       if test ! -d "$use_libbind"; then
-               AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
-       fi
--      if test ! -d "$use_libbind/include" -o \
--              ! -f "$use_libbind/include/isc/buffer.h"
-+      if test ! -d "$use_libbind/$includedir" -o \
-+              ! -f "$use_libbind/$includedir/isc/buffer.h"
-       then
--              AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include])
-+              AC_MSG_ERROR([Cannot find bind includes at $use_libbind/$includedir])
-       fi
--      if test ! -d "$use_libbind/lib" -o \
--              \( ! -f "$use_libbind/lib/libisc.a" -a \
--                 ! -f "$use_libbind/lib/libisc.la" \)
-+      if test ! -d "$use_libbind/$libdir" -o \
-+              \( ! -f "$use_libbind/$libdir/libisc.a" -a \
-+                 ! -f "$use_libbind/$libdir/libisc.la" \)
-       then
--              AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
-+              AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/$libdir])
-       fi
-       BINDDIR="$use_libbind"
--      BINDLIBIRSDIR="$BINDDIR/lib"
--      BINDLIBDNSDIR="$BINDDIR/lib"
--      BINDLIBISCCFGDIR="$BINDDIR/lib"
--      BINDLIBISCDIR="$BINDDIR/lib"
-+      BINDLIBIRSDIR="$BINDDIR/$libdir"
-+      BINDLIBDNSDIR="$BINDDIR/$libdir"
-+      BINDLIBISCCFGDIR="$BINDDIR/$libdir"
-+      BINDLIBISCDIR="$BINDDIR/$libdir"
-       DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind"
-       ;;
- esac
-@@ -856,14 +856,14 @@ AC_ARG_ENABLE(libtool,
-
- if test "$use_libbind" != "no"; then
-       if test "$want_libtool" = "yes" -a \
--              ! -f "$use_libbind/lib/libisc.la"
-+              ! -f "$use_libbind/$libdir/libisc.la"
-       then
--              AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib])
-+              AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/$libdir])
-       fi
-       if test "$want_libtool" = "no" -a \
--              ! -f "$use_libbind/lib/libisc.a"
-+              ! -f "$use_libbind/$libdir/libisc.a"
-       then
--              AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib])
-+              AC_MSG_ERROR([Cannot find static libraries at $use_libbind/$libdir])
-       fi
- fi
-
meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -23
deleted file mode 100644
index cf4af826099..00000000000
@@ -1,23 +0,0 @@
-require dhcp.inc
-
-SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
-            file://0002-dhclient-dbus.patch \
-            file://0003-link-with-lcrypto.patch \
-            file://0004-Fix-out-of-tree-builds.patch \
-            file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \
-            file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \
-            file://0009-remove-dhclient-script-bash-dependency.patch \
-            file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
-            file://0013-fixup_use_libbind.patch \
-            file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \
-"
-
-SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
-SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
-
-LDFLAGS_append = " -pthread"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
-
-CFLAGS += "-fcommon"
meta/recipes-connectivity/dhcp/files/default-relay deleted +0 -12
deleted file mode 100644
index 7961f014bef..00000000000
@@ -1,12 +0,0 @@
-# Defaults for dhcp-relay initscript
-# sourced by /etc/init.d/dhcp-relay
-
-# What servers should the DHCP relay forward requests to?
-# e.g: SERVERS="192.168.0.1"
-SERVERS=""
-
-# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests?
-INTERFACES=""
-
-# Additional options that are passed to the DHCP relay daemon?
-OPTIONS=""
meta/recipes-connectivity/dhcp/files/default-server deleted +0 -7
deleted file mode 100644
index 0385d169922..00000000000
@@ -1,7 +0,0 @@
-# Defaults for dhcp initscript
-# sourced by /etc/init.d/dhcp-server
-# installed at /etc/default/dhcp-server by the maintainer scripts
-
-# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
-#       Separate multiple interfaces with spaces, e.g. "eth0 eth1".
-INTERFACES=""
meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper deleted +0 -39
deleted file mode 100644
index 7d0e224a1df..00000000000
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# In case the interface is used for nfs, skip it.
-nfsroot=0
-interfaces=""
-exec 9<&0 < /proc/mounts
-while read dev mtpt fstype rest; do
-    if test $mtpt = "/" ; then
-        case $fstype in
-            nfs | nfs4)
-                nfsroot=1
-                nfs_addr=`echo $rest | sed -e 's/^.*addr=\([0-9.]*\).*$/\1/'`
-                break
-                ;;
-            *)
-                ;;
-        esac
-    fi
-done
-exec 0<&9 9<&-
-
-if [ $nfsroot -eq 0 ]; then
-    interfaces="$INTERFACES"
-else
-    if [ -x /bin/ip -o -x /sbin/ip ] ; then
-       nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'`
-    fi
-    for i in $INTERFACES; do
-       if test "x$i" = "x$nfs_iface"; then
-            echo "dhclient skipping nfsroot interface $i"
-       else
-           interfaces="$interfaces $i"
-       fi
-    done
-fi
-
-if test "x$interfaces" != "x"; then
-    /sbin/dhclient -d -cf /etc/dhcp/dhclient.conf -q -lf /var/lib/dhcp/dhclient.leases $interfaces
-fi
meta/recipes-connectivity/dhcp/files/dhclient.conf deleted +0 -50
deleted file mode 100644
index 0e6dcf96c21..00000000000
@@ -1,50 +0,0 @@
-# Configuration file for /sbin/dhclient, which is included in Debian's
-#      dhcp3-client package.
-#
-# This is a sample configuration file for dhclient. See dhclient.conf's
-#      man page for more information about the syntax of this file
-#      and a more comprehensive list of the parameters understood by
-#      dhclient.
-#
-# Normally, if the DHCP server provides reasonable information and does
-#      not leave anything out (like the domain name, for example), then
-#      few changes must be made to this file, if any.
-#
-
-#send host-name "andare.fugue.com";
-#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
-#send dhcp-lease-time 3600;
-#supersede domain-name "fugue.com home.vix.com";
-#prepend domain-name-servers 127.0.0.1;
-request subnet-mask, broadcast-address, time-offset, routers,
-       domain-name, domain-name-servers, host-name,
-       netbios-name-servers, netbios-scope;
-#require subnet-mask, domain-name-servers;
-#timeout 60;
-#retry 60;
-#reboot 10;
-#select-timeout 5;
-#initial-interval 2;
-#script "/etc/dhcp3/dhclient-script";
-#media "-link0 -link1 -link2", "link0 link1";
-#reject 192.33.137.209;
-
-#alias {
-#  interface "eth0";
-#  fixed-address 192.5.5.213;
-#  option subnet-mask 255.255.255.255;
-#}
-
-#lease {
-#  interface "eth0";
-#  fixed-address 192.33.137.200;
-#  medium "link0 link1";
-#  option host-name "andare.swiftmedia.com";
-#  option subnet-mask 255.255.255.0;
-#  option broadcast-address 192.33.137.255;
-#  option routers 192.33.137.250;
-#  option domain-name-servers 127.0.0.1;
-#  renew 2 2000/1/12 00:00:01;
-#  rebind 2 2000/1/12 00:00:01;
-#  expire 2 2000/1/12 00:00:01;
-#}
meta/recipes-connectivity/dhcp/files/dhclient.service deleted +0 -13
deleted file mode 100644
index 9ddb4d1dfe9..00000000000
@@ -1,13 +0,0 @@
-[Unit]
-Description=Dynamic Host Configuration Protocol (DHCP)
-Wants=network.target
-Before=network.target
-After=systemd-udevd.service
-
-[Service]
-EnvironmentFile=-@SYSCONFDIR@/default/dhcp-client
-ExecStart=@BASE_SBINDIR@/dhclient-systemd-wrapper
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/dhcpd.conf deleted +0 -108
deleted file mode 100644
index 0001c0f00e2..00000000000
@@ -1,108 +0,0 @@
-#
-# Sample configuration file for ISC dhcpd for Debian
-#
-# $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
-#
-
-# The ddns-updates-style parameter controls whether or not the server will
-# attempt to do a DNS update when a lease is confirmed. We default to the
-# behavior of the version 2 packages ('none', since DHCP v2 didn't
-# have support for DDNS.)
-ddns-update-style none;
-
-# option definitions common to all supported networks...
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-# If this DHCP server is the official DHCP server for the local
-# network, the authoritative directive should be uncommented.
-#authoritative;
-
-# Use this to send dhcp log messages to a different log file (you also
-# have to hack syslog.conf to complete the redirection).
-log-facility local7;
-
-# No service will be given on this subnet, but declaring it helps the
-# DHCP server to understand the network topology.
-
-#subnet 10.152.187.0 netmask 255.255.255.0 {
-#}
-
-# This is a very basic subnet declaration.
-
-#subnet 10.254.239.0 netmask 255.255.255.224 {
-#  range 10.254.239.10 10.254.239.20;
-#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
-#}
-
-# This declaration allows BOOTP clients to get dynamic addresses,
-# which we don't really recommend.
-
-#subnet 10.254.239.32 netmask 255.255.255.224 {
-#  range dynamic-bootp 10.254.239.40 10.254.239.60;
-#  option broadcast-address 10.254.239.31;
-#  option routers rtr-239-32-1.example.org;
-#}
-
-# A slightly different configuration for an internal subnet.
-#subnet 10.5.5.0 netmask 255.255.255.224 {
-#  range 10.5.5.26 10.5.5.30;
-#  option domain-name-servers ns1.internal.example.org;
-#  option domain-name "internal.example.org";
-#  option routers 10.5.5.1;
-#  option broadcast-address 10.5.5.31;
-#  default-lease-time 600;
-#  max-lease-time 7200;
-#}
-
-# Hosts which require special configuration options can be listed in
-# host statements.   If no address is specified, the address will be
-# allocated dynamically (if possible), but the host-specific information
-# will still come from the host declaration.
-
-#host passacaglia {
-#  hardware ethernet 0:0:c0:5d:bd:95;
-#  filename "vmunix.passacaglia";
-#  server-name "toccata.fugue.com";
-#}
-
-# Fixed IP addresses can also be specified for hosts.   These addresses
-# should not also be listed as being available for dynamic assignment.
-# Hosts for which fixed IP addresses have been specified can boot using
-# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
-# be booted with DHCP, unless there is an address range on the subnet
-# to which a BOOTP client is connected which has the dynamic-bootp flag
-# set.
-#host fantasia {
-#  hardware ethernet 08:00:07:26:c0:a5;
-#  fixed-address fantasia.fugue.com;
-#}
-
-# You can declare a class of clients and then do address allocation
-# based on that.   The example below shows a case where all clients
-# in a certain class get addresses on the 10.17.224/24 subnet, and all
-# other clients get addresses on the 10.0.29/24 subnet.
-
-#class "foo" {
-#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
-#}
-
-#shared-network 224-29 {
-#  subnet 10.17.224.0 netmask 255.255.255.0 {
-#    option routers rtr-224.example.org;
-#  }
-#  subnet 10.0.29.0 netmask 255.255.255.0 {
-#    option routers rtr-29.example.org;
-#  }
-#  pool {
-#    allow members of "foo";
-#    range 10.17.224.10 10.17.224.250;
-#  }
-#  pool {
-#    deny members of "foo";
-#    range 10.0.29.10 10.0.29.230;
-#  }
-#}
meta/recipes-connectivity/dhcp/files/dhcpd.service deleted +0 -15
deleted file mode 100644
index ae4f93eca5b..00000000000
@@ -1,15 +0,0 @@
-[Unit]
-Description=DHCPv4 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-PIDFile=@localstatedir@/run/dhcpd.pid
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
-EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcp-server
-ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd.leases
-ExecStart=@SBINDIR@/dhcpd -f -cf @SYSCONFDIR@/dhcp/dhcpd.conf -pf @localstatedir@/run/dhcpd.pid $DHCPDARGS -q $INTERFACES
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/dhcpd6.service deleted +0 -15
deleted file mode 100644
index 52a6224dc2c..00000000000
@@ -1,15 +0,0 @@
-[Unit]
-Description=DHCPv6 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-PIDFile=@localstatedir@/run/dhcpd6.pid
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
-EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcpd6
-ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd6.leases
-ExecStart=@SBINDIR@/dhcpd -f -6 -cf @SYSCONFDIR@/dhcp/dhcpd6.conf -pf @localstatedir@/run/dhcpd6.pid $DHCPDARGS -q $INTERFACES
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/dhcrelay.service deleted +0 -10
deleted file mode 100644
index 15ff927d346..00000000000
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCP Relay Agent Daemon
-After=network.target
-
-[Service]
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay
-ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/init-relay deleted +0 -44
deleted file mode 100644
index 019a7e84cf4..00000000000
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $
-#
-
-# It is not safe to start if we don't have a default configuration...
-if [ ! -f /etc/default/dhcp-relay ]; then
-       echo "/etc/default/dhcp-relay does not exist! - Aborting..."
-       echo "create this file to fix the problem."
-       exit 1
-fi
-
-# Read init script configuration (interfaces the daemon should listen on
-# and the DHCP server we should forward requests to.)
-. /etc/default/dhcp-relay
-
-# Build command line for interfaces (will be passed to dhrelay below.)
-IFCMD=""
-if test "$INTERFACES" != ""; then
-       for I in $INTERFACES; do
-               IFCMD=${IFCMD}"-i "${I}" "
-       done
-fi
-
-DHCRELAYPID=/var/run/dhcrelay.pid
-
-case "$1" in
-       start)
-               start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS
-               ;;
-       stop)
-               start-stop-daemon -K -x /usr/sbin/dhcrelay
-               ;;
-       restart | force-reload)
-               $0 stop
-               sleep 2
-               $0 start
-               ;;
-       *)
-               echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}"
-               exit 1
-esac
-
-exit 0
meta/recipes-connectivity/dhcp/files/init-server deleted +0 -45
deleted file mode 100644
index 5e693adf785..00000000000
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
-#
-
-test -f /usr/sbin/dhcpd || exit 0
-
-# It is not safe to start if we don't have a default configuration...
-if [ ! -f /etc/default/dhcp-server ]; then
-       echo "/etc/default/dhcp-server does not exist! - Aborting..."
-       exit 0
-fi
-
-# Read init script configuration (so far only interfaces the daemon
-# should listen on.)
-. /etc/default/dhcp-server
-
-case "$1" in
-       start)
-               echo -n "Starting DHCP server: "
-               test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
-               test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
-               start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES -user dhcp -group dhcp
-               echo "."
-               ;;
-       stop)
-               echo -n "Stopping DHCP server: dhcpd3"
-               start-stop-daemon -K -x /usr/sbin/dhcpd
-               echo "."
-               ;;
-       restart | force-reload)
-               $0 stop
-               sleep 2
-               $0 start
-               if [ "$?" != "0" ]; then
-                       exit 1
-               fi
-               ;;
-       *)
-               echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}"
-               exit 1
-esac
-
-exit 0
--

2.17.1

#9 lore raw

Re: [OE-core] [PATCH 6/8] dhcp: remove from core

Quoted 11 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Khem Raj via lists.openembedded.org
Sent: 01 September 2020 19:11
To: akuster <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>
Subject: Re: [OE-core] [PATCH 6/8] dhcp: remove from core

Quoted 5 lines

it seems its used by
build-appliance-image and packagegroup-core-base-utils so you need to take care of that as well. in meta-networking networkmanager recipe depends on it too which I think I can take care.

Armin,
You added a new recipe for a dhcp client but what is the alternative for the dhcp server in oe-core?

Quoted 1,461 lines · akuster
Quoted 24 lines

update maintainers.inc too

---
 meta/conf/distro/include/maintainers.inc      |   1 -
 meta/recipes-connectivity/dhcp/dhcp.inc       | 149 ------------------
 ...TH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  27 ----
 ...-limitation-in-linux-dhclient-script.patch |  65 --------
 .../dhcp/dhcp/0002-dhclient-dbus.patch        | 117 --------------
 .../dhcp/dhcp/0003-link-with-lcrypto.patch    |  35 ----
 .../dhcp/0004-Fix-out-of-tree-builds.patch    |  95 -----------
 ...invoke-dhclient-script-failed-on-Rea.patch |  36 -----
 ...gument-to-make-the-libxml2-dependenc.patch |  62 --------
 ...move-dhclient-script-bash-dependency.patch |  28 ----
 ...ct-the-intention-for-xml2-lib-search.patch |  34 ----
 .../dhcp/dhcp/0013-fixup_use_libbind.patch    |  64 --------
 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb  |  23 ---
 .../dhcp/files/default-relay                  |  12 --
 .../dhcp/files/default-server                 |   7 -
 .../dhcp/files/dhclient-systemd-wrapper       |  39 -----
 .../dhcp/files/dhclient.conf                  |  50 ------
 .../dhcp/files/dhclient.service               |  13 --
 .../dhcp/files/dhcpd.conf                     | 108 -------------
Quoted 8 lines
 .../dhcp/files/dhcpd.service                  |  15 --
 .../dhcp/files/dhcpd6.service                 |  15 --
 .../dhcp/files/dhcrelay.service               |  10 --
 .../dhcp/files/init-relay                     |  44 ------
 .../dhcp/files/init-server                    |  44 ------
 24 files changed, 1093 deletions(-)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp.inc
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-define-

macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch

Quoted 1 line
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-

workaround-busybox-limitation-in-linux-dhclient-script.patch

Quoted 1 line
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-

dbus.patch

Quoted 1 line
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0003-link-with-

lcrypto.patch

Quoted 1 line
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-

tree-builds.patch

Quoted 1 line
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-

client-fix-invoke-dhclient-script-failed-on-Rea.patch

Quoted 1 line
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0007-Add-

configure-argument-to-make-the-libxml2-dependenc.patch

Quoted 1 line
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0009-remove-

dhclient-script-bash-dependency.patch

Quoted 1 line
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-

correct-the-intention-for-xml2-lib-search.patch

Quoted 1 line
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0013-

fixup_use_libbind.patch

Quoted 4 lines
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
 delete mode 100644 meta/recipes-connectivity/dhcp/files/default-relay
 delete mode 100644 meta/recipes-connectivity/dhcp/files/default-server
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient-

systemd-wrapper

Review

Quoted 10 lines
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.conf
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd.conf
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd6.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcrelay.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/init-relay
 delete mode 100644 meta/recipes-connectivity/dhcp/files/init-server
(quoted diff) +0 -0

b/meta/conf/distro/include/maintainers.inc

meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao

Quoted 4 lines

index 27e3474da8b..a55dbfa13c9 100644

meta/conf/distro/include/maintainers.inc +0 -0
@@ -143,7 +143,6 @@ RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao

<[email protected]>"

meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao · line 143

Quoted 1 line
meta/conf/distro/include/maintainers.inc +0 -0
 RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi

<[email protected]>"

meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao · line 144

Quoted 1 line
meta/conf/distro/include/maintainers.inc +0 -0
 RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Unassigned

<[email protected]>"

meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao · line 145

Quoted 1 line
meta/conf/distro/include/maintainers.inc +0 -0
 RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin

<[email protected]>"

meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao <[email protected]>"

Quoted 3 lines
meta/conf/distro/include/maintainers.inc +0 -1
-RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-dhcpd = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt

<[email protected]>"

meta/recipes-

Quoted 2 lines
meta/conf/distro/include/maintainers.inc +0 -0
 RECIPE_MAINTAINER_pn-diffstat = "Chen Qi <[email protected]>"
meta/recipes- renamed from meta/recipes-connectivity/dhcp/dhcp.inc +0 -0

connectivity/dhcp/dhcp.inc

Quoted 6 lines

deleted file mode 100644
index d46130d49b9..00000000000

meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
@@ -1,149 +0,0 @@
-SECTION = "console/network"

meta/recipes-connectivity/dhcp/dhcp.inc line 11

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -10
-SUMMARY = "Internet Software Consortium DHCP package"
-DESCRIPTION = "DHCP (Dynamic Host Configuration Protocol) is a protocol \
-which allows individual devices on an IP network to get their own \
-network configuration information from a server.  DHCP helps make it \
-easier to administer devices."
-
-HOMEPAGE = "http://www.isc.org/"
-
-LICENSE = "ISC"
-LIC_FILES_CHKSUM =

"file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"

Quoted 9 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -9
-
-DEPENDS = "openssl bind"
-
-SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
-           file://init-relay file://default-relay \
-           file://init-server file://default-server \
-           file://dhclient.conf file://dhcpd.conf \
-           file://dhclient-systemd-wrapper \
-           file://dhclient.service \

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -10
-           file://dhcpd.service file://dhcrelay.service \
-           file://dhcpd6.service \
-           "
-UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
-
-inherit autotools-brokensep systemd useradd update-rc.d
-
-USERADD_PACKAGES = "${PN}-server"
-USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir

/var/run/${BPN} --shell /bin/false --user-group ${BPN}"

Quoted 7 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -7
-
-SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay ${PN}-client"
-SYSTEMD_SERVICE_${PN}-server = "dhcpd.service dhcpd6.service"
-SYSTEMD_AUTO_ENABLE_${PN}-server = "disable"
-
-SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service"
-SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable"

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -10
-
-SYSTEMD_SERVICE_${PN}-client = "dhclient.service"
-SYSTEMD_AUTO_ENABLE_${PN}-client = "disable"
-
-INITSCRIPT_PACKAGES = "dhcp-server"
-INITSCRIPT_NAME_dhcp-server = "dhcp-server"
-INITSCRIPT_PARAMS_dhcp-server = "defaults"
-
-CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--with-srv-lease-

file=${localstatedir}/lib/dhcp/dhcpd.leases \

Quoted 9 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -9
-                --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
-                --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
-                --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
-                --enable-paranoia --disable-static \
-                --with-randomdev=/dev/random \
-                --with-libbind=${STAGING_DIR_HOST} \
-               --enable-libtool \
-               "
-

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -10
-#Enable shared libs per dhcp README
-do_configure_prepend () {
-       cp configure.ac+lt configure.ac
-}
-
-do_install_append () {
-       install -d ${D}${sysconfdir}/init.d
-       install -d ${D}${sysconfdir}/default
-       install -d ${D}${sysconfdir}/dhcp
-       install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-

relay

meta/recipes-connectivity/dhcp/dhcp.inc line 67

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       install -m 0644 ${WORKDIR}/default-relay

${D}${sysconfdir}/default/dhcp-relay

meta/recipes-connectivity/dhcp/dhcp.inc line 68

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-

server

meta/recipes-connectivity/dhcp/dhcp.inc line 69

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       install -m 0644 ${WORKDIR}/default-server

${D}${sysconfdir}/default/dhcp-server

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 4 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -4
-
-       rm -f ${D}${sysconfdir}/dhclient.conf*
-       rm -f ${D}${sysconfdir}/dhcpd.conf*
-       install -m 0644 ${WORKDIR}/dhclient.conf

${D}${sysconfdir}/dhcp/dhclient.conf

meta/recipes-connectivity/dhcp/dhcp.inc line 74

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       install -m 0644 ${WORKDIR}/dhcpd.conf

${D}${sysconfdir}/dhcp/dhcpd.conf

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -6
-
-       install -d ${D}${base_sbindir}/
-       if [ "${sbindir}" != "${base_sbindir}" ]; then
-               mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
-       fi
-       install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-

script

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 4 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -4
-
-       # Install systemd unit files
-       install -d ${D}${systemd_unitdir}/system
-       install -m 0644 ${WORKDIR}/dhcpd.service

${D}${systemd_unitdir}/system

meta/recipes-connectivity/dhcp/dhcp.inc line 85

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       install -m 0644 ${WORKDIR}/dhcpd6.service

${D}${systemd_unitdir}/system

meta/recipes-connectivity/dhcp/dhcp.inc line 86

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       install -m 0644 ${WORKDIR}/dhcrelay.service

${D}${systemd_unitdir}/system

meta/recipes-connectivity/dhcp/dhcp.inc line 87

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       sed -i -e 's,@SBINDIR@,${sbindir},g'

${D}${systemd_unitdir}/system/dhcpd*.service
${D}${systemd_unitdir}/system/dhcrelay.service

meta/recipes-connectivity/dhcp/dhcp.inc line 88

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g'

${D}${systemd_unitdir}/system/dhcpd*.service

meta/recipes-connectivity/dhcp/dhcp.inc line 89

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       sed -i -e 's,@base_bindir@,${base_bindir},g'

${D}${systemd_unitdir}/system/dhcpd*.service

meta/recipes-connectivity/dhcp/dhcp.inc line 90

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       sed -i -e 's,@localstatedir@,${localstatedir},g'

${D}${systemd_unitdir}/system/dhcpd*.service

meta/recipes-connectivity/dhcp/dhcp.inc line 91

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g'

${D}${systemd_unitdir}/system/dhcrelay.service

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 3 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -3
-
-       install -d ${D}${base_sbindir}
-       install -m 0755 ${WORKDIR}/dhclient-systemd-wrapper

${D}${base_sbindir}/dhclient-systemd-wrapper

meta/recipes-connectivity/dhcp/dhcp.inc line 95

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       install -m 0644 ${WORKDIR}/dhclient.service

${D}${systemd_unitdir}/system

meta/recipes-connectivity/dhcp/dhcp.inc line 96

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g'

${D}${systemd_unitdir}/system/dhclient.service

meta/recipes-connectivity/dhcp/dhcp.inc line 97

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -1
-       sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g'

${D}${systemd_unitdir}/system/dhclient.service

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 3 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -3
-}
-
-PACKAGES += "dhcp-libs dhcp-server dhcp-server-config dhcp-client dhcp-

relay dhcp-omshell"

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 3 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -3
-
-PACKAGES_remove = "${PN}"
-RDEPENDS_${PN}-client += "${@bb.utils.contains('DISTRO_FEATURES',

'systemd', 'iproute2', '', d)}"

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 3 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -3
-RDEPENDS_${PN}-dev = ""
-RDEPENDS_${PN}-staticdev = ""
-FILES_${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0*

${libdir}/libdhcp.so.0*"

meta/recipes-connectivity/dhcp/dhcp.inc

Quoted 5 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -5
-
-FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
-RRECOMMENDS_${PN}-server = "dhcp-server-config"
-
-FILES_${PN}-server-config = "${sysconfdir}/default/dhcp-server

${sysconfdir}/dhcp/dhcpd.conf"

meta/recipes-connectivity/dhcp/dhcp.inc line 113

Quoted 2 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -2
-
-FILES_${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay

${sysconfdir}/default/dhcp-relay"

Review

Quoted 37 lines
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -36
-
-FILES_${PN}-client = "${base_sbindir}/dhclient \
-                      ${base_sbindir}/dhclient-script \
-                      ${sysconfdir}/dhcp/dhclient.conf \
-                      ${base_sbindir}/dhclient-systemd-wrapper \
-                     "
-
-FILES_${PN}-omshell = "${bindir}/omshell"
-
-pkg_postinst_dhcp-server() {
-    mkdir -p $D/${localstatedir}/lib/dhcp
-    touch $D/${localstatedir}/lib/dhcp/dhcpd.leases
-    touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases
-}
-
-pkg_postinst_dhcp-client() {
-    mkdir -p $D/${localstatedir}/lib/dhcp
-}
-
-pkg_postrm_dhcp-server() {
-    rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
-    rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
-
-    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
-        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
-    fi
-}
-
-pkg_postrm_dhcp-client() {
-    rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
-    rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
-
-    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
-        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
-    fi
-}
(quoted diff) +0 -0

_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/meta/recipes- connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and- _PATH_DHCLIENT_CON.patch

Quoted 3 lines

deleted file mode 100644
index d1b57f0bb41..00000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-

_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,27 +0,0 @@
-From 7cc29144535a622fc671dc86eb1da65b0473a7c4 Mon Sep 17 00:00:00

2001

meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch

Quoted 3 lines
meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch deleted +0 -3
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 16:14:22 +0800
-Subject: [PATCH 01/11] define macro _PATH_DHCPD_CONF and

_PATH_DHCLIENT_CONF

meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch line 21

Quoted 11 lines
meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch deleted +0 -11
-
-Upstream-Status: Inappropriate [OE specific]
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- includes/site.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/includes/site.h
-

================================================================
===

Review

Quoted 13 lines
meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch deleted +0 -12
---- dhcp-4.4.1.orig/includes/site.h
-+++ dhcp-4.4.1/includes/site.h
-@@ -148,7 +148,8 @@
- /* Define this if you want the dhcpd.conf file to go somewhere other than
-    the default location.   By default, it goes in /etc/dhcpd.conf. */
-
--/* #define _PATH_DHCPD_CONF   "/etc/dhcpd.conf" */
-+#define _PATH_DHCPD_CONF      "/etc/dhcp/dhcpd.conf"
-+#define _PATH_DHCLIENT_CONF   "/etc/dhcp/dhclient.conf"
-
- /* Network API definitions.   You do not need to choose one of these - if
-    you don't choose, one will be chosen for you in your system's config
(quoted diff) +0 -0

busybox-limitation-in-linux-dhclient-script.patch b/meta/recipes- connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux- dhclient-script.patch

Quoted 3 lines

deleted file mode 100644
index 2359381b938..00000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-

limitation-in-linux-dhclient-script.patch

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,65 +0,0 @@
-From eec0503cfc36f63d777f5cb3f2719cecedcb8468 Mon Sep 17 00:00:00

2001

Review

Quoted 65 lines
meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch deleted +0 -64
-From: Haris Okanovic <[email protected]>
-Date: Mon, 7 Jan 2019 13:22:09 -0600
-Subject: [PATCH] Workaround busybox limitation in Linux dhclient-script
-
-Busybox is a lightweight implementation of coreutils commonly used on
-space-constrained embedded Linux distributions. It's implementation of
-chown and chmod doesn't provide a "--reference" option added to
-client/scripts/linux as of commit 9261cb14. This change works around
-that limitation by using stat to read ownership and permissions flags
-and simple chown/chmod calls supported in both coreutils and busybox.
-
-    modified:   client/scripts/linux
-
-Signed-off-by: Haris Okanovic <[email protected]>
-Upstream-Status: Pending [ISC-Bugs #48771]
----
- client/scripts/linux | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 0c429697..2435a44b 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -32,6 +32,17 @@
- # if your system holds ip tool in a non-standard location.
- ip=/sbin/ip
-
-+chown_chmod_by_reference() {
-+    local reference_file="$1"
-+    local target_file="$2"
-+
-+    local owner=$(stat -c "%u:%g" "$reference_file")
-+    local perm=$(stat -c "%a" "$reference_file")
-+
-+    chown "$owner" "$target_file"
-+    chmod "$perm" "$target_file"
-+}
-+
- # update /etc/resolv.conf based on received values
- # This updated version mostly follows Debian script by Andrew Pollock et al.
- make_resolv_conf() {
-@@ -74,8 +85,7 @@ make_resolv_conf() {
-         fi
-
-       if [ -f /etc/resolv.conf ]; then
--          chown --reference=/etc/resolv.conf $new_resolv_conf
--          chmod --reference=/etc/resolv.conf $new_resolv_conf
-+          chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf
-       fi
-         mv -f $new_resolv_conf /etc/resolv.conf
-     # DHCPv6
-@@ -101,8 +111,7 @@ make_resolv_conf() {
-         fi
-
-       if [ -f /etc/resolv.conf ]; then
--            chown --reference=/etc/resolv.conf $new_resolv_conf
--            chmod --reference=/etc/resolv.conf $new_resolv_conf
-+          chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf
-       fi
-         mv -f $new_resolv_conf /etc/resolv.conf
-     fi
---
-2.20.0
-
(quoted diff) +0 -0

b/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch line 1

Quoted 6 lines

deleted file mode 100644
index 101c33f677a..00000000000

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -1
@@ -1,117 +0,0 @@
-From be7540d31c356e80ee02e90e8bf162b7ac6e5ba5 Mon Sep 17 00:00:00

2001

Quoted 18 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -18
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 14:56:56 +0800
-Subject: [PATCH 02/11] dhclient dbus
-
-Upstream-Status: Inappropriate [distribution]
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/bsdos   | 5 +++++
- client/scripts/freebsd | 5 +++++
- client/scripts/linux   | 5 +++++
- client/scripts/netbsd  | 5 +++++
- client/scripts/openbsd | 5 +++++
- client/scripts/solaris | 5 +++++
- 6 files changed, 30 insertions(+)
-
-diff --git a/client/scripts/bsdos b/client/scripts/bsdos

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -10
-index d69d0d8..095b143 100755
---- a/client/scripts/bsdos
-+++ b/client/scripts/bsdos
-@@ -45,6 +45,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set

\

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -6
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/freebsd b/client/scripts/freebsd

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -10
-index 8f3e2a2..ad7fb44 100755
---- a/client/scripts/freebsd
-+++ b/client/scripts/freebsd
-@@ -89,6 +89,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set

\

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -6
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/linux b/client/scripts/linux

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -10
-index 5fb1612..3d447b6 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -174,6 +174,11 @@ exit_with_hooks() {
-         exit_status=$?
-     fi
-
-+    if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+        dbus-send --system --dest=com.redhat.dhcp \
-+           --type=method_call /com/redhat/dhcp/$interface

com.redhat.dhcp.set \

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -6
-+           'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+    fi
-     exit $exit_status
- }
-
-diff --git a/client/scripts/netbsd b/client/scripts/netbsd

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -10
-index 07383b7..aaba8e8 100755
---- a/client/scripts/netbsd
-+++ b/client/scripts/netbsd
-@@ -45,6 +45,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set

\

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -6
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/openbsd b/client/scripts/openbsd

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -10
-index e7f4746..56b980c 100644
---- a/client/scripts/openbsd
-+++ b/client/scripts/openbsd
-@@ -45,6 +45,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set

\

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -6
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/solaris b/client/scripts/solaris

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -10
-index af553b9..4a2aa69 100755
---- a/client/scripts/solaris
-+++ b/client/scripts/solaris
-@@ -26,6 +26,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set

\

Review

Quoted 9 lines
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -8
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
---
-1.8.3.1
-
(quoted diff) +0 -0

lcrypto.patch b/meta/recipes-connectivity/dhcp/dhcp/0003-link-with- lcrypto.patch

meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch line 1

Quoted 6 lines

deleted file mode 100644
index 5b35933a54a..00000000000

meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch deleted +0 -1
@@ -1,35 +0,0 @@
-From d80bd792323dbd56269309f85b4506eb6b1b60e9 Mon Sep 17

00:00:00 2001

Quoted 11 lines
meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch deleted +0 -11
-From: Andrei Gherzan <[email protected]>
-Date: Tue, 15 Aug 2017 15:05:47 +0800
-Subject: [PATCH 03/11] link with lcrypto
-
-From 4.2.0 final release, -lcrypto check was removed and we compile
-static libraries
-from bind that are linked to libcrypto. This is why i added a patch in
-order to add
--lcrypto to LIBS.
-
-Upstream-Status: Pending

meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch line 28

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch deleted +0 -10
-Signed-off-by: Andrei Gherzan <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: dhcp-4.4.1/configure.ac
-

================================================================
===

Review

Quoted 14 lines
meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch deleted +0 -13
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -612,6 +612,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
- # Look for optional headers.
- AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
-
-+# find an MD5 library
-+AC_SEARCH_LIBS(MD5_Init, [crypto])
-+AC_SEARCH_LIBS(MD5Init, [crypto])
-+
- # Solaris needs some libraries for functions
- AC_SEARCH_LIBS(socket, [socket])
- AC_SEARCH_LIBS(inet_ntoa, [nsl])
(quoted diff) +0 -0

builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree- builds.patch

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch line 1

Quoted 6 lines

deleted file mode 100644
index 7b57730ffb7..00000000000

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -1
@@ -1,95 +0,0 @@
-From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00

2001

Quoted 12 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -12
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 15:08:22 +0800
-Subject: [PATCH 04/11] Fix out of tree builds
-
-Upstream-Status: Pending
-
-RP 2013/03/21
-
-Rebase to 4.3.6
-
-Signed-off-by: Hongxu Jia <[email protected]>
----

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch line 31

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -10
- client/Makefile.am  | 4 ++--
- common/Makefile.am  | 3 ++-
- dhcpctl/Makefile.am | 2 ++
- omapip/Makefile.am  | 1 +
- relay/Makefile.am   | 2 +-
- server/Makefile.am  | 2 +-
- 6 files changed, 9 insertions(+), 5 deletions(-)
-
-Index: dhcp-4.4.1/common/Makefile.am
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch

Quoted 5 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -5
---- dhcp-4.4.1.orig/common/Makefile.am
-+++ dhcp-4.4.1/common/Makefile.am
-@@ -1,4 +1,5 @@
--AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -

DLOCALSTATEDIR='"@localstatedir@"'

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch line 40

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -6
-+
- AM_CFLAGS = $(LDAP_CFLAGS)
-
- lib_LIBRARIES = libdhcp.a
-Index: dhcp-4.4.1/dhcpctl/Makefile.am
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch line 53

Quoted 13 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -13
---- dhcp-4.4.1.orig/dhcpctl/Makefile.am
-+++ dhcp-4.4.1/dhcpctl/Makefile.am
-@@ -3,6 +3,8 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@
- BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
- BINDLIBISCDIR=@BINDLIBISCDIR@
-
-+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
-+
- bin_PROGRAMS = omshell
- lib_LIBRARIES = libdhcpctl.a
- noinst_PROGRAMS = cltest
-Index: dhcp-4.4.1/server/Makefile.am
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch

Quoted 8 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -8
---- dhcp-4.4.1.orig/server/Makefile.am
-+++ dhcp-4.4.1/server/Makefile.am
-@@ -4,7 +4,7 @@
- # production code. Sadly, we are not there yet.
- SUBDIRS = . tests
-
--AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -

I$(top_srcdir)/includes

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch line 65

Quoted 5 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -5
-
- dist_sysconf_DATA = dhcpd.conf.example
- sbin_PROGRAMS = dhcpd
-Index: dhcp-4.4.1/client/Makefile.am
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -6
---- dhcp-4.4.1.orig/client/Makefile.am
-+++ dhcp-4.4.1/client/Makefile.am
-@@ -5,7 +5,7 @@
- SUBDIRS = . tests
-
- AM_CPPFLAGS = -

DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"'

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch line 68

Quoted 2 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -2
--AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"'
-+AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -

I$(top_srcdir)/includes

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch line 81

Quoted 5 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -5
-
- dist_sysconf_DATA = dhclient.conf.example
- sbin_PROGRAMS = dhclient
-Index: dhcp-4.4.1/omapip/Makefile.am
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch line 90

Quoted 12 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -12
---- dhcp-4.4.1.orig/omapip/Makefile.am
-+++ dhcp-4.4.1/omapip/Makefile.am
-@@ -2,6 +2,7 @@ BINDLIBIRSDIR=@BINDLIBIRSDIR@
- BINDLIBDNSDIR=@BINDLIBDNSDIR@
- BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
- BINDLIBISCDIR=@BINDLIBISCDIR@
-+AM_CPPFLAGS = -I$(top_srcdir)/includes
-
- lib_LIBRARIES = libomapi.a
- noinst_PROGRAMS = svtest
-Index: dhcp-4.4.1/relay/Makefile.am
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch

Quoted 7 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -7
---- dhcp-4.4.1.orig/relay/Makefile.am
-+++ dhcp-4.4.1/relay/Makefile.am
-@@ -1,6 +1,6 @@
- SUBDIRS = . tests
-
--AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -

I$(top_srcdir)/includes

Review

Quoted 4 lines
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -3
-
- sbin_PROGRAMS = dhcrelay
- dhcrelay_SOURCES = dhcrelay.c
(quoted diff) +0 -0

invoke-dhclient-script-failed-on-Rea.patch b/meta/recipes- connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on- Rea.patch

Quoted 3 lines

deleted file mode 100644
index dd56381b1dc..00000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-

dhclient-script-failed-on-Rea.patch

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,36 +0,0 @@
-From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00

2001

Review

Quoted 36 lines
meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch deleted +0 -35
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 15:24:14 +0800
-Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on
- Read-only file system
-
-In read-only file system, '/etc' is on the readonly partition,
-and '/etc/resolv.conf' is symlinked to a separate writable
-partition.
-
-In this situation, we create temp files 'resolv.conf.dhclient-new'
-in /tmp dir.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3d447b6..3122a75 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -40,7 +40,7 @@ make_resolv_conf() {
-     # DHCPv4
-     if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
-        [ -n "$new_domain_name_servers" ]; then
--        new_resolv_conf=/etc/resolv.conf.dhclient-new
-+        new_resolv_conf=/tmp/resolv.conf.dhclient-new
-         rm -f $new_resolv_conf
-
-         if [ -n "$new_domain_name" ]; then
---
-1.8.3.1
-
(quoted diff) +0 -0

argument-to-make-the-libxml2-dependenc.patch b/meta/recipes- connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2- dependenc.patch

Quoted 3 lines

deleted file mode 100644
index feb0754fff4..00000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-

to-make-the-libxml2-dependenc.patch

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,62 +0,0 @@
-From 7107511fd209f08f9a96f8938041ae48f3295895 Mon Sep 17 00:00:00

2001

meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch

Quoted 3 lines
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -3
-From: Christopher Larson <[email protected]>
-Date: Tue, 15 Aug 2017 16:17:49 +0800
-Subject: [PATCH 07/11] Add configure argument to make the libxml2

dependency

Quoted 5 lines
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -5
- explicit and determinisitic.
-
-Upstream-Status: Pending
-
-Signed-off-by: Christopher Larson <[email protected]>

meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch line 25

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -10
-
-Rebase to 4.3.6
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- configure.ac | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-Index: dhcp-4.4.1/configure.ac
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch

Quoted 8 lines
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -8
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -642,6 +642,17 @@ if test "$have_nanosleep" = "rt"; then
-       LIBS="-lrt $LIBS"
- fi
-
-+AC_ARG_WITH(libxml2,
-+      AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if

bind was built with xml2 support enabled]),

meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -6
-+      with_libxml2="$withval", with_libxml2="no")
-+
-+if test x$with_libxml2 != xno; then
-+      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
-+              [if test x$with_libxml2 != xauto; then
-+                      AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement

with -lxml2 and libxml2 was requested])

meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch line 47

Quoted 8 lines
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -8
-+              fi])
-+fi
-+
- # check for /dev/random (declares HAVE_DEV_RANDOM)
- AC_MSG_CHECKING(for random device)
- AC_ARG_WITH(randomdev,
-Index: dhcp-4.4.1/configure.ac+lt
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch

Quoted 8 lines
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -8
---- dhcp-4.4.1.orig/configure.ac+lt
-+++ dhcp-4.4.1/configure.ac+lt
-@@ -909,6 +909,18 @@ elif test "$want_libtool" = "yes" -a "$u
- fi
- AM_CONDITIONAL(INSTALL_BIND, test "$want_install_bind" = "yes")
-
-+AC_ARG_WITH(libxml2,
-+      AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if

bind was built with xml2 support enabled]),

meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch

Quoted 6 lines
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -6
-+      with_libxml2="$withval", with_libxml2="no")
-+
-+if test x$with_libxml2 != xno; then
-+      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
-+              [if test x$with_libxml2 != xauto; then
-+                      AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement

with -lxml2 and libxml2 was requested])

meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch

Quoted 7 lines
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -7
-+              fi])
-+fi
-+
-+
- # OpenLDAP support.
- AC_ARG_WITH(ldap,
-     AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd

(default is no)]),

Review

Quoted 1 line
(quoted diff) +0 -0

script-bash-dependency.patch b/meta/recipes-connectivity/dhcp/dhcp/0009- remove-dhclient-script-bash-dependency.patch

Quoted 3 lines

deleted file mode 100644
index 912b6d6312c..00000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-

bash-dependency.patch

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,28 +0,0 @@
-From f3f8b7726e50e24ef3edf5fa5a17e31d39118d7e Mon Sep 17 00:00:00

2001

Review

Quoted 28 lines
meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch deleted +0 -27
-From: Andre McCurdy <[email protected]>
-Date: Tue, 15 Aug 2017 15:49:31 +0800
-Subject: [PATCH 09/11] remove dhclient-script bash dependency
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andre McCurdy <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3122a75..1712d7d 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # dhclient-script for Linux. Dan Halbert, March, 1997.
- # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
- # No guarantees about this. I'm a novice at the details of Linux
---
-1.8.3.1
-
(quoted diff) +0 -0

intention-for-xml2-lib-search.patch b/meta/recipes- connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib- search.patch

Quoted 3 lines

deleted file mode 100644
index 39ba65fbc46..00000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-

for-xml2-lib-search.patch

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,34 +0,0 @@
-From 501543b3ef715488a142e3d301ff2733aa33eec7 Mon Sep 17 00:00:00

2001

Quoted 12 lines
meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch deleted +0 -12
-From: Awais Belal <[email protected]>
-Date: Wed, 25 Oct 2017 21:00:05 +0500
-Subject: [PATCH] dhcp: correct the intention for xml2 lib search
-
-A missing case breaks the build when libxml2 is
-required and found appropriately. The third argument
-to the function AC_SEARCH_LIB is action-if-found which
-was mistakenly been used for the case where the library
-is not found and hence breaks the configure phase
-where it shoud actually pass.
-We now pass on silently when action-if-found is
-executed.

meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch line 28

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch deleted +0 -10
-
-Upstream-Status: Pending
-
-Signed-off-by: Awais Belal <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/configure.ac
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch deleted +0 -10
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -647,7 +647,7 @@ AC_ARG_WITH(libxml2,
-       with_libxml2="$withval", with_libxml2="no")
-
- if test x$with_libxml2 != xno; then
--      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
-+      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
-               [if test x$with_libxml2 != xauto; then
-                       AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement

with -lxml2 and libxml2 was requested])

Review

Quoted 2 lines
meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch deleted +0 -1
-               fi])
(quoted diff) +0 -0

fixup_use_libbind.patch b/meta/recipes-connectivity/dhcp/dhcp/0013- fixup_use_libbind.patch

Quoted 5 lines

deleted file mode 100644
index fcec010bd01..00000000000

meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch line 9

Quoted 9 lines
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -9
@@ -1,64 +0,0 @@
-lib and include path is hardcoded for use_libbind
-
-use libdir and includedir vars
-
-Upstream-Status: Pending
-Signed-off-by: Armin Kuster <[email protected]>
-
-Index: dhcp-4.4.1/configure.ac+lt
-

================================================================
===

meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch

Quoted 12 lines
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -12
---- dhcp-4.4.1.orig/configure.ac+lt
-+++ dhcp-4.4.1/configure.ac+lt
-@@ -801,22 +801,22 @@ no)
-       if test ! -d "$use_libbind"; then
-               AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
-       fi
--      if test ! -d "$use_libbind/include" -o \
--              ! -f "$use_libbind/include/isc/buffer.h"
-+      if test ! -d "$use_libbind/$includedir" -o \
-+              ! -f "$use_libbind/$includedir/isc/buffer.h"
-       then
--              AC_MSG_ERROR([Cannot find bind includes at

$use_libbind/include])

meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch line 22

Quoted 1 line
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -1
-+              AC_MSG_ERROR([Cannot find bind includes at

$use_libbind/$includedir])

Quoted 22 lines
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -22
-       fi
--      if test ! -d "$use_libbind/lib" -o \
--              \( ! -f "$use_libbind/lib/libisc.a" -a \
--                 ! -f "$use_libbind/lib/libisc.la" \)
-+      if test ! -d "$use_libbind/$libdir" -o \
-+              \( ! -f "$use_libbind/$libdir/libisc.a" -a \
-+                 ! -f "$use_libbind/$libdir/libisc.la" \)
-       then
--              AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
-+              AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/$libdir])
-       fi
-       BINDDIR="$use_libbind"
--      BINDLIBIRSDIR="$BINDDIR/lib"
--      BINDLIBDNSDIR="$BINDDIR/lib"
--      BINDLIBISCCFGDIR="$BINDDIR/lib"
--      BINDLIBISCDIR="$BINDDIR/lib"
-+      BINDLIBIRSDIR="$BINDDIR/$libdir"
-+      BINDLIBDNSDIR="$BINDDIR/$libdir"
-+      BINDLIBISCCFGDIR="$BINDDIR/$libdir"
-+      BINDLIBISCDIR="$BINDDIR/$libdir"
-       DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind"
-       ;;

meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch

Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -10
- esac
-@@ -856,14 +856,14 @@ AC_ARG_ENABLE(libtool,
-
- if test "$use_libbind" != "no"; then
-       if test "$want_libtool" = "yes" -a \
--              ! -f "$use_libbind/lib/libisc.la"
-+              ! -f "$use_libbind/$libdir/libisc.la"
-       then
--              AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib])
-+              AC_MSG_ERROR([Cannot find dynamic libraries at

$use_libbind/$libdir])

meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch

Quoted 7 lines
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -7
-       fi
-       if test "$want_libtool" = "no" -a \
--              ! -f "$use_libbind/lib/libisc.a"
-+              ! -f "$use_libbind/$libdir/libisc.a"
-       then
--              AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib])
-+              AC_MSG_ERROR([Cannot find static libraries at

$use_libbind/$libdir])

meta/recipes-

Quoted 4 lines
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -3
-       fi
- fi
-
meta/recipes- renamed from meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb +0 -0

connectivity/dhcp/dhcp_4.4.2.bb

meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb line 3

Quoted 8 lines

deleted file mode 100644
index cf4af826099..00000000000

meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -3
@@ -1,23 +0,0 @@
-require dhcp.inc
-
-SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-

_PATH_DHCLIENT_CON.patch \

meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb

Quoted 5 lines
meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -5
-            file://0002-dhclient-dbus.patch \
-            file://0003-link-with-lcrypto.patch \
-            file://0004-Fix-out-of-tree-builds.patch \
-            file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \
-            file://0007-Add-configure-argument-to-make-the-libxml2-

dependenc.patch \

meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb

Quoted 4 lines
meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -4
-            file://0009-remove-dhclient-script-bash-dependency.patch \
-            file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
-            file://0013-fixup_use_libbind.patch \
-            file://0001-workaround-busybox-limitation-in-linux-dhclient-

script.patch \

meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb

Quoted 4 lines
meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -4
-"
-
-SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
-SRC_URI[sha256sum] =

"1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"

meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb

Quoted 5 lines
meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -5
-
-LDFLAGS_append = " -pthread"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-

libxml2,libxml2"

Review

Quoted 3 lines
meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -2
-
-CFLAGS += "-fcommon"
(quoted diff) +0 -0

b/meta/recipes-connectivity/dhcp/files/default-relay

Review

Quoted 18 lines

deleted file mode 100644
index 7961f014bef..00000000000

meta/recipes-connectivity/dhcp/files/default-relay deleted +0 -12
@@ -1,12 +0,0 @@
-# Defaults for dhcp-relay initscript
-# sourced by /etc/init.d/dhcp-relay
-
-# What servers should the DHCP relay forward requests to?
-# e.g: SERVERS="192.168.0.1"
-SERVERS=""
-
-# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests?
-INTERFACES=""
-
-# Additional options that are passed to the DHCP relay daemon?
-OPTIONS=""
(quoted diff) +0 -0

b/meta/recipes-connectivity/dhcp/files/default-server

Review

Quoted 13 lines

deleted file mode 100644
index 0385d169922..00000000000

meta/recipes-connectivity/dhcp/files/default-server deleted +0 -7
@@ -1,7 +0,0 @@
-# Defaults for dhcp initscript
-# sourced by /etc/init.d/dhcp-server
-# installed at /etc/default/dhcp-server by the maintainer scripts
-
-# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
-#       Separate multiple interfaces with spaces, e.g. "eth0 eth1".
-INTERFACES=""
(quoted diff) +0 -0

b/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper

Quoted 21 lines

deleted file mode 100644
index 7d0e224a1df..00000000000

meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper deleted +0 -16
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# In case the interface is used for nfs, skip it.
-nfsroot=0
-interfaces=""
-exec 9<&0 < /proc/mounts
-while read dev mtpt fstype rest; do
-    if test $mtpt = "/" ; then
-        case $fstype in
-            nfs | nfs4)
-                nfsroot=1
-                nfs_addr=`echo $rest | sed -e 's/^.*addr=\([0-9.]*\).*$/\1/'`
-                break
-                ;;
-            *)
-                ;;

meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper line 26

Quoted 10 lines
meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper deleted +0 -10
-        esac
-    fi
-done
-exec 0<&9 9<&-
-
-if [ $nfsroot -eq 0 ]; then
-    interfaces="$INTERFACES"
-else
-    if [ -x /bin/ip -o -x /sbin/ip ] ; then
-       nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-

9.]*\).*$/\1/'`

meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper

Quoted 12 lines
meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper deleted +0 -12
-    fi
-    for i in $INTERFACES; do
-       if test "x$i" = "x$nfs_iface"; then
-            echo "dhclient skipping nfsroot interface $i"
-       else
-           interfaces="$interfaces $i"
-       fi
-    done
-fi
-
-if test "x$interfaces" != "x"; then
-    /sbin/dhclient -d -cf /etc/dhcp/dhclient.conf -q -lf

/var/lib/dhcp/dhclient.leases $interfaces

Review

Quoted 2 lines
meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper deleted +0 -1
-fi
(quoted diff) +0 -0

b/meta/recipes-connectivity/dhcp/files/dhclient.conf

Review

Quoted 56 lines

deleted file mode 100644
index 0e6dcf96c21..00000000000

meta/recipes-connectivity/dhcp/files/dhclient.conf deleted +0 -50
@@ -1,50 +0,0 @@
-# Configuration file for /sbin/dhclient, which is included in Debian's
-#      dhcp3-client package.
-#
-# This is a sample configuration file for dhclient. See dhclient.conf's
-#      man page for more information about the syntax of this file
-#      and a more comprehensive list of the parameters understood by
-#      dhclient.
-#
-# Normally, if the DHCP server provides reasonable information and does
-#      not leave anything out (like the domain name, for example), then
-#      few changes must be made to this file, if any.
-#
-
-#send host-name "andare.fugue.com";
-#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
-#send dhcp-lease-time 3600;
-#supersede domain-name "fugue.com home.vix.com";
-#prepend domain-name-servers 127.0.0.1;
-request subnet-mask, broadcast-address, time-offset, routers,
-       domain-name, domain-name-servers, host-name,
-       netbios-name-servers, netbios-scope;
-#require subnet-mask, domain-name-servers;
-#timeout 60;
-#retry 60;
-#reboot 10;
-#select-timeout 5;
-#initial-interval 2;
-#script "/etc/dhcp3/dhclient-script";
-#media "-link0 -link1 -link2", "link0 link1";
-#reject 192.33.137.209;
-
-#alias {
-#  interface "eth0";
-#  fixed-address 192.5.5.213;
-#  option subnet-mask 255.255.255.255;
-#}
-
-#lease {
-#  interface "eth0";
-#  fixed-address 192.33.137.200;
-#  medium "link0 link1";
-#  option host-name "andare.swiftmedia.com";
-#  option subnet-mask 255.255.255.0;
-#  option broadcast-address 192.33.137.255;
-#  option routers 192.33.137.250;
-#  option domain-name-servers 127.0.0.1;
-#  renew 2 2000/1/12 00:00:01;
-#  rebind 2 2000/1/12 00:00:01;
-#  expire 2 2000/1/12 00:00:01;
-#}
(quoted diff) +0 -0

b/meta/recipes-connectivity/dhcp/files/dhclient.service

meta/recipes-

Quoted 19 lines

deleted file mode 100644
index 9ddb4d1dfe9..00000000000

meta/recipes-connectivity/dhcp/files/dhclient.service deleted +0 -13
@@ -1,13 +0,0 @@
-[Unit]
-Description=Dynamic Host Configuration Protocol (DHCP)
-Wants=network.target
-Before=network.target
-After=systemd-udevd.service
-
-[Service]
-EnvironmentFile=-@SYSCONFDIR@/default/dhcp-client
-ExecStart=@BASE_SBINDIR@/dhclient-systemd-wrapper
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
meta/recipes- renamed from meta/recipes-connectivity/dhcp/files/dhcpd.conf +0 -0

connectivity/dhcp/files/dhcpd.conf

Review

Quoted 114 lines

deleted file mode 100644
index 0001c0f00e2..00000000000

meta/recipes-connectivity/dhcp/files/dhcpd.conf deleted +0 -108
@@ -1,108 +0,0 @@
-#
-# Sample configuration file for ISC dhcpd for Debian
-#
-# $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
-#
-
-# The ddns-updates-style parameter controls whether or not the server will
-# attempt to do a DNS update when a lease is confirmed. We default to the
-# behavior of the version 2 packages ('none', since DHCP v2 didn't
-# have support for DDNS.)
-ddns-update-style none;
-
-# option definitions common to all supported networks...
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-# If this DHCP server is the official DHCP server for the local
-# network, the authoritative directive should be uncommented.
-#authoritative;
-
-# Use this to send dhcp log messages to a different log file (you also
-# have to hack syslog.conf to complete the redirection).
-log-facility local7;
-
-# No service will be given on this subnet, but declaring it helps the
-# DHCP server to understand the network topology.
-
-#subnet 10.152.187.0 netmask 255.255.255.0 {
-#}
-
-# This is a very basic subnet declaration.
-
-#subnet 10.254.239.0 netmask 255.255.255.224 {
-#  range 10.254.239.10 10.254.239.20;
-#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
-#}
-
-# This declaration allows BOOTP clients to get dynamic addresses,
-# which we don't really recommend.
-
-#subnet 10.254.239.32 netmask 255.255.255.224 {
-#  range dynamic-bootp 10.254.239.40 10.254.239.60;
-#  option broadcast-address 10.254.239.31;
-#  option routers rtr-239-32-1.example.org;
-#}
-
-# A slightly different configuration for an internal subnet.
-#subnet 10.5.5.0 netmask 255.255.255.224 {
-#  range 10.5.5.26 10.5.5.30;
-#  option domain-name-servers ns1.internal.example.org;
-#  option domain-name "internal.example.org";
-#  option routers 10.5.5.1;
-#  option broadcast-address 10.5.5.31;
-#  default-lease-time 600;
-#  max-lease-time 7200;
-#}
-
-# Hosts which require special configuration options can be listed in
-# host statements.   If no address is specified, the address will be
-# allocated dynamically (if possible), but the host-specific information
-# will still come from the host declaration.
-
-#host passacaglia {
-#  hardware ethernet 0:0:c0:5d:bd:95;
-#  filename "vmunix.passacaglia";
-#  server-name "toccata.fugue.com";
-#}
-
-# Fixed IP addresses can also be specified for hosts.   These addresses
-# should not also be listed as being available for dynamic assignment.
-# Hosts for which fixed IP addresses have been specified can boot using
-# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
-# be booted with DHCP, unless there is an address range on the subnet
-# to which a BOOTP client is connected which has the dynamic-bootp flag
-# set.
-#host fantasia {
-#  hardware ethernet 08:00:07:26:c0:a5;
-#  fixed-address fantasia.fugue.com;
-#}
-
-# You can declare a class of clients and then do address allocation
-# based on that.   The example below shows a case where all clients
-# in a certain class get addresses on the 10.17.224/24 subnet, and all
-# other clients get addresses on the 10.0.29/24 subnet.
-
-#class "foo" {
-#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
-#}
-
-#shared-network 224-29 {
-#  subnet 10.17.224.0 netmask 255.255.255.0 {
-#    option routers rtr-224.example.org;
-#  }
-#  subnet 10.0.29.0 netmask 255.255.255.0 {
-#    option routers rtr-29.example.org;
-#  }
-#  pool {
-#    allow members of "foo";
-#    range 10.17.224.10 10.17.224.250;
-#  }
-#  pool {
-#    deny members of "foo";
-#    range 10.0.29.10 10.0.29.230;
-#  }
-#}
(quoted diff) +0 -0

b/meta/recipes-connectivity/dhcp/files/dhcpd.service

Quoted 6 lines

deleted file mode 100644
index ae4f93eca5b..00000000000

meta/recipes-connectivity/dhcp/files/dhcpd.service deleted +0 -1
@@ -1,15 +0,0 @@
-[Unit]

meta/recipes-connectivity/dhcp/files/dhcpd.service line 11

Quoted 10 lines
meta/recipes-connectivity/dhcp/files/dhcpd.service deleted +0 -10
-Description=DHCPv4 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-PIDFile=@localstatedir@/run/dhcpd.pid
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
-EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcp-server
-ExecStartPre=@base_bindir@/touch

@localstatedir@/lib/dhcp/dhcpd.leases

meta/recipes-connectivity/dhcp/files/dhcpd.service line 12

Quoted 1 line
meta/recipes-connectivity/dhcp/files/dhcpd.service deleted +0 -1
-ExecStart=@SBINDIR@/dhcpd -f -cf @SYSCONFDIR@/dhcp/dhcpd.conf -pf

@localstatedir@/run/dhcpd.pid $DHCPDARGS -q $INTERFACES

Review

Quoted 4 lines
meta/recipes-connectivity/dhcp/files/dhcpd.service deleted +0 -3
-
-[Install]
-WantedBy=multi-user.target
(quoted diff) +0 -0

b/meta/recipes-connectivity/dhcp/files/dhcpd6.service

Quoted 6 lines

deleted file mode 100644
index 52a6224dc2c..00000000000

meta/recipes-connectivity/dhcp/files/dhcpd6.service deleted +0 -1
@@ -1,15 +0,0 @@
-[Unit]

meta/recipes-connectivity/dhcp/files/dhcpd6.service line 11

Quoted 10 lines
meta/recipes-connectivity/dhcp/files/dhcpd6.service deleted +0 -10
-Description=DHCPv6 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-PIDFile=@localstatedir@/run/dhcpd6.pid
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
-EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcpd6
-ExecStartPre=@base_bindir@/touch

@localstatedir@/lib/dhcp/dhcpd6.leases

meta/recipes-connectivity/dhcp/files/dhcpd6.service line 12

Quoted 1 line
meta/recipes-connectivity/dhcp/files/dhcpd6.service deleted +0 -1
-ExecStart=@SBINDIR@/dhcpd -f -6 -cf @SYSCONFDIR@/dhcp/dhcpd6.conf -

pf @localstatedir@/run/dhcpd6.pid $DHCPDARGS -q $INTERFACES

Review

Quoted 4 lines
meta/recipes-connectivity/dhcp/files/dhcpd6.service deleted +0 -3
-
-[Install]
-WantedBy=multi-user.target
(quoted diff) +0 -0

b/meta/recipes-connectivity/dhcp/files/dhcrelay.service

meta/recipes-

Quoted 16 lines

deleted file mode 100644
index 15ff927d346..00000000000

meta/recipes-connectivity/dhcp/files/dhcrelay.service deleted +0 -10
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCP Relay Agent Daemon
-After=network.target
-
-[Service]
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay
-ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS
-
-[Install]
-WantedBy=multi-user.target
meta/recipes- renamed from meta/recipes-connectivity/dhcp/files/init-relay +0 -0

connectivity/dhcp/files/init-relay

Quoted 24 lines

deleted file mode 100644
index 019a7e84cf4..00000000000

meta/recipes-connectivity/dhcp/files/init-relay deleted +0 -19
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $
-#
-
-# It is not safe to start if we don't have a default configuration...
-if [ ! -f /etc/default/dhcp-relay ]; then
-       echo "/etc/default/dhcp-relay does not exist! - Aborting..."
-       echo "create this file to fix the problem."
-       exit 1
-fi
-
-# Read init script configuration (interfaces the daemon should listen on
-# and the DHCP server we should forward requests to.)
-. /etc/default/dhcp-relay
-
-# Build command line for interfaces (will be passed to dhrelay below.)
-IFCMD=""
-if test "$INTERFACES" != ""; then

meta/recipes-connectivity/dhcp/files/init-relay line 29

Quoted 10 lines
meta/recipes-connectivity/dhcp/files/init-relay deleted +0 -10
-       for I in $INTERFACES; do
-               IFCMD=${IFCMD}"-i "${I}" "
-       done
-fi
-
-DHCRELAYPID=/var/run/dhcrelay.pid
-
-case "$1" in
-       start)
-               start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD

$SERVERS

meta/recipes-connectivity/dhcp/files/init-relay

Quoted 11 lines
meta/recipes-connectivity/dhcp/files/init-relay deleted +0 -11
-               ;;
-       stop)
-               start-stop-daemon -K -x /usr/sbin/dhcrelay
-               ;;
-       restart | force-reload)
-               $0 stop
-               sleep 2
-               $0 start
-               ;;
-       *)
-               echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-

reload}"

meta/recipes-

Quoted 5 lines
meta/recipes-connectivity/dhcp/files/init-relay deleted +0 -4
-               exit 1
-esac
-
-exit 0
meta/recipes- renamed from meta/recipes-connectivity/dhcp/files/init-server +0 -0

connectivity/dhcp/files/init-server

Quoted 17 lines

deleted file mode 100644
index 5e693adf785..00000000000

meta/recipes-connectivity/dhcp/files/init-server deleted +0 -12
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
-#
-
-test -f /usr/sbin/dhcpd || exit 0
-
-# It is not safe to start if we don't have a default configuration...
-if [ ! -f /etc/default/dhcp-server ]; then
-       echo "/etc/default/dhcp-server does not exist! - Aborting..."
-       exit 0
-fi

meta/recipes-connectivity/dhcp/files/init-server line 22

Quoted 10 lines
meta/recipes-connectivity/dhcp/files/init-server deleted +0 -10
-
-# Read init script configuration (so far only interfaces the daemon
-# should listen on.)
-. /etc/default/dhcp-server
-
-case "$1" in
-       start)
-               echo -n "Starting DHCP server: "
-               test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
-               test -f /var/lib/dhcp/dhcpd.leases || touch

/var/lib/dhcp/dhcpd.leases

meta/recipes-connectivity/dhcp/files/init-server line 23

Quoted 1 line
meta/recipes-connectivity/dhcp/files/init-server deleted +0 -1
-               start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES -user

dhcp -group dhcp

Quoted 7 lines
meta/recipes-connectivity/dhcp/files/init-server deleted +0 -7
-               echo "."
-               ;;
-       stop)
-               echo -n "Stopping DHCP server: dhcpd3"
-               start-stop-daemon -K -x /usr/sbin/dhcpd
-               echo "."
-               ;;

meta/recipes-connectivity/dhcp/files/init-server

Quoted 10 lines
meta/recipes-connectivity/dhcp/files/init-server deleted +0 -10
-       restart | force-reload)
-               $0 stop
-               sleep 2
-               $0 start
-               if [ "$?" != "0" ]; then
-                       exit 1
-               fi
-               ;;
-       *)
-               echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-

reload}"

Quoted 8 lines
meta/recipes-connectivity/dhcp/files/init-server deleted +0 -5
-               exit 1
-esac
-
-exit 0
--

2.17.1

#10 lore raw

Re: [OE-core] [PATCH 6/8] dhcp: remove from core

Quoted 17 lines · Diego Sueiro
Quoted 10 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Khem Raj via lists.openembedded.org
Sent: 01 September 2020 19:11
To: akuster <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>
Subject: Re: [OE-core] [PATCH 6/8] dhcp: remove from core

Quoted 6 lines

it seems its used by
build-appliance-image and packagegroup-core-base-utils so you need to
take care of that as well. in meta-networking networkmanager recipe depends on it too which I think I can take care.

Quoted 3 lines

Armin,
You added a new recipe for a dhcp client but what is the alternative for the dhcp server in oe-core?

Its kea.

Cheers,

Richard

author
#11 lore raw

Re: [OE-core] [PATCH 6/8] dhcp: remove from core

In reply to Khem Raj
Quoted 3 lines · Khem Raj

it seems its used by
build-appliance-image and packagegroup-core-base-utils so you need to take care of that as well.

Richard caught that just after I sent he patch series.

He added a change for that.

http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=master-next&id=a5a4fa3d7cf7a88a7788e64306b8797e60999005

-armin

Quoted 1,303 lines

in meta-networking networkmanager recipe
depends on it too which I think I can take care.

Quoted 1,299 lines · akuster

update maintainers.inc too

---
 meta/conf/distro/include/maintainers.inc      |   1 -
 meta/recipes-connectivity/dhcp/dhcp.inc       | 149 ------------------
 ...TH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  27 ----
 ...-limitation-in-linux-dhclient-script.patch |  65 --------
 .../dhcp/dhcp/0002-dhclient-dbus.patch        | 117 --------------
 .../dhcp/dhcp/0003-link-with-lcrypto.patch    |  35 ----
 .../dhcp/0004-Fix-out-of-tree-builds.patch    |  95 -----------
 ...invoke-dhclient-script-failed-on-Rea.patch |  36 -----
 ...gument-to-make-the-libxml2-dependenc.patch |  62 --------
 ...move-dhclient-script-bash-dependency.patch |  28 ----
 ...ct-the-intention-for-xml2-lib-search.patch |  34 ----
 .../dhcp/dhcp/0013-fixup_use_libbind.patch    |  64 --------
 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb  |  23 ---
 .../dhcp/files/default-relay                  |  12 --
 .../dhcp/files/default-server                 |   7 -
 .../dhcp/files/dhclient-systemd-wrapper       |  39 -----
 .../dhcp/files/dhclient.conf                  |  50 ------
 .../dhcp/files/dhclient.service               |  13 --
 .../dhcp/files/dhcpd.conf                     | 108 -------------
 .../dhcp/files/dhcpd.service                  |  15 --
 .../dhcp/files/dhcpd6.service                 |  15 --
 .../dhcp/files/dhcrelay.service               |  10 --
 .../dhcp/files/init-relay                     |  44 ------
 .../dhcp/files/init-server                    |  44 ------
 24 files changed, 1093 deletions(-)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp.inc
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
 delete mode 100644 meta/recipes-connectivity/dhcp/files/default-relay
 delete mode 100644 meta/recipes-connectivity/dhcp/files/default-server
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.conf
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd.conf
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcpd6.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/dhcrelay.service
 delete mode 100644 meta/recipes-connectivity/dhcp/files/init-relay
 delete mode 100644 meta/recipes-connectivity/dhcp/files/init-server
meta/conf/distro/include/maintainers.inc +0 -1
index 27e3474da8b..a55dbfa13c9 100644
@@ -143,7 +143,6 @@ RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <[email protected]>"
 RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-dhcpd = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-diffstat = "Chen Qi <[email protected]>"
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -149
deleted file mode 100644
index d46130d49b9..00000000000
@@ -1,149 +0,0 @@
-SECTION = "console/network"
-SUMMARY = "Internet Software Consortium DHCP package"
-DESCRIPTION = "DHCP (Dynamic Host Configuration Protocol) is a protocol \
-which allows individual devices on an IP network to get their own \
-network configuration information from a server.  DHCP helps make it \
-easier to administer devices."
-
-HOMEPAGE = "http://www.isc.org/"
-
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"
-
-DEPENDS = "openssl bind"
-
-SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
-           file://init-relay file://default-relay \
-           file://init-server file://default-server \
-           file://dhclient.conf file://dhcpd.conf \
-           file://dhclient-systemd-wrapper \
-           file://dhclient.service \
-           file://dhcpd.service file://dhcrelay.service \
-           file://dhcpd6.service \
-           "
-UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
-
-inherit autotools-brokensep systemd useradd update-rc.d
-
-USERADD_PACKAGES = "${PN}-server"
-USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}"
-
-SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay ${PN}-client"
-SYSTEMD_SERVICE_${PN}-server = "dhcpd.service dhcpd6.service"
-SYSTEMD_AUTO_ENABLE_${PN}-server = "disable"
-
-SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service"
-SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable"
-
-SYSTEMD_SERVICE_${PN}-client = "dhclient.service"
-SYSTEMD_AUTO_ENABLE_${PN}-client = "disable"
-
-INITSCRIPT_PACKAGES = "dhcp-server"
-INITSCRIPT_NAME_dhcp-server = "dhcp-server"
-INITSCRIPT_PARAMS_dhcp-server = "defaults"
-
-CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
-                --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
-                --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
-                --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
-                --enable-paranoia --disable-static \
-                --with-randomdev=/dev/random \
-                --with-libbind=${STAGING_DIR_HOST} \
-               --enable-libtool \
-               "
-
-#Enable shared libs per dhcp README
-do_configure_prepend () {
-       cp configure.ac+lt configure.ac
-}
-
-do_install_append () {
-       install -d ${D}${sysconfdir}/init.d
-       install -d ${D}${sysconfdir}/default
-       install -d ${D}${sysconfdir}/dhcp
-       install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay
-       install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay
-       install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server
-       install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
-
-       rm -f ${D}${sysconfdir}/dhclient.conf*
-       rm -f ${D}${sysconfdir}/dhcpd.conf*
-       install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
-       install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
-
-       install -d ${D}${base_sbindir}/
-       if [ "${sbindir}" != "${base_sbindir}" ]; then
-               mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
-       fi
-       install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
-
-       # Install systemd unit files
-       install -d ${D}${systemd_unitdir}/system
-       install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
-       install -m 0644 ${WORKDIR}/dhcpd6.service ${D}${systemd_unitdir}/system
-       install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
-       sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service ${D}${systemd_unitdir}/system/dhcrelay.service
-       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-       sed -i -e 's,@base_bindir@,${base_bindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-       sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service
-
-       install -d ${D}${base_sbindir}
-       install -m 0755 ${WORKDIR}/dhclient-systemd-wrapper ${D}${base_sbindir}/dhclient-systemd-wrapper
-       install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
-       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhclient.service
-       sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g' ${D}${systemd_unitdir}/system/dhclient.service
-}
-
-PACKAGES += "dhcp-libs dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
-
-PACKAGES_remove = "${PN}"
-RDEPENDS_${PN}-client += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'iproute2', '', d)}"
-RDEPENDS_${PN}-dev = ""
-RDEPENDS_${PN}-staticdev = ""
-FILES_${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0* ${libdir}/libdhcp.so.0*"
-
-FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
-RRECOMMENDS_${PN}-server = "dhcp-server-config"
-
-FILES_${PN}-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
-
-FILES_${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
-
-FILES_${PN}-client = "${base_sbindir}/dhclient \
-                      ${base_sbindir}/dhclient-script \
-                      ${sysconfdir}/dhcp/dhclient.conf \
-                      ${base_sbindir}/dhclient-systemd-wrapper \
-                     "
-
-FILES_${PN}-omshell = "${bindir}/omshell"
-
-pkg_postinst_dhcp-server() {
-    mkdir -p $D/${localstatedir}/lib/dhcp
-    touch $D/${localstatedir}/lib/dhcp/dhcpd.leases
-    touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases
-}
-
-pkg_postinst_dhcp-client() {
-    mkdir -p $D/${localstatedir}/lib/dhcp
-}
-
-pkg_postrm_dhcp-server() {
-    rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
-    rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
-
-    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
-        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
-    fi
-}
-
-pkg_postrm_dhcp-client() {
-    rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
-    rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
-
-    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
-        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
-    fi
-}
meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch deleted +0 -27
deleted file mode 100644
index d1b57f0bb41..00000000000
@@ -1,27 +0,0 @@
-From 7cc29144535a622fc671dc86eb1da65b0473a7c4 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 16:14:22 +0800
-Subject: [PATCH 01/11] define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
-
-Upstream-Status: Inappropriate [OE specific]
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- includes/site.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/includes/site.h
-===================================================================
---- dhcp-4.4.1.orig/includes/site.h
-+++ dhcp-4.4.1/includes/site.h
-@@ -148,7 +148,8 @@
- /* Define this if you want the dhcpd.conf file to go somewhere other than
-    the default location.   By default, it goes in /etc/dhcpd.conf. */
-
--/* #define _PATH_DHCPD_CONF   "/etc/dhcpd.conf" */
-+#define _PATH_DHCPD_CONF      "/etc/dhcp/dhcpd.conf"
-+#define _PATH_DHCLIENT_CONF   "/etc/dhcp/dhclient.conf"
-
- /* Network API definitions.   You do not need to choose one of these - if
-    you don't choose, one will be chosen for you in your system's config
meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch deleted +0 -65
deleted file mode 100644
index 2359381b938..00000000000
@@ -1,65 +0,0 @@
-From eec0503cfc36f63d777f5cb3f2719cecedcb8468 Mon Sep 17 00:00:00 2001
-From: Haris Okanovic <[email protected]>
-Date: Mon, 7 Jan 2019 13:22:09 -0600
-Subject: [PATCH] Workaround busybox limitation in Linux dhclient-script
-
-Busybox is a lightweight implementation of coreutils commonly used on
-space-constrained embedded Linux distributions. It's implementation of
-chown and chmod doesn't provide a "--reference" option added to
-client/scripts/linux as of commit 9261cb14. This change works around
-that limitation by using stat to read ownership and permissions flags
-and simple chown/chmod calls supported in both coreutils and busybox.
-
-    modified:   client/scripts/linux
-
-Signed-off-by: Haris Okanovic <[email protected]>
-Upstream-Status: Pending [ISC-Bugs #48771]
----
- client/scripts/linux | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 0c429697..2435a44b 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -32,6 +32,17 @@
- # if your system holds ip tool in a non-standard location.
- ip=/sbin/ip
-
-+chown_chmod_by_reference() {
-+    local reference_file="$1"
-+    local target_file="$2"
-+
-+    local owner=$(stat -c "%u:%g" "$reference_file")
-+    local perm=$(stat -c "%a" "$reference_file")
-+
-+    chown "$owner" "$target_file"
-+    chmod "$perm" "$target_file"
-+}
-+
- # update /etc/resolv.conf based on received values
- # This updated version mostly follows Debian script by Andrew Pollock et al.
- make_resolv_conf() {
-@@ -74,8 +85,7 @@ make_resolv_conf() {
-         fi
-
-       if [ -f /etc/resolv.conf ]; then
--          chown --reference=/etc/resolv.conf $new_resolv_conf
--          chmod --reference=/etc/resolv.conf $new_resolv_conf
-+          chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf
-       fi
-         mv -f $new_resolv_conf /etc/resolv.conf
-     # DHCPv6
-@@ -101,8 +111,7 @@ make_resolv_conf() {
-         fi
-
-       if [ -f /etc/resolv.conf ]; then
--            chown --reference=/etc/resolv.conf $new_resolv_conf
--            chmod --reference=/etc/resolv.conf $new_resolv_conf
-+          chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf
-       fi
-         mv -f $new_resolv_conf /etc/resolv.conf
-     fi
---
-2.20.0
-
meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -117
deleted file mode 100644
index 101c33f677a..00000000000
@@ -1,117 +0,0 @@
-From be7540d31c356e80ee02e90e8bf162b7ac6e5ba5 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 14:56:56 +0800
-Subject: [PATCH 02/11] dhclient dbus
-
-Upstream-Status: Inappropriate [distribution]
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/bsdos   | 5 +++++
- client/scripts/freebsd | 5 +++++
- client/scripts/linux   | 5 +++++
- client/scripts/netbsd  | 5 +++++
- client/scripts/openbsd | 5 +++++
- client/scripts/solaris | 5 +++++
- 6 files changed, 30 insertions(+)
-
-diff --git a/client/scripts/bsdos b/client/scripts/bsdos
-index d69d0d8..095b143 100755
---- a/client/scripts/bsdos
-+++ b/client/scripts/bsdos
-@@ -45,6 +45,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/freebsd b/client/scripts/freebsd
-index 8f3e2a2..ad7fb44 100755
---- a/client/scripts/freebsd
-+++ b/client/scripts/freebsd
-@@ -89,6 +89,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 5fb1612..3d447b6 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -174,6 +174,11 @@ exit_with_hooks() {
-         exit_status=$?
-     fi
-
-+    if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+        dbus-send --system --dest=com.redhat.dhcp \
-+           --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+           'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+    fi
-     exit $exit_status
- }
-
-diff --git a/client/scripts/netbsd b/client/scripts/netbsd
-index 07383b7..aaba8e8 100755
---- a/client/scripts/netbsd
-+++ b/client/scripts/netbsd
-@@ -45,6 +45,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/openbsd b/client/scripts/openbsd
-index e7f4746..56b980c 100644
---- a/client/scripts/openbsd
-+++ b/client/scripts/openbsd
-@@ -45,6 +45,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
-diff --git a/client/scripts/solaris b/client/scripts/solaris
-index af553b9..4a2aa69 100755
---- a/client/scripts/solaris
-+++ b/client/scripts/solaris
-@@ -26,6 +26,11 @@ exit_with_hooks() {
-     . /etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-+  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+    dbus-send --system --dest=com.redhat.dhcp \
-+      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+  fi
-   exit $exit_status
- }
-
---
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch deleted +0 -35
deleted file mode 100644
index 5b35933a54a..00000000000
@@ -1,35 +0,0 @@
-From d80bd792323dbd56269309f85b4506eb6b1b60e9 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <[email protected]>
-Date: Tue, 15 Aug 2017 15:05:47 +0800
-Subject: [PATCH 03/11] link with lcrypto
-
-From 4.2.0 final release, -lcrypto check was removed and we compile
-static libraries
-from bind that are linked to libcrypto. This is why i added a patch in
-order to add
--lcrypto to LIBS.
-
-Upstream-Status: Pending
-Signed-off-by: Andrei Gherzan <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -612,6 +612,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
- # Look for optional headers.
- AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
-
-+# find an MD5 library
-+AC_SEARCH_LIBS(MD5_Init, [crypto])
-+AC_SEARCH_LIBS(MD5Init, [crypto])
-+
- # Solaris needs some libraries for functions
- AC_SEARCH_LIBS(socket, [socket])
- AC_SEARCH_LIBS(inet_ntoa, [nsl])
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -95
deleted file mode 100644
index 7b57730ffb7..00000000000
@@ -1,95 +0,0 @@
-From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 15:08:22 +0800
-Subject: [PATCH 04/11] Fix out of tree builds
-
-Upstream-Status: Pending
-
-RP 2013/03/21
-
-Rebase to 4.3.6
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/Makefile.am  | 4 ++--
- common/Makefile.am  | 3 ++-
- dhcpctl/Makefile.am | 2 ++
- omapip/Makefile.am  | 1 +
- relay/Makefile.am   | 2 +-
- server/Makefile.am  | 2 +-
- 6 files changed, 9 insertions(+), 5 deletions(-)
-
-Index: dhcp-4.4.1/common/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/common/Makefile.am
-+++ dhcp-4.4.1/common/Makefile.am
-@@ -1,4 +1,5 @@
--AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
-+
- AM_CFLAGS = $(LDAP_CFLAGS)
-
- lib_LIBRARIES = libdhcp.a
-Index: dhcp-4.4.1/dhcpctl/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/dhcpctl/Makefile.am
-+++ dhcp-4.4.1/dhcpctl/Makefile.am
-@@ -3,6 +3,8 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@
- BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
- BINDLIBISCDIR=@BINDLIBISCDIR@
-
-+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
-+
- bin_PROGRAMS = omshell
- lib_LIBRARIES = libdhcpctl.a
- noinst_PROGRAMS = cltest
-Index: dhcp-4.4.1/server/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/server/Makefile.am
-+++ dhcp-4.4.1/server/Makefile.am
-@@ -4,7 +4,7 @@
- # production code. Sadly, we are not there yet.
- SUBDIRS = . tests
-
--AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
-
- dist_sysconf_DATA = dhcpd.conf.example
- sbin_PROGRAMS = dhcpd
-Index: dhcp-4.4.1/client/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/client/Makefile.am
-+++ dhcp-4.4.1/client/Makefile.am
-@@ -5,7 +5,7 @@
- SUBDIRS = . tests
-
- AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"'
--AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"'
-+AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
-
- dist_sysconf_DATA = dhclient.conf.example
- sbin_PROGRAMS = dhclient
-Index: dhcp-4.4.1/omapip/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/omapip/Makefile.am
-+++ dhcp-4.4.1/omapip/Makefile.am
-@@ -2,6 +2,7 @@ BINDLIBIRSDIR=@BINDLIBIRSDIR@
- BINDLIBDNSDIR=@BINDLIBDNSDIR@
- BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
- BINDLIBISCDIR=@BINDLIBISCDIR@
-+AM_CPPFLAGS = -I$(top_srcdir)/includes
-
- lib_LIBRARIES = libomapi.a
- noinst_PROGRAMS = svtest
-Index: dhcp-4.4.1/relay/Makefile.am
-===================================================================
---- dhcp-4.4.1.orig/relay/Makefile.am
-+++ dhcp-4.4.1/relay/Makefile.am
-@@ -1,6 +1,6 @@
- SUBDIRS = . tests
-
--AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
-
- sbin_PROGRAMS = dhcrelay
- dhcrelay_SOURCES = dhcrelay.c
meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch deleted +0 -36
deleted file mode 100644
index dd56381b1dc..00000000000
@@ -1,36 +0,0 @@
-From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 15:24:14 +0800
-Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on
- Read-only file system
-
-In read-only file system, '/etc' is on the readonly partition,
-and '/etc/resolv.conf' is symlinked to a separate writable
-partition.
-
-In this situation, we create temp files 'resolv.conf.dhclient-new'
-in /tmp dir.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3d447b6..3122a75 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -40,7 +40,7 @@ make_resolv_conf() {
-     # DHCPv4
-     if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
-        [ -n "$new_domain_name_servers" ]; then
--        new_resolv_conf=/etc/resolv.conf.dhclient-new
-+        new_resolv_conf=/tmp/resolv.conf.dhclient-new
-         rm -f $new_resolv_conf
-
-         if [ -n "$new_domain_name" ]; then
---
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -62
deleted file mode 100644
index feb0754fff4..00000000000
@@ -1,62 +0,0 @@
-From 7107511fd209f08f9a96f8938041ae48f3295895 Mon Sep 17 00:00:00 2001
-From: Christopher Larson <[email protected]>
-Date: Tue, 15 Aug 2017 16:17:49 +0800
-Subject: [PATCH 07/11] Add configure argument to make the libxml2 dependency
- explicit and determinisitic.
-
-Upstream-Status: Pending
-
-Signed-off-by: Christopher Larson <[email protected]>
-
-Rebase to 4.3.6
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- configure.ac | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -642,6 +642,17 @@ if test "$have_nanosleep" = "rt"; then
-       LIBS="-lrt $LIBS"
- fi
-
-+AC_ARG_WITH(libxml2,
-+      AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
-+      with_libxml2="$withval", with_libxml2="no")
-+
-+if test x$with_libxml2 != xno; then
-+      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
-+              [if test x$with_libxml2 != xauto; then
-+                      AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
-+              fi])
-+fi
-+
- # check for /dev/random (declares HAVE_DEV_RANDOM)
- AC_MSG_CHECKING(for random device)
- AC_ARG_WITH(randomdev,
-Index: dhcp-4.4.1/configure.ac+lt
-===================================================================
---- dhcp-4.4.1.orig/configure.ac+lt
-+++ dhcp-4.4.1/configure.ac+lt
-@@ -909,6 +909,18 @@ elif test "$want_libtool" = "yes" -a "$u
- fi
- AM_CONDITIONAL(INSTALL_BIND, test "$want_install_bind" = "yes")
-
-+AC_ARG_WITH(libxml2,
-+      AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
-+      with_libxml2="$withval", with_libxml2="no")
-+
-+if test x$with_libxml2 != xno; then
-+      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
-+              [if test x$with_libxml2 != xauto; then
-+                      AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
-+              fi])
-+fi
-+
-+
- # OpenLDAP support.
- AC_ARG_WITH(ldap,
-     AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]),
meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch deleted +0 -28
deleted file mode 100644
index 912b6d6312c..00000000000
@@ -1,28 +0,0 @@
-From f3f8b7726e50e24ef3edf5fa5a17e31d39118d7e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-Date: Tue, 15 Aug 2017 15:49:31 +0800
-Subject: [PATCH 09/11] remove dhclient-script bash dependency
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andre McCurdy <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3122a75..1712d7d 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # dhclient-script for Linux. Dan Halbert, March, 1997.
- # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
- # No guarantees about this. I'm a novice at the details of Linux
---
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch deleted +0 -34
deleted file mode 100644
index 39ba65fbc46..00000000000
@@ -1,34 +0,0 @@
-From 501543b3ef715488a142e3d301ff2733aa33eec7 Mon Sep 17 00:00:00 2001
-From: Awais Belal <[email protected]>
-Date: Wed, 25 Oct 2017 21:00:05 +0500
-Subject: [PATCH] dhcp: correct the intention for xml2 lib search
-
-A missing case breaks the build when libxml2 is
-required and found appropriately. The third argument
-to the function AC_SEARCH_LIB is action-if-found which
-was mistakenly been used for the case where the library
-is not found and hence breaks the configure phase
-where it shoud actually pass.
-We now pass on silently when action-if-found is
-executed.
-
-Upstream-Status: Pending
-
-Signed-off-by: Awais Belal <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -647,7 +647,7 @@ AC_ARG_WITH(libxml2,
-       with_libxml2="$withval", with_libxml2="no")
-
- if test x$with_libxml2 != xno; then
--      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
-+      AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
-               [if test x$with_libxml2 != xauto; then
-                       AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
-               fi])
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -64
deleted file mode 100644
index fcec010bd01..00000000000
@@ -1,64 +0,0 @@
-lib and include path is hardcoded for use_libbind
-
-use libdir and includedir vars
-
-Upstream-Status: Pending
-Signed-off-by: Armin Kuster <[email protected]>
-
-Index: dhcp-4.4.1/configure.ac+lt
-===================================================================
---- dhcp-4.4.1.orig/configure.ac+lt
-+++ dhcp-4.4.1/configure.ac+lt
-@@ -801,22 +801,22 @@ no)
-       if test ! -d "$use_libbind"; then
-               AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
-       fi
--      if test ! -d "$use_libbind/include" -o \
--              ! -f "$use_libbind/include/isc/buffer.h"
-+      if test ! -d "$use_libbind/$includedir" -o \
-+              ! -f "$use_libbind/$includedir/isc/buffer.h"
-       then
--              AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include])
-+              AC_MSG_ERROR([Cannot find bind includes at $use_libbind/$includedir])
-       fi
--      if test ! -d "$use_libbind/lib" -o \
--              \( ! -f "$use_libbind/lib/libisc.a" -a \
--                 ! -f "$use_libbind/lib/libisc.la" \)
-+      if test ! -d "$use_libbind/$libdir" -o \
-+              \( ! -f "$use_libbind/$libdir/libisc.a" -a \
-+                 ! -f "$use_libbind/$libdir/libisc.la" \)
-       then
--              AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
-+              AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/$libdir])
-       fi
-       BINDDIR="$use_libbind"
--      BINDLIBIRSDIR="$BINDDIR/lib"
--      BINDLIBDNSDIR="$BINDDIR/lib"
--      BINDLIBISCCFGDIR="$BINDDIR/lib"
--      BINDLIBISCDIR="$BINDDIR/lib"
-+      BINDLIBIRSDIR="$BINDDIR/$libdir"
-+      BINDLIBDNSDIR="$BINDDIR/$libdir"
-+      BINDLIBISCCFGDIR="$BINDDIR/$libdir"
-+      BINDLIBISCDIR="$BINDDIR/$libdir"
-       DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind"
-       ;;
- esac
-@@ -856,14 +856,14 @@ AC_ARG_ENABLE(libtool,
-
- if test "$use_libbind" != "no"; then
-       if test "$want_libtool" = "yes" -a \
--              ! -f "$use_libbind/lib/libisc.la"
-+              ! -f "$use_libbind/$libdir/libisc.la"
-       then
--              AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib])
-+              AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/$libdir])
-       fi
-       if test "$want_libtool" = "no" -a \
--              ! -f "$use_libbind/lib/libisc.a"
-+              ! -f "$use_libbind/$libdir/libisc.a"
-       then
--              AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib])
-+              AC_MSG_ERROR([Cannot find static libraries at $use_libbind/$libdir])
-       fi
- fi
-
meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -23
deleted file mode 100644
index cf4af826099..00000000000
@@ -1,23 +0,0 @@
-require dhcp.inc
-
-SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
-            file://0002-dhclient-dbus.patch \
-            file://0003-link-with-lcrypto.patch \
-            file://0004-Fix-out-of-tree-builds.patch \
-            file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \
-            file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \
-            file://0009-remove-dhclient-script-bash-dependency.patch \
-            file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
-            file://0013-fixup_use_libbind.patch \
-            file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \
-"
-
-SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
-SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
-
-LDFLAGS_append = " -pthread"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
-
-CFLAGS += "-fcommon"
meta/recipes-connectivity/dhcp/files/default-relay deleted +0 -12
deleted file mode 100644
index 7961f014bef..00000000000
@@ -1,12 +0,0 @@
-# Defaults for dhcp-relay initscript
-# sourced by /etc/init.d/dhcp-relay
-
-# What servers should the DHCP relay forward requests to?
-# e.g: SERVERS="192.168.0.1"
-SERVERS=""
-
-# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests?
-INTERFACES=""
-
-# Additional options that are passed to the DHCP relay daemon?
-OPTIONS=""
meta/recipes-connectivity/dhcp/files/default-server deleted +0 -7
deleted file mode 100644
index 0385d169922..00000000000
@@ -1,7 +0,0 @@
-# Defaults for dhcp initscript
-# sourced by /etc/init.d/dhcp-server
-# installed at /etc/default/dhcp-server by the maintainer scripts
-
-# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
-#       Separate multiple interfaces with spaces, e.g. "eth0 eth1".
-INTERFACES=""
meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper deleted +0 -39
deleted file mode 100644
index 7d0e224a1df..00000000000
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# In case the interface is used for nfs, skip it.
-nfsroot=0
-interfaces=""
-exec 9<&0 < /proc/mounts
-while read dev mtpt fstype rest; do
-    if test $mtpt = "/" ; then
-        case $fstype in
-            nfs | nfs4)
-                nfsroot=1
-                nfs_addr=`echo $rest | sed -e 's/^.*addr=\([0-9.]*\).*$/\1/'`
-                break
-                ;;
-            *)
-                ;;
-        esac
-    fi
-done
-exec 0<&9 9<&-
-
-if [ $nfsroot -eq 0 ]; then
-    interfaces="$INTERFACES"
-else
-    if [ -x /bin/ip -o -x /sbin/ip ] ; then
-       nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'`
-    fi
-    for i in $INTERFACES; do
-       if test "x$i" = "x$nfs_iface"; then
-            echo "dhclient skipping nfsroot interface $i"
-       else
-           interfaces="$interfaces $i"
-       fi
-    done
-fi
-
-if test "x$interfaces" != "x"; then
-    /sbin/dhclient -d -cf /etc/dhcp/dhclient.conf -q -lf /var/lib/dhcp/dhclient.leases $interfaces
-fi
meta/recipes-connectivity/dhcp/files/dhclient.conf deleted +0 -50
deleted file mode 100644
index 0e6dcf96c21..00000000000
@@ -1,50 +0,0 @@
-# Configuration file for /sbin/dhclient, which is included in Debian's
-#      dhcp3-client package.
-#
-# This is a sample configuration file for dhclient. See dhclient.conf's
-#      man page for more information about the syntax of this file
-#      and a more comprehensive list of the parameters understood by
-#      dhclient.
-#
-# Normally, if the DHCP server provides reasonable information and does
-#      not leave anything out (like the domain name, for example), then
-#      few changes must be made to this file, if any.
-#
-
-#send host-name "andare.fugue.com";
-#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
-#send dhcp-lease-time 3600;
-#supersede domain-name "fugue.com home.vix.com";
-#prepend domain-name-servers 127.0.0.1;
-request subnet-mask, broadcast-address, time-offset, routers,
-       domain-name, domain-name-servers, host-name,
-       netbios-name-servers, netbios-scope;
-#require subnet-mask, domain-name-servers;
-#timeout 60;
-#retry 60;
-#reboot 10;
-#select-timeout 5;
-#initial-interval 2;
-#script "/etc/dhcp3/dhclient-script";
-#media "-link0 -link1 -link2", "link0 link1";
-#reject 192.33.137.209;
-
-#alias {
-#  interface "eth0";
-#  fixed-address 192.5.5.213;
-#  option subnet-mask 255.255.255.255;
-#}
-
-#lease {
-#  interface "eth0";
-#  fixed-address 192.33.137.200;
-#  medium "link0 link1";
-#  option host-name "andare.swiftmedia.com";
-#  option subnet-mask 255.255.255.0;
-#  option broadcast-address 192.33.137.255;
-#  option routers 192.33.137.250;
-#  option domain-name-servers 127.0.0.1;
-#  renew 2 2000/1/12 00:00:01;
-#  rebind 2 2000/1/12 00:00:01;
-#  expire 2 2000/1/12 00:00:01;
-#}
meta/recipes-connectivity/dhcp/files/dhclient.service deleted +0 -13
deleted file mode 100644
index 9ddb4d1dfe9..00000000000
@@ -1,13 +0,0 @@
-[Unit]
-Description=Dynamic Host Configuration Protocol (DHCP)
-Wants=network.target
-Before=network.target
-After=systemd-udevd.service
-
-[Service]
-EnvironmentFile=-@SYSCONFDIR@/default/dhcp-client
-ExecStart=@BASE_SBINDIR@/dhclient-systemd-wrapper
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/dhcpd.conf deleted +0 -108
deleted file mode 100644
index 0001c0f00e2..00000000000
@@ -1,108 +0,0 @@
-#
-# Sample configuration file for ISC dhcpd for Debian
-#
-# $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
-#
-
-# The ddns-updates-style parameter controls whether or not the server will
-# attempt to do a DNS update when a lease is confirmed. We default to the
-# behavior of the version 2 packages ('none', since DHCP v2 didn't
-# have support for DDNS.)
-ddns-update-style none;
-
-# option definitions common to all supported networks...
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-# If this DHCP server is the official DHCP server for the local
-# network, the authoritative directive should be uncommented.
-#authoritative;
-
-# Use this to send dhcp log messages to a different log file (you also
-# have to hack syslog.conf to complete the redirection).
-log-facility local7;
-
-# No service will be given on this subnet, but declaring it helps the
-# DHCP server to understand the network topology.
-
-#subnet 10.152.187.0 netmask 255.255.255.0 {
-#}
-
-# This is a very basic subnet declaration.
-
-#subnet 10.254.239.0 netmask 255.255.255.224 {
-#  range 10.254.239.10 10.254.239.20;
-#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
-#}
-
-# This declaration allows BOOTP clients to get dynamic addresses,
-# which we don't really recommend.
-
-#subnet 10.254.239.32 netmask 255.255.255.224 {
-#  range dynamic-bootp 10.254.239.40 10.254.239.60;
-#  option broadcast-address 10.254.239.31;
-#  option routers rtr-239-32-1.example.org;
-#}
-
-# A slightly different configuration for an internal subnet.
-#subnet 10.5.5.0 netmask 255.255.255.224 {
-#  range 10.5.5.26 10.5.5.30;
-#  option domain-name-servers ns1.internal.example.org;
-#  option domain-name "internal.example.org";
-#  option routers 10.5.5.1;
-#  option broadcast-address 10.5.5.31;
-#  default-lease-time 600;
-#  max-lease-time 7200;
-#}
-
-# Hosts which require special configuration options can be listed in
-# host statements.   If no address is specified, the address will be
-# allocated dynamically (if possible), but the host-specific information
-# will still come from the host declaration.
-
-#host passacaglia {
-#  hardware ethernet 0:0:c0:5d:bd:95;
-#  filename "vmunix.passacaglia";
-#  server-name "toccata.fugue.com";
-#}
-
-# Fixed IP addresses can also be specified for hosts.   These addresses
-# should not also be listed as being available for dynamic assignment.
-# Hosts for which fixed IP addresses have been specified can boot using
-# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
-# be booted with DHCP, unless there is an address range on the subnet
-# to which a BOOTP client is connected which has the dynamic-bootp flag
-# set.
-#host fantasia {
-#  hardware ethernet 08:00:07:26:c0:a5;
-#  fixed-address fantasia.fugue.com;
-#}
-
-# You can declare a class of clients and then do address allocation
-# based on that.   The example below shows a case where all clients
-# in a certain class get addresses on the 10.17.224/24 subnet, and all
-# other clients get addresses on the 10.0.29/24 subnet.
-
-#class "foo" {
-#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
-#}
-
-#shared-network 224-29 {
-#  subnet 10.17.224.0 netmask 255.255.255.0 {
-#    option routers rtr-224.example.org;
-#  }
-#  subnet 10.0.29.0 netmask 255.255.255.0 {
-#    option routers rtr-29.example.org;
-#  }
-#  pool {
-#    allow members of "foo";
-#    range 10.17.224.10 10.17.224.250;
-#  }
-#  pool {
-#    deny members of "foo";
-#    range 10.0.29.10 10.0.29.230;
-#  }
-#}
meta/recipes-connectivity/dhcp/files/dhcpd.service deleted +0 -15
deleted file mode 100644
index ae4f93eca5b..00000000000
@@ -1,15 +0,0 @@
-[Unit]
-Description=DHCPv4 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-PIDFile=@localstatedir@/run/dhcpd.pid
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
-EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcp-server
-ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd.leases
-ExecStart=@SBINDIR@/dhcpd -f -cf @SYSCONFDIR@/dhcp/dhcpd.conf -pf @localstatedir@/run/dhcpd.pid $DHCPDARGS -q $INTERFACES
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/dhcpd6.service deleted +0 -15
deleted file mode 100644
index 52a6224dc2c..00000000000
@@ -1,15 +0,0 @@
-[Unit]
-Description=DHCPv6 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-PIDFile=@localstatedir@/run/dhcpd6.pid
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
-EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcpd6
-ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd6.leases
-ExecStart=@SBINDIR@/dhcpd -f -6 -cf @SYSCONFDIR@/dhcp/dhcpd6.conf -pf @localstatedir@/run/dhcpd6.pid $DHCPDARGS -q $INTERFACES
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/dhcrelay.service deleted +0 -10
deleted file mode 100644
index 15ff927d346..00000000000
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCP Relay Agent Daemon
-After=network.target
-
-[Service]
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay
-ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/dhcp/files/init-relay deleted +0 -44
deleted file mode 100644
index 019a7e84cf4..00000000000
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $
-#
-
-# It is not safe to start if we don't have a default configuration...
-if [ ! -f /etc/default/dhcp-relay ]; then
-       echo "/etc/default/dhcp-relay does not exist! - Aborting..."
-       echo "create this file to fix the problem."
-       exit 1
-fi
-
-# Read init script configuration (interfaces the daemon should listen on
-# and the DHCP server we should forward requests to.)
-. /etc/default/dhcp-relay
-
-# Build command line for interfaces (will be passed to dhrelay below.)
-IFCMD=""
-if test "$INTERFACES" != ""; then
-       for I in $INTERFACES; do
-               IFCMD=${IFCMD}"-i "${I}" "
-       done
-fi
-
-DHCRELAYPID=/var/run/dhcrelay.pid
-
-case "$1" in
-       start)
-               start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS
-               ;;
-       stop)
-               start-stop-daemon -K -x /usr/sbin/dhcrelay
-               ;;
-       restart | force-reload)
-               $0 stop
-               sleep 2
-               $0 start
-               ;;
-       *)
-               echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}"
-               exit 1
-esac
-
-exit 0
meta/recipes-connectivity/dhcp/files/init-server deleted +0 -45
deleted file mode 100644
index 5e693adf785..00000000000
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
-#
-
-test -f /usr/sbin/dhcpd || exit 0
-
-# It is not safe to start if we don't have a default configuration...
-if [ ! -f /etc/default/dhcp-server ]; then
-       echo "/etc/default/dhcp-server does not exist! - Aborting..."
-       exit 0
-fi
-
-# Read init script configuration (so far only interfaces the daemon
-# should listen on.)
-. /etc/default/dhcp-server
-
-case "$1" in
-       start)
-               echo -n "Starting DHCP server: "
-               test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
-               test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
-               start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES -user dhcp -group dhcp
-               echo "."
-               ;;
-       stop)
-               echo -n "Stopping DHCP server: dhcpd3"
-               start-stop-daemon -K -x /usr/sbin/dhcpd
-               echo "."
-               ;;
-       restart | force-reload)
-               $0 stop
-               sleep 2
-               $0 start
-               if [ "$?" != "0" ]; then
-                       exit 1
-               fi
-               ;;
-       *)
-               echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}"
-               exit 1
-esac
-
-exit 0
--

2.17.1

#12 lore raw

Re: [OE-core] [PATCH 6/8] dhcp: remove from core

In reply to akuster
Quoted 3 lines · On Wednesday, 2 September 2020 03:22:34 NZDT akuster wrote:

update maintainers.inc too

Thanks for doing this work. One request for the future though, if you could include in the commit message a brief explanation for changes like this (as simple as "Functionally replaced by kea (server-side) and dhcpcd (client side)" that would be much appreciated by folks looking back through the history :)

Cheers
Paul

author
#13 lore raw

PATCH 7/8 bind: Add 9.16.x

In reply to akuster

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
 ...1-avoid-start-failure-with-bind-user.patch |  27 ++
 ...d-V-and-start-log-hide-build-options.patch |  35 ++
 ...ching-for-json-headers-searches-sysr.patch |  47 +++
 .../bind/bind-9.16.5/bind9                    |   2 +
 .../bind/bind-9.16.5/conf.patch               | 330 ++++++++++++++++++
 .../bind/bind-9.16.5/generate-rndc-key.sh     |   8 +
 ...t.d-add-support-for-read-only-rootfs.patch |  65 ++++
 .../make-etc-initd-bind-stop-work.patch       |  42 +++
 .../bind/bind-9.16.5/named.service            |  22 ++
 meta/recipes-connectivity/bind/bind_9.16.5.bb | 125 +++++++
 10 files changed, 703 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind9
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/conf.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/named.service
 create mode 100644 meta/recipes-connectivity/bind/bind_9.16.5.bb
meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch new file +27 -0
new file mode 100644
index 00000000000..8db96ec049c
@@ -0,0 +1,27 @@
+From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 15 Oct 2018 16:55:09 +0800
+Subject: [PATCH] avoid start failure with bind user
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d b/init.d
+index b2eec60..6e03936 100644
+--- a/init.d
++++ b/init.d
+@@ -57,6 +57,7 @@ case "$1" in
+ 	modprobe capability >/dev/null 2>&1 || true
+ 	if [ ! -f /etc/bind/rndc.key ]; then
+ 	    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++	    chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
+ 	    chmod 0640 /etc/bind/rndc.key
+ 	fi
+ 	if [ -f /var/run/named/named.pid ]; then
+-- 
+2.7.4
+
meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file +35 -0
new file mode 100644
index 00000000000..5bcc16c9b2b
@@ -0,0 +1,35 @@
+From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with *** (options are hidden)
+[snip]
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
+---
+ bin/named/include/named/globals.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port	       INIT(0);
+ EXTERN isc_dscp_t named_g_dscp	       INIT(-1);
meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch new file +47 -0

47 lines not on this page · raw message

meta/recipes-connectivity/bind/bind-9.16.5/bind9 new file +2 -0
new file mode 100644
index 00000000000..968679ff7f7
@@ -0,0 +1,2 @@
+# startup options for the server
+OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind-9.16.5/conf.patch new file +330 -0

330 lines not on this page · raw message

meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh new file +8 -0
new file mode 100644
index 00000000000..ef915c0ae5a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -s /etc/bind/rndc.key ]; then
+    echo -n "Generating /etc/bind/rndc.key:"
+    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
+    chown root:bind /etc/bind/rndc.key
+    chmod 0640 /etc/bind/rndc.key
+fi
meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch new file +65 -0

65 lines not on this page · raw message

meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch new file +42 -0

42 lines not on this page · raw message

meta/recipes-connectivity/bind/bind-9.16.5/named.service new file +22 -0
new file mode 100644
index 00000000000..cda56ef0150
@@ -0,0 +1,22 @@
+[Unit]
+Description=Berkeley Internet Name Domain (DNS)
+Wants=nss-lookup.target
+Before=nss-lookup.target
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/bind9
+PIDFile=/run/named/named.pid
+
+ExecStartPre=@SBINDIR@/generate-rndc-key.sh
+ExecStart=@SBINDIR@/named $OPTIONS
+
+ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
+
+ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
+
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +125 -0

125 lines not on this page · raw message

Signature · 1 line
2.17.1
#14 lore raw

Re: [OE-core] [PATCH 7/8] bind: Add 9.16.x

Hello Armin,

Quoted 774 lines · akuster

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
 ...1-avoid-start-failure-with-bind-user.patch |  27 ++
 ...d-V-and-start-log-hide-build-options.patch |  35 ++
 ...ching-for-json-headers-searches-sysr.patch |  47 +++
 .../bind/bind-9.16.5/bind9                    |   2 +
 .../bind/bind-9.16.5/conf.patch               | 330 ++++++++++++++++++
 .../bind/bind-9.16.5/generate-rndc-key.sh     |   8 +
 ...t.d-add-support-for-read-only-rootfs.patch |  65 ++++
 .../make-etc-initd-bind-stop-work.patch       |  42 +++
 .../bind/bind-9.16.5/named.service            |  22 ++
 meta/recipes-connectivity/bind/bind_9.16.5.bb | 125 +++++++
 10 files changed, 703 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind9
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/conf.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/named.service
 create mode 100644 meta/recipes-connectivity/bind/bind_9.16.5.bb
meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch new file +27 -0
new file mode 100644
index 00000000000..8db96ec049c
@@ -0,0 +1,27 @@
+From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 15 Oct 2018 16:55:09 +0800
+Subject: [PATCH] avoid start failure with bind user
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d b/init.d
+index b2eec60..6e03936 100644
+--- a/init.d
++++ b/init.d
+@@ -57,6 +57,7 @@ case "$1" in
+       modprobe capability >/dev/null 2>&1 || true
+       if [ ! -f /etc/bind/rndc.key ]; then
+           /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
+           chmod 0640 /etc/bind/rndc.key
+       fi
+       if [ -f /var/run/named/named.pid ]; then
+--
+2.7.4
+
meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file +35 -0
new file mode 100644
index 00000000000..5bcc16c9b2b
@@ -0,0 +1,35 @@
+From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with *** (options are hidden)
+[snip]
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
+---
+ bin/named/include/named/globals.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port        INIT(0);
+ EXTERN isc_dscp_t named_g_dscp               INIT(-1);
meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch new file +47 -0
new file mode 100644
index 00000000000..f9cdc7ca4df
@@ -0,0 +1,47 @@
+From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <[email protected]>
+Date: Tue, 9 Jun 2015 11:22:00 -0400
+Subject: [PATCH] bind: ensure searching for json headers searches sysroot
+
+Bind can fail configure by detecting headers w/o libs[1], or
+it can fail the host contamination check as per below:
+
+ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build'
+ERROR: Function failed: do_qa_configure
+ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242
+ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1'
+NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed.
+No currently running tasks (773 of 781)
+
+Summary: 1 task failed:
+  /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure
+
+One way to fix it would be to unconditionally disable json in bind
+configure[2] but here we fix it by using the path to where we would
+put the header if we had json in the sysroot, in case someone wants
+to make use of the combination some day.
+
+[1] https://trac.macports.org/ticket/45305
+[2] https://trac.macports.org/changeset/126406
+
+Upstream-Status: Inappropriate [OE Specific]
+Signed-off-by: Paul Gortmaker <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.4/configure.ac
+===================================================================
+--- bind-9.16.4.orig/configure.ac
++++ bind-9.16.4/configure.ac
+@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
+               LMDB_LIBS=""
+               ;;
+       auto|yes)
+-              for d in /usr /usr/local /opt/local
++              for d in "${STAGING_INCDIR}"
+               do
+                       if test -f "${d}/include/lmdb.h"
+                       then
meta/recipes-connectivity/bind/bind-9.16.5/bind9 new file +2 -0
new file mode 100644
index 00000000000..968679ff7f7
@@ -0,0 +1,2 @@
+# startup options for the server
+OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind-9.16.5/conf.patch new file +330 -0
new file mode 100644
index 00000000000..aad345f9fcf
@@ -0,0 +1,330 @@
+Upstream-Status: Inappropriate [configuration]
+
+the patch is imported from openembedded project
+
+11/30/2010 - Qing He <[email protected]>
+
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0  1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0       2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++1.0.0 IN      PTR     localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL  86400
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                        86400 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255
+--- bind-9.3.1.orig/conf/db.255        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.255     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reserve data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++@     IN      A       127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root       1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root    2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options:  printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;.                            IN      NS
++
++;; ANSWER SECTION:
++.                     518400  IN      NS      A.ROOT-SERVERS.NET.
++.                     518400  IN      NS      B.ROOT-SERVERS.NET.
++.                     518400  IN      NS      C.ROOT-SERVERS.NET.
++.                     518400  IN      NS      D.ROOT-SERVERS.NET.
++.                     518400  IN      NS      E.ROOT-SERVERS.NET.
++.                     518400  IN      NS      F.ROOT-SERVERS.NET.
++.                     518400  IN      NS      G.ROOT-SERVERS.NET.
++.                     518400  IN      NS      H.ROOT-SERVERS.NET.
++.                     518400  IN      NS      I.ROOT-SERVERS.NET.
++.                     518400  IN      NS      J.ROOT-SERVERS.NET.
++.                     518400  IN      NS      K.ROOT-SERVERS.NET.
++.                     518400  IN      NS      L.ROOT-SERVERS.NET.
++.                     518400  IN      NS      M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET.   3600000 IN      A       198.41.0.4
++B.ROOT-SERVERS.NET.   3600000 IN      A       192.228.79.201
++C.ROOT-SERVERS.NET.   3600000 IN      A       192.33.4.12
++D.ROOT-SERVERS.NET.   3600000 IN      A       128.8.10.90
++E.ROOT-SERVERS.NET.   3600000 IN      A       192.203.230.10
++F.ROOT-SERVERS.NET.   3600000 IN      A       192.5.5.241
++G.ROOT-SERVERS.NET.   3600000 IN      A       192.112.36.4
++H.ROOT-SERVERS.NET.   3600000 IN      A       128.63.2.53
++I.ROOT-SERVERS.NET.   3600000 IN      A       192.36.148.17
++J.ROOT-SERVERS.NET.   3600000 IN      A       192.58.128.30
++K.ROOT-SERVERS.NET.   3600000 IN      A       193.0.14.129
++L.ROOT-SERVERS.NET.   3600000 IN      A       198.32.64.12
++M.ROOT-SERVERS.NET.   3600000 IN      A       202.12.27.33
++
++;; Query time: 81 msec
++;; SERVER: 198.41.0.4#53(a.root-servers.net.)
++;; WHEN: Sun Feb  1 11:27:14 2004
++;; MSG SIZE  rcvd: 436
++
+diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+--- bind-9.3.1.orig/conf/named.conf    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200
+@@ -0,0 +1,49 @@
++// This is the primary configuration file for the BIND DNS server named.
++//
++// If you are just adding zones, please do that in /etc/bind/named.conf.local
++
++include "/etc/bind/named.conf.options";
++
++// prime the server with knowledge of the root servers
++zone "." {
++      type hint;
++      file "/etc/bind/db.root";
++};
++
++// be authoritative for the localhost forward and reverse zones, and for
++// broadcast zones as per RFC 1912
++
++zone "localhost" {
++      type master;
++      file "/etc/bind/db.local";
++};
++
++zone "127.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.127";
++};
++
++zone "0.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.0";
++};
++
++zone "255.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.255";
++};
++
++// zone "com" { type delegation-only; };
++// zone "net" { type delegation-only; };
++
++// From the release notes:
++//  Because many of our users are uncomfortable receiving undelegated answers
++//  from root or top level domains, other than a few for whom that behaviour
++//  has been trusted and expected for quite some length of time, we have now
++//  introduced the "root-delegations-only" feature which applies delegation-only
++//  logic to all top level domains, and to the root domain.  An exception list
++//  should be specified, including "MUSEUM" and "DE", and any other top level
++//  domains from whom undelegated responses are expected and trusted.
++// root-delegation-only exclude { "DE"; "MUSEUM"; };
++
++include "/etc/bind/named.conf.local";
+diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+--- bind-9.3.1.orig/conf/named.conf.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.local   2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,8 @@
++//
++// Do any local configuration here
++//
++
++// Consider adding the 1918 zones here, if they are not used in your
++// organization
++//include "/etc/bind/zones.rfc1918";
++
+diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
+--- bind-9.3.1.orig/conf/named.conf.options    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,24 @@
++options {
++      directory "/var/cache/bind";
++
++      // If there is a firewall between you and nameservers you want
++      // to talk to, you might need to uncomment the query-source
++      // directive below.  Previous versions of BIND always asked
++      // questions using port 53, but BIND 8.1 and later use an unprivileged
++      // port by default.
++
++      // query-source address * port 53;
++
++      // If your ISP provided one or more IP addresses for stable
++      // nameservers, you probably want to use them as forwarders.
++      // Uncomment the following block, and insert the addresses replacing
++      // the all-0's placeholder.
++
++      // forwarders {
++      //      0.0.0.0;
++      // };
++
++      auth-nxdomain no;    # conform to RFC1035
++
++};
++
+diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/zones.rfc1918      2005-07-10 22:14:10.000000000 +0200
+@@ -0,0 +1,20 @@
++zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
++
++zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++
++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
+--- bind-9.3.1.orig/init.d     1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/init.d  2005-07-10 23:09:58.000000000 +0200
+@@ -0,0 +1,70 @@
++#!/bin/sh
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++
++# for a chrooted server: "-u bind -t /var/lib/named"
++# Don't modify this line, change or create /etc/default/bind9.
++OPTIONS=""
++
++test -f /etc/default/bind9 && . /etc/default/bind9
++
++test -x /usr/sbin/rndc || exit 0
++
++case "$1" in
++    start)
++      echo -n "Starting domain name service: named"
++
++      modprobe capability >/dev/null 2>&1 || true
++      if [ ! -f /etc/bind/rndc.key ]; then
++          /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chmod 0640 /etc/bind/rndc.key
++      fi
++      if [ -f /var/run/named/named.pid ]; then
++          ps `cat /var/run/named/named.pid` > /dev/null && exit 1
++      fi
++
++      # dirs under /var/run can go away on reboots.
++      mkdir -p /var/run/named
++      mkdir -p /var/cache/bind
++      chmod 775 /var/run/named
++      chown root:bind /var/run/named >/dev/null 2>&1 || true
++
++      if [ ! -x /usr/sbin/named ]; then
++          echo "named binary missing - not starting"
++          exit 1
++      fi
++      if start-stop-daemon --start --quiet --exec /usr/sbin/named \
++              --pidfile /var/run/named/named.pid -- $OPTIONS; then
++          if [ -x /sbin/resolvconf ] ; then
++              echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
++          fi
++      fi
++      echo "."
++    ;;
++
++    stop)
++      echo -n "Stopping domain name service: named"
++      if [ -x /sbin/resolvconf ]; then
++          /sbin/resolvconf -d lo
++      fi
++      /usr/sbin/rndc stop >/dev/null 2>&1
++      echo "."
++    ;;
++
++    reload)
++      /usr/sbin/rndc reload
++    ;;
++
++    restart|force-reload)
++      $0 stop
++      sleep 2
++      $0 start
++    ;;
++
++    *)
++      echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
++      exit 1
++    ;;
++esac
++
++exit 0
meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh new file +8 -0
new file mode 100644
index 00000000000..ef915c0ae5a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -s /etc/bind/rndc.key ]; then
+    echo -n "Generating /etc/bind/rndc.key:"
+    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
+    chown root:bind /etc/bind/rndc.key
+    chmod 0640 /etc/bind/rndc.key
+fi
meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch new file +65 -0
new file mode 100644
index 00000000000..11db95ede12
@@ -0,0 +1,65 @@
+Subject: init.d: add support for read-only rootfs
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/init.d b/init.d
+index 0111ed4..24677c8 100644
+--- a/init.d
++++ b/init.d
+@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ # Don't modify this line, change or create /etc/default/bind9.
+ OPTIONS=""
+
++test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/bind9 && . /etc/default/bind9
+
++# This function is here because it's possible that /var and / are on different partitions.
++is_on_read_only_partition () {
++    DIRECTORY=$1
++    dir=`readlink -f $DIRECTORY`
++    while true; do
++      if [ ! -d "$dir" ]; then
++          echo "ERROR: $dir is not a directory"
++          exit 1
++      else
++          for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \
++              END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do
++              [ "$flag" = "FOUND" ] && partition="read-write"
++              [ "$flag" = "ro" ] && { partition="read-only"; break; }
++          done
++          if [ "$dir" = "/" -o -n "$partition" ]; then
++              break
++          else
++              dir=`dirname $dir`
++          fi
++      fi
++    done
++    [ "$partition" = "read-only" ] && echo "yes" || echo "no"
++}
++
++bind_mount () {
++    olddir=$1
++    newdir=$2
++    mkdir -p $olddir
++    cp -a $newdir/* $olddir
++    mount --bind $olddir $newdir
++}
++
++# Deal with read-only rootfs
++if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
++    [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs"
++    [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind
++    [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named
++fi
++
+ test -x /usr/sbin/rndc || exit 0
+
+ case "$1" in
+--
+1.7.9.5
+
meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch new file +42 -0
new file mode 100644
index 00000000000..146f3e35db6
@@ -0,0 +1,42 @@
+bind: make "/etc/init.d/bind stop" work
+
+Upstream-Status: Inappropriate [configuration]
+
+Add some configurations, make rndc command be able to controls
+the named daemon.
+
+Signed-off-by: Roy Li <[email protected]>
+---
+ conf/named.conf |    5 +++++
+ conf/rndc.conf  |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+ create mode 100644 conf/rndc.conf
+
+diff --git a/conf/named.conf b/conf/named.conf
+index 95829cf..c8899e7 100644
+--- a/conf/named.conf
++++ b/conf/named.conf
+@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" {
+ // root-delegation-only exclude { "DE"; "MUSEUM"; };
+
+ include "/etc/bind/named.conf.local";
++include "/etc/bind/rndc.key" ;
++controls {
++      inet 127.0.0.1 allow { localhost; }
++      keys { rndc-key; };
++};
+diff --git a/conf/rndc.conf b/conf/rndc.conf
+new file mode 100644
+index 0000000..a0b481d
+--- /dev/null
++++ b/conf/rndc.conf
+@@ -0,0 +1,5 @@
++include "/etc/bind/rndc.key";
++options {
++      default-server  localhost;
++      default-key     rndc-key;
++};
+
+--
+1.7.5.4
+
meta/recipes-connectivity/bind/bind-9.16.5/named.service new file +22 -0
new file mode 100644
index 00000000000..cda56ef0150
@@ -0,0 +1,22 @@
+[Unit]
+Description=Berkeley Internet Name Domain (DNS)
+Wants=nss-lookup.target
+Before=nss-lookup.target
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/bind9
+PIDFile=/run/named/named.pid
+
+ExecStartPre=@SBINDIR@/generate-rndc-key.sh
+ExecStart=@SBINDIR@/named $OPTIONS
+
+ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
+
+ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
+
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +99 -0
new file mode 100644
index 00000000000..9c20ccc6fa2
@@ -0,0 +1,125 @@
+SUMMARY = "ISC Internet Domain Name Server"
+HOMEPAGE = "http://www.isc.org/sw/bind/"
+SECTION = "console/network"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1"
+
+DEPENDS = "openssl libcap zlib libuv"
+
+SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
+           file://conf.patch \
+           file://named.service \
+           file://bind9 \
+           file://generate-rndc-key.sh \
+           file://make-etc-initd-bind-stop-work.patch \
+           file://init.d-add-support-for-read-only-rootfs.patch \
+           file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
+           file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
+           file://0001-avoid-start-failure-with-bind-user.patch \
+           "
+
+SRC_URI[sha256sum] = "6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075"
+
+UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
+# stay at 9.16 follow the ESV versions divisible by 4
+UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/"
+
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
+
+# PACKAGECONFIGs readline and libedit should NOT be set at same time
+PACKAGECONFIG ?= "readline"
+PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
+PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
+PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
+PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native,"
+
+EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \
+                 --with-gssapi=no --with-lmdb=no --with-zlib \
+                 --sysconfdir=${sysconfdir}/bind \
+                 --with-openssl=${STAGING_DIR_HOST}${prefix} \
+               "
+LDFLAGS_append = " -lz"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)}
+
+# dhcp needs .la so keep them
+REMOVE_LIBTOOL_LA = "0"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
+                       --user-group bind"
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "named.service"
+
+do_install_append() {
+
+       rmdir "${D}${localstatedir}/run"
+       rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+       install -d -o bind "${D}${localstatedir}/cache/bind"
+       install -d "${D}${sysconfdir}/bind"
+       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}
+       install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+       sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+              -e 's,@SBINDIR@,${sbindir},g' \
+              ${D}${systemd_unitdir}/system/named.service
+
+       install -d ${D}${sysconfdir}/default
+       install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               install -d ${D}${sysconfdir}/tmpfiles.d
+               echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
+       fi
+
+    oe_multilib_header isc/platform.h
+}
+
+CONFFILES_${PN} = " \
+       ${sysconfdir}/bind/named.conf \
+       ${sysconfdir}/bind/named.conf.local \
+       ${sysconfdir}/bind/named.conf.options \

meta/recipes-connectivity/bind/bind_9.16.5.bb line 109

Quoted 10 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +10 -0
+       ${sysconfdir}/bind/db.0 \
+       ${sysconfdir}/bind/db.127 \
+       ${sysconfdir}/bind/db.empty \
+       ${sysconfdir}/bind/db.local \
+       ${sysconfdir}/bind/db.root \
+       "
+
+ALTERNATIVE_${PN}-utils = "nslookup"
+ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup"
+ALTERNATIVE_PRIORITY = "100"

I'm seeing this failing with busybox:
update-alternatives: Error: not linking /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup to /bin/busybox.nosuid since /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup exists and is not a link

busybox sets ALTERNATIVE_PRIORITY = "50". Can this be the issue?

Going back to bind 9.11.22 seems to solve it...

Quoted 20 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +16 -1
+
+PACKAGE_BEFORE_PN += "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate"
+FILES_${PN}-dev += "${bindir}/isc-config.h"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+
+PACKAGE_BEFORE_PN += "${PN}-libs"
+FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.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}"
+
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_python3-bind = "python3-core python3-ply"
--

2.17.1

Signature · 2 lines
Regards,
Andrey.
author
#15 lore raw

Re: [OE-core] [PATCH 7/8] bind: Add 9.16.x

Quoted 793 lines · Andrey Zhizhikin

Hello Armin,

Quoted 773 lines · akuster

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
 ...1-avoid-start-failure-with-bind-user.patch |  27 ++
 ...d-V-and-start-log-hide-build-options.patch |  35 ++
 ...ching-for-json-headers-searches-sysr.patch |  47 +++
 .../bind/bind-9.16.5/bind9                    |   2 +
 .../bind/bind-9.16.5/conf.patch               | 330 ++++++++++++++++++
 .../bind/bind-9.16.5/generate-rndc-key.sh     |   8 +
 ...t.d-add-support-for-read-only-rootfs.patch |  65 ++++
 .../make-etc-initd-bind-stop-work.patch       |  42 +++
 .../bind/bind-9.16.5/named.service            |  22 ++
 meta/recipes-connectivity/bind/bind_9.16.5.bb | 125 +++++++
 10 files changed, 703 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind9
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/conf.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/named.service
 create mode 100644 meta/recipes-connectivity/bind/bind_9.16.5.bb
meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch new file +27 -0
new file mode 100644
index 00000000000..8db96ec049c
@@ -0,0 +1,27 @@
+From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 15 Oct 2018 16:55:09 +0800
+Subject: [PATCH] avoid start failure with bind user
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d b/init.d
+index b2eec60..6e03936 100644
+--- a/init.d
++++ b/init.d
+@@ -57,6 +57,7 @@ case "$1" in
+       modprobe capability >/dev/null 2>&1 || true
+       if [ ! -f /etc/bind/rndc.key ]; then
+           /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
+           chmod 0640 /etc/bind/rndc.key
+       fi
+       if [ -f /var/run/named/named.pid ]; then
+--
+2.7.4
+
meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file +35 -0
new file mode 100644
index 00000000000..5bcc16c9b2b
@@ -0,0 +1,35 @@
+From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with *** (options are hidden)
+[snip]
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
+---
+ bin/named/include/named/globals.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port        INIT(0);
+ EXTERN isc_dscp_t named_g_dscp               INIT(-1);
meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch new file +47 -0
new file mode 100644
index 00000000000..f9cdc7ca4df
@@ -0,0 +1,47 @@
+From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <[email protected]>
+Date: Tue, 9 Jun 2015 11:22:00 -0400
+Subject: [PATCH] bind: ensure searching for json headers searches sysroot
+
+Bind can fail configure by detecting headers w/o libs[1], or
+it can fail the host contamination check as per below:
+
+ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build'
+ERROR: Function failed: do_qa_configure
+ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242
+ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1'
+NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed.
+No currently running tasks (773 of 781)
+
+Summary: 1 task failed:
+  /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure
+
+One way to fix it would be to unconditionally disable json in bind
+configure[2] but here we fix it by using the path to where we would
+put the header if we had json in the sysroot, in case someone wants
+to make use of the combination some day.
+
+[1] https://trac.macports.org/ticket/45305
+[2] https://trac.macports.org/changeset/126406
+
+Upstream-Status: Inappropriate [OE Specific]
+Signed-off-by: Paul Gortmaker <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.4/configure.ac
+===================================================================
+--- bind-9.16.4.orig/configure.ac
++++ bind-9.16.4/configure.ac
+@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
+               LMDB_LIBS=""
+               ;;
+       auto|yes)
+-              for d in /usr /usr/local /opt/local
++              for d in "${STAGING_INCDIR}"
+               do
+                       if test -f "${d}/include/lmdb.h"
+                       then
meta/recipes-connectivity/bind/bind-9.16.5/bind9 new file +2 -0
new file mode 100644
index 00000000000..968679ff7f7
@@ -0,0 +1,2 @@
+# startup options for the server
+OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind-9.16.5/conf.patch new file +330 -0
new file mode 100644
index 00000000000..aad345f9fcf
@@ -0,0 +1,330 @@
+Upstream-Status: Inappropriate [configuration]
+
+the patch is imported from openembedded project
+
+11/30/2010 - Qing He <[email protected]>
+
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0  1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0       2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++1.0.0 IN      PTR     localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL  86400
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                        86400 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255
+--- bind-9.3.1.orig/conf/db.255        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.255     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reserve data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++@     IN      A       127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root       1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root    2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options:  printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;.                            IN      NS
++
++;; ANSWER SECTION:
++.                     518400  IN      NS      A.ROOT-SERVERS.NET.
++.                     518400  IN      NS      B.ROOT-SERVERS.NET.
++.                     518400  IN      NS      C.ROOT-SERVERS.NET.
++.                     518400  IN      NS      D.ROOT-SERVERS.NET.
++.                     518400  IN      NS      E.ROOT-SERVERS.NET.
++.                     518400  IN      NS      F.ROOT-SERVERS.NET.
++.                     518400  IN      NS      G.ROOT-SERVERS.NET.
++.                     518400  IN      NS      H.ROOT-SERVERS.NET.
++.                     518400  IN      NS      I.ROOT-SERVERS.NET.
++.                     518400  IN      NS      J.ROOT-SERVERS.NET.
++.                     518400  IN      NS      K.ROOT-SERVERS.NET.
++.                     518400  IN      NS      L.ROOT-SERVERS.NET.
++.                     518400  IN      NS      M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET.   3600000 IN      A       198.41.0.4
++B.ROOT-SERVERS.NET.   3600000 IN      A       192.228.79.201
++C.ROOT-SERVERS.NET.   3600000 IN      A       192.33.4.12
++D.ROOT-SERVERS.NET.   3600000 IN      A       128.8.10.90
++E.ROOT-SERVERS.NET.   3600000 IN      A       192.203.230.10
++F.ROOT-SERVERS.NET.   3600000 IN      A       192.5.5.241
++G.ROOT-SERVERS.NET.   3600000 IN      A       192.112.36.4
++H.ROOT-SERVERS.NET.   3600000 IN      A       128.63.2.53
++I.ROOT-SERVERS.NET.   3600000 IN      A       192.36.148.17
++J.ROOT-SERVERS.NET.   3600000 IN      A       192.58.128.30
++K.ROOT-SERVERS.NET.   3600000 IN      A       193.0.14.129
++L.ROOT-SERVERS.NET.   3600000 IN      A       198.32.64.12
++M.ROOT-SERVERS.NET.   3600000 IN      A       202.12.27.33
++
++;; Query time: 81 msec
++;; SERVER: 198.41.0.4#53(a.root-servers.net.)
++;; WHEN: Sun Feb  1 11:27:14 2004
++;; MSG SIZE  rcvd: 436
++
+diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+--- bind-9.3.1.orig/conf/named.conf    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200
+@@ -0,0 +1,49 @@
++// This is the primary configuration file for the BIND DNS server named.
++//
++// If you are just adding zones, please do that in /etc/bind/named.conf.local
++
++include "/etc/bind/named.conf.options";
++
++// prime the server with knowledge of the root servers
++zone "." {
++      type hint;
++      file "/etc/bind/db.root";
++};
++
++// be authoritative for the localhost forward and reverse zones, and for
++// broadcast zones as per RFC 1912
++
++zone "localhost" {
++      type master;
++      file "/etc/bind/db.local";
++};
++
++zone "127.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.127";
++};
++
++zone "0.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.0";
++};
++
++zone "255.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.255";
++};
++
++// zone "com" { type delegation-only; };
++// zone "net" { type delegation-only; };
++
++// From the release notes:
++//  Because many of our users are uncomfortable receiving undelegated answers
++//  from root or top level domains, other than a few for whom that behaviour
++//  has been trusted and expected for quite some length of time, we have now
++//  introduced the "root-delegations-only" feature which applies delegation-only
++//  logic to all top level domains, and to the root domain.  An exception list
++//  should be specified, including "MUSEUM" and "DE", and any other top level
++//  domains from whom undelegated responses are expected and trusted.
++// root-delegation-only exclude { "DE"; "MUSEUM"; };
++
++include "/etc/bind/named.conf.local";
+diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+--- bind-9.3.1.orig/conf/named.conf.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.local   2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,8 @@
++//
++// Do any local configuration here
++//
++
++// Consider adding the 1918 zones here, if they are not used in your
++// organization
++//include "/etc/bind/zones.rfc1918";
++
+diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
+--- bind-9.3.1.orig/conf/named.conf.options    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,24 @@
++options {
++      directory "/var/cache/bind";
++
++      // If there is a firewall between you and nameservers you want
++      // to talk to, you might need to uncomment the query-source
++      // directive below.  Previous versions of BIND always asked
++      // questions using port 53, but BIND 8.1 and later use an unprivileged
++      // port by default.
++
++      // query-source address * port 53;
++
++      // If your ISP provided one or more IP addresses for stable
++      // nameservers, you probably want to use them as forwarders.
++      // Uncomment the following block, and insert the addresses replacing
++      // the all-0's placeholder.
++
++      // forwarders {
++      //      0.0.0.0;
++      // };
++
++      auth-nxdomain no;    # conform to RFC1035
++
++};
++
+diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/zones.rfc1918      2005-07-10 22:14:10.000000000 +0200
+@@ -0,0 +1,20 @@
++zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
++
++zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++
++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
+--- bind-9.3.1.orig/init.d     1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/init.d  2005-07-10 23:09:58.000000000 +0200
+@@ -0,0 +1,70 @@
++#!/bin/sh
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++
++# for a chrooted server: "-u bind -t /var/lib/named"
++# Don't modify this line, change or create /etc/default/bind9.
++OPTIONS=""
++
++test -f /etc/default/bind9 && . /etc/default/bind9
++
++test -x /usr/sbin/rndc || exit 0
++
++case "$1" in
++    start)
++      echo -n "Starting domain name service: named"
++
++      modprobe capability >/dev/null 2>&1 || true
++      if [ ! -f /etc/bind/rndc.key ]; then
++          /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chmod 0640 /etc/bind/rndc.key
++      fi
++      if [ -f /var/run/named/named.pid ]; then
++          ps `cat /var/run/named/named.pid` > /dev/null && exit 1
++      fi
++
++      # dirs under /var/run can go away on reboots.
++      mkdir -p /var/run/named
++      mkdir -p /var/cache/bind
++      chmod 775 /var/run/named
++      chown root:bind /var/run/named >/dev/null 2>&1 || true
++
++      if [ ! -x /usr/sbin/named ]; then
++          echo "named binary missing - not starting"
++          exit 1
++      fi
++      if start-stop-daemon --start --quiet --exec /usr/sbin/named \
++              --pidfile /var/run/named/named.pid -- $OPTIONS; then
++          if [ -x /sbin/resolvconf ] ; then
++              echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
++          fi
++      fi
++      echo "."
++    ;;
++
++    stop)
++      echo -n "Stopping domain name service: named"
++      if [ -x /sbin/resolvconf ]; then
++          /sbin/resolvconf -d lo
++      fi
++      /usr/sbin/rndc stop >/dev/null 2>&1
++      echo "."
++    ;;
++
++    reload)
++      /usr/sbin/rndc reload
++    ;;
++
++    restart|force-reload)
++      $0 stop
++      sleep 2
++      $0 start
++    ;;
++
++    *)
++      echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
++      exit 1
++    ;;
++esac
++
++exit 0
meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh new file +8 -0
new file mode 100644
index 00000000000..ef915c0ae5a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -s /etc/bind/rndc.key ]; then
+    echo -n "Generating /etc/bind/rndc.key:"
+    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
+    chown root:bind /etc/bind/rndc.key
+    chmod 0640 /etc/bind/rndc.key
+fi
meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch new file +65 -0
new file mode 100644
index 00000000000..11db95ede12
@@ -0,0 +1,65 @@
+Subject: init.d: add support for read-only rootfs
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/init.d b/init.d
+index 0111ed4..24677c8 100644
+--- a/init.d
++++ b/init.d
+@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ # Don't modify this line, change or create /etc/default/bind9.
+ OPTIONS=""
+
++test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/bind9 && . /etc/default/bind9
+
++# This function is here because it's possible that /var and / are on different partitions.
++is_on_read_only_partition () {
++    DIRECTORY=$1
++    dir=`readlink -f $DIRECTORY`
++    while true; do
++      if [ ! -d "$dir" ]; then
++          echo "ERROR: $dir is not a directory"
++          exit 1
++      else
++          for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \
++              END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do
++              [ "$flag" = "FOUND" ] && partition="read-write"
++              [ "$flag" = "ro" ] && { partition="read-only"; break; }
++          done
++          if [ "$dir" = "/" -o -n "$partition" ]; then
++              break
++          else
++              dir=`dirname $dir`
++          fi
++      fi
++    done
++    [ "$partition" = "read-only" ] && echo "yes" || echo "no"
++}
++
++bind_mount () {
++    olddir=$1
++    newdir=$2
++    mkdir -p $olddir
++    cp -a $newdir/* $olddir
++    mount --bind $olddir $newdir
++}
++
++# Deal with read-only rootfs
++if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
++    [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs"
++    [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind
++    [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named
++fi
++
+ test -x /usr/sbin/rndc || exit 0
+
+ case "$1" in
+--
+1.7.9.5
+
meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch new file +42 -0
new file mode 100644
index 00000000000..146f3e35db6
@@ -0,0 +1,42 @@
+bind: make "/etc/init.d/bind stop" work
+
+Upstream-Status: Inappropriate [configuration]
+
+Add some configurations, make rndc command be able to controls
+the named daemon.
+
+Signed-off-by: Roy Li <[email protected]>
+---
+ conf/named.conf |    5 +++++
+ conf/rndc.conf  |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+ create mode 100644 conf/rndc.conf
+
+diff --git a/conf/named.conf b/conf/named.conf
+index 95829cf..c8899e7 100644
+--- a/conf/named.conf
++++ b/conf/named.conf
+@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" {
+ // root-delegation-only exclude { "DE"; "MUSEUM"; };
+
+ include "/etc/bind/named.conf.local";
++include "/etc/bind/rndc.key" ;
++controls {
++      inet 127.0.0.1 allow { localhost; }
++      keys { rndc-key; };
++};
+diff --git a/conf/rndc.conf b/conf/rndc.conf
+new file mode 100644
+index 0000000..a0b481d
+--- /dev/null
++++ b/conf/rndc.conf
+@@ -0,0 +1,5 @@
++include "/etc/bind/rndc.key";
++options {
++      default-server  localhost;
++      default-key     rndc-key;
++};
+
+--
+1.7.5.4
+
meta/recipes-connectivity/bind/bind-9.16.5/named.service new file +22 -0
new file mode 100644
index 00000000000..cda56ef0150
@@ -0,0 +1,22 @@
+[Unit]
+Description=Berkeley Internet Name Domain (DNS)
+Wants=nss-lookup.target
+Before=nss-lookup.target
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/bind9
+PIDFile=/run/named/named.pid
+
+ExecStartPre=@SBINDIR@/generate-rndc-key.sh
+ExecStart=@SBINDIR@/named $OPTIONS
+
+ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
+
+ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
+
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +99 -0
new file mode 100644
index 00000000000..9c20ccc6fa2
@@ -0,0 +1,125 @@
+SUMMARY = "ISC Internet Domain Name Server"
+HOMEPAGE = "http://www.isc.org/sw/bind/"
+SECTION = "console/network"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1"
+
+DEPENDS = "openssl libcap zlib libuv"
+
+SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
+           file://conf.patch \
+           file://named.service \
+           file://bind9 \
+           file://generate-rndc-key.sh \
+           file://make-etc-initd-bind-stop-work.patch \
+           file://init.d-add-support-for-read-only-rootfs.patch \
+           file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
+           file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
+           file://0001-avoid-start-failure-with-bind-user.patch \
+           "
+
+SRC_URI[sha256sum] = "6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075"
+
+UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
+# stay at 9.16 follow the ESV versions divisible by 4
+UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/"
+
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
+
+# PACKAGECONFIGs readline and libedit should NOT be set at same time
+PACKAGECONFIG ?= "readline"
+PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
+PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
+PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
+PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native,"
+
+EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \
+                 --with-gssapi=no --with-lmdb=no --with-zlib \
+                 --sysconfdir=${sysconfdir}/bind \
+                 --with-openssl=${STAGING_DIR_HOST}${prefix} \
+               "
+LDFLAGS_append = " -lz"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)}
+
+# dhcp needs .la so keep them
+REMOVE_LIBTOOL_LA = "0"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
+                       --user-group bind"
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "named.service"
+
+do_install_append() {
+
+       rmdir "${D}${localstatedir}/run"
+       rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+       install -d -o bind "${D}${localstatedir}/cache/bind"
+       install -d "${D}${sysconfdir}/bind"
+       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}
+       install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+       sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+              -e 's,@SBINDIR@,${sbindir},g' \
+              ${D}${systemd_unitdir}/system/named.service
+
+       install -d ${D}${sysconfdir}/default
+       install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               install -d ${D}${sysconfdir}/tmpfiles.d
+               echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
+       fi
+
+    oe_multilib_header isc/platform.h
+}
+
+CONFFILES_${PN} = " \
+       ${sysconfdir}/bind/named.conf \
+       ${sysconfdir}/bind/named.conf.local \
+       ${sysconfdir}/bind/named.conf.options \

meta/recipes-connectivity/bind/bind_9.16.5.bb line 109

Quoted 10 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +10 -0
+       ${sysconfdir}/bind/db.0 \
+       ${sysconfdir}/bind/db.127 \
+       ${sysconfdir}/bind/db.empty \
+       ${sysconfdir}/bind/db.local \
+       ${sysconfdir}/bind/db.root \
+       "
+
+ALTERNATIVE_${PN}-utils = "nslookup"
+ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup"
+ALTERNATIVE_PRIORITY = "100"

I'm seeing this failing with busybox:
update-alternatives: Error: not linking /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup to /bin/busybox.nosuid since /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup exists and is not a link

Quoted 1 line

busybox sets ALTERNATIVE_PRIORITY = "50". Can this be the issue?

That is weird. I would have expected that to be an issue with the old version too.

Got any steps to reproduce this?

-armin

Quoted 25 lines

Going back to bind 9.11.22 seems to solve it...

Quoted 20 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +16 -1
+
+PACKAGE_BEFORE_PN += "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate"
+FILES_${PN}-dev += "${bindir}/isc-config.h"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+
+PACKAGE_BEFORE_PN += "${PN}-libs"
+FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.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}"
+
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_python3-bind = "python3-core python3-ply"
--

2.17.1

#16 lore raw

Re: [OE-core] [PATCH 7/8] bind: Add 9.16.x

Quoted 797 lines · On Mon, Sep 7, 2020 at 5:28 PM akuster808 <[email protected]> wrote:
Quoted 793 lines · Andrey Zhizhikin

Hello Armin,

Quoted 773 lines · akuster

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
 ...1-avoid-start-failure-with-bind-user.patch |  27 ++
 ...d-V-and-start-log-hide-build-options.patch |  35 ++
 ...ching-for-json-headers-searches-sysr.patch |  47 +++
 .../bind/bind-9.16.5/bind9                    |   2 +
 .../bind/bind-9.16.5/conf.patch               | 330 ++++++++++++++++++
 .../bind/bind-9.16.5/generate-rndc-key.sh     |   8 +
 ...t.d-add-support-for-read-only-rootfs.patch |  65 ++++
 .../make-etc-initd-bind-stop-work.patch       |  42 +++
 .../bind/bind-9.16.5/named.service            |  22 ++
 meta/recipes-connectivity/bind/bind_9.16.5.bb | 125 +++++++
 10 files changed, 703 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind9
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/conf.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/named.service
 create mode 100644 meta/recipes-connectivity/bind/bind_9.16.5.bb
meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch new file +27 -0
new file mode 100644
index 00000000000..8db96ec049c
@@ -0,0 +1,27 @@
+From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 15 Oct 2018 16:55:09 +0800
+Subject: [PATCH] avoid start failure with bind user
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d b/init.d
+index b2eec60..6e03936 100644
+--- a/init.d
++++ b/init.d
+@@ -57,6 +57,7 @@ case "$1" in
+       modprobe capability >/dev/null 2>&1 || true
+       if [ ! -f /etc/bind/rndc.key ]; then
+           /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
+           chmod 0640 /etc/bind/rndc.key
+       fi
+       if [ -f /var/run/named/named.pid ]; then
+--
+2.7.4
+
meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file +35 -0
new file mode 100644
index 00000000000..5bcc16c9b2b
@@ -0,0 +1,35 @@
+From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with *** (options are hidden)
+[snip]
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
+---
+ bin/named/include/named/globals.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port        INIT(0);
+ EXTERN isc_dscp_t named_g_dscp               INIT(-1);
meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch new file +47 -0
new file mode 100644
index 00000000000..f9cdc7ca4df
@@ -0,0 +1,47 @@
+From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <[email protected]>
+Date: Tue, 9 Jun 2015 11:22:00 -0400
+Subject: [PATCH] bind: ensure searching for json headers searches sysroot
+
+Bind can fail configure by detecting headers w/o libs[1], or
+it can fail the host contamination check as per below:
+
+ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build'
+ERROR: Function failed: do_qa_configure
+ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242
+ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1'
+NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed.
+No currently running tasks (773 of 781)
+
+Summary: 1 task failed:
+  /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure
+
+One way to fix it would be to unconditionally disable json in bind
+configure[2] but here we fix it by using the path to where we would
+put the header if we had json in the sysroot, in case someone wants
+to make use of the combination some day.
+
+[1] https://trac.macports.org/ticket/45305
+[2] https://trac.macports.org/changeset/126406
+
+Upstream-Status: Inappropriate [OE Specific]
+Signed-off-by: Paul Gortmaker <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.4/configure.ac
+===================================================================
+--- bind-9.16.4.orig/configure.ac
++++ bind-9.16.4/configure.ac
+@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
+               LMDB_LIBS=""
+               ;;
+       auto|yes)
+-              for d in /usr /usr/local /opt/local
++              for d in "${STAGING_INCDIR}"
+               do
+                       if test -f "${d}/include/lmdb.h"
+                       then
meta/recipes-connectivity/bind/bind-9.16.5/bind9 new file +2 -0
new file mode 100644
index 00000000000..968679ff7f7
@@ -0,0 +1,2 @@
+# startup options for the server
+OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind-9.16.5/conf.patch new file +330 -0
new file mode 100644
index 00000000000..aad345f9fcf
@@ -0,0 +1,330 @@
+Upstream-Status: Inappropriate [configuration]
+
+the patch is imported from openembedded project
+
+11/30/2010 - Qing He <[email protected]>
+
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0  1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0       2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++1.0.0 IN      PTR     localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL  86400
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                        86400 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255
+--- bind-9.3.1.orig/conf/db.255        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.255     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reserve data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++@     IN      A       127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root       1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root    2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options:  printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;.                            IN      NS
++
++;; ANSWER SECTION:
++.                     518400  IN      NS      A.ROOT-SERVERS.NET.
++.                     518400  IN      NS      B.ROOT-SERVERS.NET.
++.                     518400  IN      NS      C.ROOT-SERVERS.NET.
++.                     518400  IN      NS      D.ROOT-SERVERS.NET.
++.                     518400  IN      NS      E.ROOT-SERVERS.NET.
++.                     518400  IN      NS      F.ROOT-SERVERS.NET.
++.                     518400  IN      NS      G.ROOT-SERVERS.NET.
++.                     518400  IN      NS      H.ROOT-SERVERS.NET.
++.                     518400  IN      NS      I.ROOT-SERVERS.NET.
++.                     518400  IN      NS      J.ROOT-SERVERS.NET.
++.                     518400  IN      NS      K.ROOT-SERVERS.NET.
++.                     518400  IN      NS      L.ROOT-SERVERS.NET.
++.                     518400  IN      NS      M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET.   3600000 IN      A       198.41.0.4
++B.ROOT-SERVERS.NET.   3600000 IN      A       192.228.79.201
++C.ROOT-SERVERS.NET.   3600000 IN      A       192.33.4.12
++D.ROOT-SERVERS.NET.   3600000 IN      A       128.8.10.90
++E.ROOT-SERVERS.NET.   3600000 IN      A       192.203.230.10
++F.ROOT-SERVERS.NET.   3600000 IN      A       192.5.5.241
++G.ROOT-SERVERS.NET.   3600000 IN      A       192.112.36.4
++H.ROOT-SERVERS.NET.   3600000 IN      A       128.63.2.53
++I.ROOT-SERVERS.NET.   3600000 IN      A       192.36.148.17
++J.ROOT-SERVERS.NET.   3600000 IN      A       192.58.128.30
++K.ROOT-SERVERS.NET.   3600000 IN      A       193.0.14.129
++L.ROOT-SERVERS.NET.   3600000 IN      A       198.32.64.12
++M.ROOT-SERVERS.NET.   3600000 IN      A       202.12.27.33
++
++;; Query time: 81 msec
++;; SERVER: 198.41.0.4#53(a.root-servers.net.)
++;; WHEN: Sun Feb  1 11:27:14 2004
++;; MSG SIZE  rcvd: 436
++
+diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+--- bind-9.3.1.orig/conf/named.conf    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200
+@@ -0,0 +1,49 @@
++// This is the primary configuration file for the BIND DNS server named.
++//
++// If you are just adding zones, please do that in /etc/bind/named.conf.local
++
++include "/etc/bind/named.conf.options";
++
++// prime the server with knowledge of the root servers
++zone "." {
++      type hint;
++      file "/etc/bind/db.root";
++};
++
++// be authoritative for the localhost forward and reverse zones, and for
++// broadcast zones as per RFC 1912
++
++zone "localhost" {
++      type master;
++      file "/etc/bind/db.local";
++};
++
++zone "127.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.127";
++};
++
++zone "0.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.0";
++};
++
++zone "255.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.255";
++};
++
++// zone "com" { type delegation-only; };
++// zone "net" { type delegation-only; };
++
++// From the release notes:
++//  Because many of our users are uncomfortable receiving undelegated answers
++//  from root or top level domains, other than a few for whom that behaviour
++//  has been trusted and expected for quite some length of time, we have now
++//  introduced the "root-delegations-only" feature which applies delegation-only
++//  logic to all top level domains, and to the root domain.  An exception list
++//  should be specified, including "MUSEUM" and "DE", and any other top level
++//  domains from whom undelegated responses are expected and trusted.
++// root-delegation-only exclude { "DE"; "MUSEUM"; };
++
++include "/etc/bind/named.conf.local";
+diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+--- bind-9.3.1.orig/conf/named.conf.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.local   2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,8 @@
++//
++// Do any local configuration here
++//
++
++// Consider adding the 1918 zones here, if they are not used in your
++// organization
++//include "/etc/bind/zones.rfc1918";
++
+diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
+--- bind-9.3.1.orig/conf/named.conf.options    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,24 @@
++options {
++      directory "/var/cache/bind";
++
++      // If there is a firewall between you and nameservers you want
++      // to talk to, you might need to uncomment the query-source
++      // directive below.  Previous versions of BIND always asked
++      // questions using port 53, but BIND 8.1 and later use an unprivileged
++      // port by default.
++
++      // query-source address * port 53;
++
++      // If your ISP provided one or more IP addresses for stable
++      // nameservers, you probably want to use them as forwarders.
++      // Uncomment the following block, and insert the addresses replacing
++      // the all-0's placeholder.
++
++      // forwarders {
++      //      0.0.0.0;
++      // };
++
++      auth-nxdomain no;    # conform to RFC1035
++
++};
++
+diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/zones.rfc1918      2005-07-10 22:14:10.000000000 +0200
+@@ -0,0 +1,20 @@
++zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
++
++zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++
++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
+--- bind-9.3.1.orig/init.d     1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/init.d  2005-07-10 23:09:58.000000000 +0200
+@@ -0,0 +1,70 @@
++#!/bin/sh
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++
++# for a chrooted server: "-u bind -t /var/lib/named"
++# Don't modify this line, change or create /etc/default/bind9.
++OPTIONS=""
++
++test -f /etc/default/bind9 && . /etc/default/bind9
++
++test -x /usr/sbin/rndc || exit 0
++
++case "$1" in
++    start)
++      echo -n "Starting domain name service: named"
++
++      modprobe capability >/dev/null 2>&1 || true
++      if [ ! -f /etc/bind/rndc.key ]; then
++          /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chmod 0640 /etc/bind/rndc.key
++      fi
++      if [ -f /var/run/named/named.pid ]; then
++          ps `cat /var/run/named/named.pid` > /dev/null && exit 1
++      fi
++
++      # dirs under /var/run can go away on reboots.
++      mkdir -p /var/run/named
++      mkdir -p /var/cache/bind
++      chmod 775 /var/run/named
++      chown root:bind /var/run/named >/dev/null 2>&1 || true
++
++      if [ ! -x /usr/sbin/named ]; then
++          echo "named binary missing - not starting"
++          exit 1
++      fi
++      if start-stop-daemon --start --quiet --exec /usr/sbin/named \
++              --pidfile /var/run/named/named.pid -- $OPTIONS; then
++          if [ -x /sbin/resolvconf ] ; then
++              echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
++          fi
++      fi
++      echo "."
++    ;;
++
++    stop)
++      echo -n "Stopping domain name service: named"
++      if [ -x /sbin/resolvconf ]; then
++          /sbin/resolvconf -d lo
++      fi
++      /usr/sbin/rndc stop >/dev/null 2>&1
++      echo "."
++    ;;
++
++    reload)
++      /usr/sbin/rndc reload
++    ;;
++
++    restart|force-reload)
++      $0 stop
++      sleep 2
++      $0 start
++    ;;
++
++    *)
++      echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
++      exit 1
++    ;;
++esac
++
++exit 0
meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh new file +8 -0
new file mode 100644
index 00000000000..ef915c0ae5a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -s /etc/bind/rndc.key ]; then
+    echo -n "Generating /etc/bind/rndc.key:"
+    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
+    chown root:bind /etc/bind/rndc.key
+    chmod 0640 /etc/bind/rndc.key
+fi
meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch new file +65 -0
new file mode 100644
index 00000000000..11db95ede12
@@ -0,0 +1,65 @@
+Subject: init.d: add support for read-only rootfs
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/init.d b/init.d
+index 0111ed4..24677c8 100644
+--- a/init.d
++++ b/init.d
+@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ # Don't modify this line, change or create /etc/default/bind9.
+ OPTIONS=""
+
++test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/bind9 && . /etc/default/bind9
+
++# This function is here because it's possible that /var and / are on different partitions.
++is_on_read_only_partition () {
++    DIRECTORY=$1
++    dir=`readlink -f $DIRECTORY`
++    while true; do
++      if [ ! -d "$dir" ]; then
++          echo "ERROR: $dir is not a directory"
++          exit 1
++      else
++          for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \
++              END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do
++              [ "$flag" = "FOUND" ] && partition="read-write"
++              [ "$flag" = "ro" ] && { partition="read-only"; break; }
++          done
++          if [ "$dir" = "/" -o -n "$partition" ]; then
++              break
++          else
++              dir=`dirname $dir`
++          fi
++      fi
++    done
++    [ "$partition" = "read-only" ] && echo "yes" || echo "no"
++}
++
++bind_mount () {
++    olddir=$1
++    newdir=$2
++    mkdir -p $olddir
++    cp -a $newdir/* $olddir
++    mount --bind $olddir $newdir
++}
++
++# Deal with read-only rootfs
++if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
++    [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs"
++    [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind
++    [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named
++fi
++
+ test -x /usr/sbin/rndc || exit 0
+
+ case "$1" in
+--
+1.7.9.5
+
meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch new file +42 -0
new file mode 100644
index 00000000000..146f3e35db6
@@ -0,0 +1,42 @@
+bind: make "/etc/init.d/bind stop" work
+
+Upstream-Status: Inappropriate [configuration]
+
+Add some configurations, make rndc command be able to controls
+the named daemon.
+
+Signed-off-by: Roy Li <[email protected]>
+---
+ conf/named.conf |    5 +++++
+ conf/rndc.conf  |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+ create mode 100644 conf/rndc.conf
+
+diff --git a/conf/named.conf b/conf/named.conf
+index 95829cf..c8899e7 100644
+--- a/conf/named.conf
++++ b/conf/named.conf
+@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" {
+ // root-delegation-only exclude { "DE"; "MUSEUM"; };
+
+ include "/etc/bind/named.conf.local";
++include "/etc/bind/rndc.key" ;
++controls {
++      inet 127.0.0.1 allow { localhost; }
++      keys { rndc-key; };
++};
+diff --git a/conf/rndc.conf b/conf/rndc.conf
+new file mode 100644
+index 0000000..a0b481d
+--- /dev/null
++++ b/conf/rndc.conf
+@@ -0,0 +1,5 @@
++include "/etc/bind/rndc.key";
++options {
++      default-server  localhost;
++      default-key     rndc-key;
++};
+
+--
+1.7.5.4
+
meta/recipes-connectivity/bind/bind-9.16.5/named.service new file +22 -0
new file mode 100644
index 00000000000..cda56ef0150
@@ -0,0 +1,22 @@
+[Unit]
+Description=Berkeley Internet Name Domain (DNS)
+Wants=nss-lookup.target
+Before=nss-lookup.target
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/bind9
+PIDFile=/run/named/named.pid
+
+ExecStartPre=@SBINDIR@/generate-rndc-key.sh
+ExecStart=@SBINDIR@/named $OPTIONS
+
+ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
+
+ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
+
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +99 -0
new file mode 100644
index 00000000000..9c20ccc6fa2
@@ -0,0 +1,125 @@
+SUMMARY = "ISC Internet Domain Name Server"
+HOMEPAGE = "http://www.isc.org/sw/bind/"
+SECTION = "console/network"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1"
+
+DEPENDS = "openssl libcap zlib libuv"
+
+SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
+           file://conf.patch \
+           file://named.service \
+           file://bind9 \
+           file://generate-rndc-key.sh \
+           file://make-etc-initd-bind-stop-work.patch \
+           file://init.d-add-support-for-read-only-rootfs.patch \
+           file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
+           file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
+           file://0001-avoid-start-failure-with-bind-user.patch \
+           "
+
+SRC_URI[sha256sum] = "6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075"
+
+UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
+# stay at 9.16 follow the ESV versions divisible by 4
+UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/"
+
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
+
+# PACKAGECONFIGs readline and libedit should NOT be set at same time
+PACKAGECONFIG ?= "readline"
+PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
+PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
+PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
+PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native,"
+
+EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \
+                 --with-gssapi=no --with-lmdb=no --with-zlib \
+                 --sysconfdir=${sysconfdir}/bind \
+                 --with-openssl=${STAGING_DIR_HOST}${prefix} \
+               "
+LDFLAGS_append = " -lz"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)}
+
+# dhcp needs .la so keep them
+REMOVE_LIBTOOL_LA = "0"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
+                       --user-group bind"
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "named.service"
+
+do_install_append() {
+
+       rmdir "${D}${localstatedir}/run"
+       rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+       install -d -o bind "${D}${localstatedir}/cache/bind"
+       install -d "${D}${sysconfdir}/bind"
+       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}
+       install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+       sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+              -e 's,@SBINDIR@,${sbindir},g' \
+              ${D}${systemd_unitdir}/system/named.service
+
+       install -d ${D}${sysconfdir}/default
+       install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               install -d ${D}${sysconfdir}/tmpfiles.d
+               echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
+       fi
+
+    oe_multilib_header isc/platform.h
+}
+
+CONFFILES_${PN} = " \
+       ${sysconfdir}/bind/named.conf \
+       ${sysconfdir}/bind/named.conf.local \
+       ${sysconfdir}/bind/named.conf.options \

meta/recipes-connectivity/bind/bind_9.16.5.bb line 109

Quoted 10 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +10 -0
+       ${sysconfdir}/bind/db.0 \
+       ${sysconfdir}/bind/db.127 \
+       ${sysconfdir}/bind/db.empty \
+       ${sysconfdir}/bind/db.local \
+       ${sysconfdir}/bind/db.root \
+       "
+
+ALTERNATIVE_${PN}-utils = "nslookup"
+ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup"
+ALTERNATIVE_PRIORITY = "100"

I'm seeing this failing with busybox:
update-alternatives: Error: not linking /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup to /bin/busybox.nosuid since /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup exists and is not a link

Quoted 6 lines
Quoted 1 line

busybox sets ALTERNATIVE_PRIORITY = "50". Can this be the issue?

That is weird. I would have expected that to be an issue with the old version too.

Got any steps to reproduce this?

Sorry for delayed response here, it took me some time but I've finally figured the setup to reproduce the issue.

I've used the "vanilla" Poky from master, added IMAGE_INSTALL += "bind-utils" to core-image-minimal and switched from RPM to IPK format. The last thing turned out to be the trigger for the issue, as with RPM package format I was not able to reproduce the issue, and this was cause of the delay here.

After the above is done - following error is produced:
WARNING: core-image-minimal-1.0-r0 do_rootfs: busybox.postinst
returned 1, marking as unpacked only, configuration required on
target.
ERROR: core-image-minimal-1.0-r0 do_rootfs: Postinstall scriptlets of
['busybox'] have failed. If the intention is to defer them to first
boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.
Details of the failure are in /development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.
ERROR: Logfile of failure stored in:
/development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.6423
ERROR: Task (/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs) failed with exit code '1'
NOTE: Tasks Summary: Attempted 3554 tasks of which 3552 didn't need to
be rerun and 1 failed.

Summary: 1 task failed:
/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs
ed:

'nslookup' is definitely comming from the bind-utils package, and the only thing I've noted so far it that in bind-9.11.22 result binary name in ${D} is [nslookup.bind], which is different from the one provided in bind-9.16.5 - [nslookup].

In case of previous bind version - both versions seems to be installed, and the symlink is fixed onto the nslookup.bind. In the current version though - I guess that the real binary is installed instead, making symlink operation to fail during update-alternative.

Quoted 28 lines

-armin

Quoted 25 lines

Going back to bind 9.11.22 seems to solve it...

Quoted 20 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +16 -1
+
+PACKAGE_BEFORE_PN += "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate"
+FILES_${PN}-dev += "${bindir}/isc-config.h"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+
+PACKAGE_BEFORE_PN += "${PN}-libs"
+FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.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}"
+
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_python3-bind = "python3-core python3-ply"
--

2.17.1

--
Regards,
Andrey.

#17 lore raw

Re: [OE-core] [PATCH 7/8] bind: Add 9.16.x

Quoted 841 lines · Andrey Zhizhikin
Quoted 797 lines · On Mon, Sep 7, 2020 at 5:28 PM akuster808 <[email protected]> wrote:
Quoted 793 lines · Andrey Zhizhikin

Hello Armin,

Quoted 773 lines · akuster

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
 ...1-avoid-start-failure-with-bind-user.patch |  27 ++
 ...d-V-and-start-log-hide-build-options.patch |  35 ++
 ...ching-for-json-headers-searches-sysr.patch |  47 +++
 .../bind/bind-9.16.5/bind9                    |   2 +
 .../bind/bind-9.16.5/conf.patch               | 330 ++++++++++++++++++
 .../bind/bind-9.16.5/generate-rndc-key.sh     |   8 +
 ...t.d-add-support-for-read-only-rootfs.patch |  65 ++++
 .../make-etc-initd-bind-stop-work.patch       |  42 +++
 .../bind/bind-9.16.5/named.service            |  22 ++
 meta/recipes-connectivity/bind/bind_9.16.5.bb | 125 +++++++
 10 files changed, 703 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind9
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/conf.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/named.service
 create mode 100644 meta/recipes-connectivity/bind/bind_9.16.5.bb
meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch new file +27 -0
new file mode 100644
index 00000000000..8db96ec049c
@@ -0,0 +1,27 @@
+From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 15 Oct 2018 16:55:09 +0800
+Subject: [PATCH] avoid start failure with bind user
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d b/init.d
+index b2eec60..6e03936 100644
+--- a/init.d
++++ b/init.d
+@@ -57,6 +57,7 @@ case "$1" in
+       modprobe capability >/dev/null 2>&1 || true
+       if [ ! -f /etc/bind/rndc.key ]; then
+           /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
+           chmod 0640 /etc/bind/rndc.key
+       fi
+       if [ -f /var/run/named/named.pid ]; then
+--
+2.7.4
+
meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file +35 -0
new file mode 100644
index 00000000000..5bcc16c9b2b
@@ -0,0 +1,35 @@
+From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with *** (options are hidden)
+[snip]
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
+---
+ bin/named/include/named/globals.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port        INIT(0);
+ EXTERN isc_dscp_t named_g_dscp               INIT(-1);
meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch new file +47 -0
new file mode 100644
index 00000000000..f9cdc7ca4df
@@ -0,0 +1,47 @@
+From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <[email protected]>
+Date: Tue, 9 Jun 2015 11:22:00 -0400
+Subject: [PATCH] bind: ensure searching for json headers searches sysroot
+
+Bind can fail configure by detecting headers w/o libs[1], or
+it can fail the host contamination check as per below:
+
+ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build'
+ERROR: Function failed: do_qa_configure
+ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242
+ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1'
+NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed.
+No currently running tasks (773 of 781)
+
+Summary: 1 task failed:
+  /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure
+
+One way to fix it would be to unconditionally disable json in bind
+configure[2] but here we fix it by using the path to where we would
+put the header if we had json in the sysroot, in case someone wants
+to make use of the combination some day.
+
+[1] https://trac.macports.org/ticket/45305
+[2] https://trac.macports.org/changeset/126406
+
+Upstream-Status: Inappropriate [OE Specific]
+Signed-off-by: Paul Gortmaker <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.4/configure.ac
+===================================================================
+--- bind-9.16.4.orig/configure.ac
++++ bind-9.16.4/configure.ac
+@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
+               LMDB_LIBS=""
+               ;;
+       auto|yes)
+-              for d in /usr /usr/local /opt/local
++              for d in "${STAGING_INCDIR}"
+               do
+                       if test -f "${d}/include/lmdb.h"
+                       then
meta/recipes-connectivity/bind/bind-9.16.5/bind9 new file +2 -0
new file mode 100644
index 00000000000..968679ff7f7
@@ -0,0 +1,2 @@
+# startup options for the server
+OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind-9.16.5/conf.patch new file +330 -0
new file mode 100644
index 00000000000..aad345f9fcf
@@ -0,0 +1,330 @@
+Upstream-Status: Inappropriate [configuration]
+
+the patch is imported from openembedded project
+
+11/30/2010 - Qing He <[email protected]>
+
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0  1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0       2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++1.0.0 IN      PTR     localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL  86400
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                        86400 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255
+--- bind-9.3.1.orig/conf/db.255        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.255     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reserve data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++@     IN      A       127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root       1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root    2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options:  printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;.                            IN      NS
++
++;; ANSWER SECTION:
++.                     518400  IN      NS      A.ROOT-SERVERS.NET.
++.                     518400  IN      NS      B.ROOT-SERVERS.NET.
++.                     518400  IN      NS      C.ROOT-SERVERS.NET.
++.                     518400  IN      NS      D.ROOT-SERVERS.NET.
++.                     518400  IN      NS      E.ROOT-SERVERS.NET.
++.                     518400  IN      NS      F.ROOT-SERVERS.NET.
++.                     518400  IN      NS      G.ROOT-SERVERS.NET.
++.                     518400  IN      NS      H.ROOT-SERVERS.NET.
++.                     518400  IN      NS      I.ROOT-SERVERS.NET.
++.                     518400  IN      NS      J.ROOT-SERVERS.NET.
++.                     518400  IN      NS      K.ROOT-SERVERS.NET.
++.                     518400  IN      NS      L.ROOT-SERVERS.NET.
++.                     518400  IN      NS      M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET.   3600000 IN      A       198.41.0.4
++B.ROOT-SERVERS.NET.   3600000 IN      A       192.228.79.201
++C.ROOT-SERVERS.NET.   3600000 IN      A       192.33.4.12
++D.ROOT-SERVERS.NET.   3600000 IN      A       128.8.10.90
++E.ROOT-SERVERS.NET.   3600000 IN      A       192.203.230.10
++F.ROOT-SERVERS.NET.   3600000 IN      A       192.5.5.241
++G.ROOT-SERVERS.NET.   3600000 IN      A       192.112.36.4
++H.ROOT-SERVERS.NET.   3600000 IN      A       128.63.2.53
++I.ROOT-SERVERS.NET.   3600000 IN      A       192.36.148.17
++J.ROOT-SERVERS.NET.   3600000 IN      A       192.58.128.30
++K.ROOT-SERVERS.NET.   3600000 IN      A       193.0.14.129
++L.ROOT-SERVERS.NET.   3600000 IN      A       198.32.64.12
++M.ROOT-SERVERS.NET.   3600000 IN      A       202.12.27.33
++
++;; Query time: 81 msec
++;; SERVER: 198.41.0.4#53(a.root-servers.net.)
++;; WHEN: Sun Feb  1 11:27:14 2004
++;; MSG SIZE  rcvd: 436
++
+diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+--- bind-9.3.1.orig/conf/named.conf    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200
+@@ -0,0 +1,49 @@
++// This is the primary configuration file for the BIND DNS server named.
++//
++// If you are just adding zones, please do that in /etc/bind/named.conf.local
++
++include "/etc/bind/named.conf.options";
++
++// prime the server with knowledge of the root servers
++zone "." {
++      type hint;
++      file "/etc/bind/db.root";
++};
++
++// be authoritative for the localhost forward and reverse zones, and for
++// broadcast zones as per RFC 1912
++
++zone "localhost" {
++      type master;
++      file "/etc/bind/db.local";
++};
++
++zone "127.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.127";
++};
++
++zone "0.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.0";
++};
++
++zone "255.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.255";
++};
++
++// zone "com" { type delegation-only; };
++// zone "net" { type delegation-only; };
++
++// From the release notes:
++//  Because many of our users are uncomfortable receiving undelegated answers
++//  from root or top level domains, other than a few for whom that behaviour
++//  has been trusted and expected for quite some length of time, we have now
++//  introduced the "root-delegations-only" feature which applies delegation-only
++//  logic to all top level domains, and to the root domain.  An exception list
++//  should be specified, including "MUSEUM" and "DE", and any other top level
++//  domains from whom undelegated responses are expected and trusted.
++// root-delegation-only exclude { "DE"; "MUSEUM"; };
++
++include "/etc/bind/named.conf.local";
+diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+--- bind-9.3.1.orig/conf/named.conf.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.local   2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,8 @@
++//
++// Do any local configuration here
++//
++
++// Consider adding the 1918 zones here, if they are not used in your
++// organization
++//include "/etc/bind/zones.rfc1918";
++
+diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
+--- bind-9.3.1.orig/conf/named.conf.options    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,24 @@
++options {
++      directory "/var/cache/bind";
++
++      // If there is a firewall between you and nameservers you want
++      // to talk to, you might need to uncomment the query-source
++      // directive below.  Previous versions of BIND always asked
++      // questions using port 53, but BIND 8.1 and later use an unprivileged
++      // port by default.
++
++      // query-source address * port 53;
++
++      // If your ISP provided one or more IP addresses for stable
++      // nameservers, you probably want to use them as forwarders.
++      // Uncomment the following block, and insert the addresses replacing
++      // the all-0's placeholder.
++
++      // forwarders {
++      //      0.0.0.0;
++      // };
++
++      auth-nxdomain no;    # conform to RFC1035
++
++};
++
+diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/zones.rfc1918      2005-07-10 22:14:10.000000000 +0200
+@@ -0,0 +1,20 @@
++zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
++
++zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++
++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
+--- bind-9.3.1.orig/init.d     1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/init.d  2005-07-10 23:09:58.000000000 +0200
+@@ -0,0 +1,70 @@
++#!/bin/sh
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++
++# for a chrooted server: "-u bind -t /var/lib/named"
++# Don't modify this line, change or create /etc/default/bind9.
++OPTIONS=""
++
++test -f /etc/default/bind9 && . /etc/default/bind9
++
++test -x /usr/sbin/rndc || exit 0
++
++case "$1" in
++    start)
++      echo -n "Starting domain name service: named"
++
++      modprobe capability >/dev/null 2>&1 || true
++      if [ ! -f /etc/bind/rndc.key ]; then
++          /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chmod 0640 /etc/bind/rndc.key
++      fi
++      if [ -f /var/run/named/named.pid ]; then
++          ps `cat /var/run/named/named.pid` > /dev/null && exit 1
++      fi
++
++      # dirs under /var/run can go away on reboots.
++      mkdir -p /var/run/named
++      mkdir -p /var/cache/bind
++      chmod 775 /var/run/named
++      chown root:bind /var/run/named >/dev/null 2>&1 || true
++
++      if [ ! -x /usr/sbin/named ]; then
++          echo "named binary missing - not starting"
++          exit 1
++      fi
++      if start-stop-daemon --start --quiet --exec /usr/sbin/named \
++              --pidfile /var/run/named/named.pid -- $OPTIONS; then
++          if [ -x /sbin/resolvconf ] ; then
++              echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
++          fi
++      fi
++      echo "."
++    ;;
++
++    stop)
++      echo -n "Stopping domain name service: named"
++      if [ -x /sbin/resolvconf ]; then
++          /sbin/resolvconf -d lo
++      fi
++      /usr/sbin/rndc stop >/dev/null 2>&1
++      echo "."
++    ;;
++
++    reload)
++      /usr/sbin/rndc reload
++    ;;
++
++    restart|force-reload)
++      $0 stop
++      sleep 2
++      $0 start
++    ;;
++
++    *)
++      echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
++      exit 1
++    ;;
++esac
++
++exit 0
meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh new file +8 -0
new file mode 100644
index 00000000000..ef915c0ae5a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -s /etc/bind/rndc.key ]; then
+    echo -n "Generating /etc/bind/rndc.key:"
+    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
+    chown root:bind /etc/bind/rndc.key
+    chmod 0640 /etc/bind/rndc.key
+fi
meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch new file +65 -0
new file mode 100644
index 00000000000..11db95ede12
@@ -0,0 +1,65 @@
+Subject: init.d: add support for read-only rootfs
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/init.d b/init.d
+index 0111ed4..24677c8 100644
+--- a/init.d
++++ b/init.d
+@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ # Don't modify this line, change or create /etc/default/bind9.
+ OPTIONS=""
+
++test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/bind9 && . /etc/default/bind9
+
++# This function is here because it's possible that /var and / are on different partitions.
++is_on_read_only_partition () {
++    DIRECTORY=$1
++    dir=`readlink -f $DIRECTORY`
++    while true; do
++      if [ ! -d "$dir" ]; then
++          echo "ERROR: $dir is not a directory"
++          exit 1
++      else
++          for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \
++              END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do
++              [ "$flag" = "FOUND" ] && partition="read-write"
++              [ "$flag" = "ro" ] && { partition="read-only"; break; }
++          done
++          if [ "$dir" = "/" -o -n "$partition" ]; then
++              break
++          else
++              dir=`dirname $dir`
++          fi
++      fi
++    done
++    [ "$partition" = "read-only" ] && echo "yes" || echo "no"
++}
++
++bind_mount () {
++    olddir=$1
++    newdir=$2
++    mkdir -p $olddir
++    cp -a $newdir/* $olddir
++    mount --bind $olddir $newdir
++}
++
++# Deal with read-only rootfs
++if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
++    [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs"
++    [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind
++    [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named
++fi
++
+ test -x /usr/sbin/rndc || exit 0
+
+ case "$1" in
+--
+1.7.9.5
+
meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch new file +42 -0
new file mode 100644
index 00000000000..146f3e35db6
@@ -0,0 +1,42 @@
+bind: make "/etc/init.d/bind stop" work
+
+Upstream-Status: Inappropriate [configuration]
+
+Add some configurations, make rndc command be able to controls
+the named daemon.
+
+Signed-off-by: Roy Li <[email protected]>
+---
+ conf/named.conf |    5 +++++
+ conf/rndc.conf  |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+ create mode 100644 conf/rndc.conf
+
+diff --git a/conf/named.conf b/conf/named.conf
+index 95829cf..c8899e7 100644
+--- a/conf/named.conf
++++ b/conf/named.conf
+@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" {
+ // root-delegation-only exclude { "DE"; "MUSEUM"; };
+
+ include "/etc/bind/named.conf.local";
++include "/etc/bind/rndc.key" ;
++controls {
++      inet 127.0.0.1 allow { localhost; }
++      keys { rndc-key; };
++};
+diff --git a/conf/rndc.conf b/conf/rndc.conf
+new file mode 100644
+index 0000000..a0b481d
+--- /dev/null
++++ b/conf/rndc.conf
+@@ -0,0 +1,5 @@
++include "/etc/bind/rndc.key";
++options {
++      default-server  localhost;
++      default-key     rndc-key;
++};
+
+--
+1.7.5.4
+
meta/recipes-connectivity/bind/bind-9.16.5/named.service new file +22 -0
new file mode 100644
index 00000000000..cda56ef0150
@@ -0,0 +1,22 @@
+[Unit]
+Description=Berkeley Internet Name Domain (DNS)
+Wants=nss-lookup.target
+Before=nss-lookup.target
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/bind9
+PIDFile=/run/named/named.pid
+
+ExecStartPre=@SBINDIR@/generate-rndc-key.sh
+ExecStart=@SBINDIR@/named $OPTIONS
+
+ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
+
+ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
+
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +99 -0
new file mode 100644
index 00000000000..9c20ccc6fa2
@@ -0,0 +1,125 @@
+SUMMARY = "ISC Internet Domain Name Server"
+HOMEPAGE = "http://www.isc.org/sw/bind/"
+SECTION = "console/network"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1"
+
+DEPENDS = "openssl libcap zlib libuv"
+
+SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
+           file://conf.patch \
+           file://named.service \
+           file://bind9 \
+           file://generate-rndc-key.sh \
+           file://make-etc-initd-bind-stop-work.patch \
+           file://init.d-add-support-for-read-only-rootfs.patch \
+           file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
+           file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
+           file://0001-avoid-start-failure-with-bind-user.patch \
+           "
+
+SRC_URI[sha256sum] = "6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075"
+
+UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
+# stay at 9.16 follow the ESV versions divisible by 4
+UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/"
+
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
+
+# PACKAGECONFIGs readline and libedit should NOT be set at same time
+PACKAGECONFIG ?= "readline"
+PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
+PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
+PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
+PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native,"
+
+EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \
+                 --with-gssapi=no --with-lmdb=no --with-zlib \
+                 --sysconfdir=${sysconfdir}/bind \
+                 --with-openssl=${STAGING_DIR_HOST}${prefix} \
+               "
+LDFLAGS_append = " -lz"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)}
+
+# dhcp needs .la so keep them
+REMOVE_LIBTOOL_LA = "0"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
+                       --user-group bind"
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "named.service"
+
+do_install_append() {
+
+       rmdir "${D}${localstatedir}/run"
+       rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+       install -d -o bind "${D}${localstatedir}/cache/bind"
+       install -d "${D}${sysconfdir}/bind"
+       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}
+       install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+       sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+              -e 's,@SBINDIR@,${sbindir},g' \
+              ${D}${systemd_unitdir}/system/named.service
+
+       install -d ${D}${sysconfdir}/default
+       install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               install -d ${D}${sysconfdir}/tmpfiles.d
+               echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
+       fi
+
+    oe_multilib_header isc/platform.h
+}
+
+CONFFILES_${PN} = " \
+       ${sysconfdir}/bind/named.conf \
+       ${sysconfdir}/bind/named.conf.local \
+       ${sysconfdir}/bind/named.conf.options \

meta/recipes-connectivity/bind/bind_9.16.5.bb line 109

Quoted 10 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +10 -0
+       ${sysconfdir}/bind/db.0 \
+       ${sysconfdir}/bind/db.127 \
+       ${sysconfdir}/bind/db.empty \
+       ${sysconfdir}/bind/db.local \
+       ${sysconfdir}/bind/db.root \
+       "
+
+ALTERNATIVE_${PN}-utils = "nslookup"
+ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup"
+ALTERNATIVE_PRIORITY = "100"

I'm seeing this failing with busybox:
update-alternatives: Error: not linking /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup to /bin/busybox.nosuid since /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup exists and is not a link

Quoted 6 lines
Quoted 1 line

busybox sets ALTERNATIVE_PRIORITY = "50". Can this be the issue?

That is weird. I would have expected that to be an issue with the old version too.

Got any steps to reproduce this?

Sorry for delayed response here, it took me some time but I've finally figured the setup to reproduce the issue.

I've used the "vanilla" Poky from master, added IMAGE_INSTALL += "bind-utils" to core-image-minimal and switched from RPM to IPK format. The last thing turned out to be the trigger for the issue, as with RPM package format I was not able to reproduce the issue, and this was cause of the delay here.

After the above is done - following error is produced:
WARNING: core-image-minimal-1.0-r0 do_rootfs: busybox.postinst
returned 1, marking as unpacked only, configuration required on
target.
ERROR: core-image-minimal-1.0-r0 do_rootfs: Postinstall scriptlets of
['busybox'] have failed. If the intention is to defer them to first
boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.
Details of the failure are in /development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.
ERROR: Logfile of failure stored in:
/development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.6423
ERROR: Task (/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs) failed with exit code '1'
NOTE: Tasks Summary: Attempted 3554 tasks of which 3552 didn't need to
be rerun and 1 failed.

Summary: 1 task failed:
/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs
ed:

'nslookup' is definitely comming from the bind-utils package, and the only thing I've noted so far it that in bind-9.11.22 result binary name in ${D} is [nslookup.bind], which is different from the one provided in bind-9.16.5 - [nslookup].

Quoted 4 lines

In case of previous bind version - both versions seems to be installed, and the symlink is fixed onto the nslookup.bind. In the current version though - I guess that the real binary is installed instead, making symlink operation to fail during update-alternative.

If it is competing with busybox then perhaps priority for bind to provide nslookup should be higher than busybox. Can you try that ?

Quoted 40 lines
Quoted 4 lines
Quoted 27 lines

-armin

Quoted 25 lines

Going back to bind 9.11.22 seems to solve it...

Quoted 20 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +16 -1
+
+PACKAGE_BEFORE_PN += "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate"
+FILES_${PN}-dev += "${bindir}/isc-config.h"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+
+PACKAGE_BEFORE_PN += "${PN}-libs"
+FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.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}"
+
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_python3-bind = "python3-core python3-ply"
--

2.17.1

--
Regards,
Andrey.

#18 lore raw

Re: [OE-core] [PATCH 7/8] bind: Add 9.16.x

Quoted 845 lines · Khem Raj
Quoted 841 lines · Andrey Zhizhikin
Quoted 797 lines · On Mon, Sep 7, 2020 at 5:28 PM akuster808 <[email protected]> wrote:
Quoted 793 lines · Andrey Zhizhikin

Hello Armin,

Quoted 773 lines · akuster

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
 ...1-avoid-start-failure-with-bind-user.patch |  27 ++
 ...d-V-and-start-log-hide-build-options.patch |  35 ++
 ...ching-for-json-headers-searches-sysr.patch |  47 +++
 .../bind/bind-9.16.5/bind9                    |   2 +
 .../bind/bind-9.16.5/conf.patch               | 330 ++++++++++++++++++
 .../bind/bind-9.16.5/generate-rndc-key.sh     |   8 +
 ...t.d-add-support-for-read-only-rootfs.patch |  65 ++++
 .../make-etc-initd-bind-stop-work.patch       |  42 +++
 .../bind/bind-9.16.5/named.service            |  22 ++
 meta/recipes-connectivity/bind/bind_9.16.5.bb | 125 +++++++
 10 files changed, 703 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind9
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/conf.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/named.service
 create mode 100644 meta/recipes-connectivity/bind/bind_9.16.5.bb
meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch new file +27 -0
new file mode 100644
index 00000000000..8db96ec049c
@@ -0,0 +1,27 @@
+From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 15 Oct 2018 16:55:09 +0800
+Subject: [PATCH] avoid start failure with bind user
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d b/init.d
+index b2eec60..6e03936 100644
+--- a/init.d
++++ b/init.d
+@@ -57,6 +57,7 @@ case "$1" in
+       modprobe capability >/dev/null 2>&1 || true
+       if [ ! -f /etc/bind/rndc.key ]; then
+           /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
+           chmod 0640 /etc/bind/rndc.key
+       fi
+       if [ -f /var/run/named/named.pid ]; then
+--
+2.7.4
+
meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file +35 -0
new file mode 100644
index 00000000000..5bcc16c9b2b
@@ -0,0 +1,35 @@
+From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with *** (options are hidden)
+[snip]
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
+---
+ bin/named/include/named/globals.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port        INIT(0);
+ EXTERN isc_dscp_t named_g_dscp               INIT(-1);
meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch new file +47 -0
new file mode 100644
index 00000000000..f9cdc7ca4df
@@ -0,0 +1,47 @@
+From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <[email protected]>
+Date: Tue, 9 Jun 2015 11:22:00 -0400
+Subject: [PATCH] bind: ensure searching for json headers searches sysroot
+
+Bind can fail configure by detecting headers w/o libs[1], or
+it can fail the host contamination check as per below:
+
+ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build'
+ERROR: Function failed: do_qa_configure
+ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242
+ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1'
+NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed.
+No currently running tasks (773 of 781)
+
+Summary: 1 task failed:
+  /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure
+
+One way to fix it would be to unconditionally disable json in bind
+configure[2] but here we fix it by using the path to where we would
+put the header if we had json in the sysroot, in case someone wants
+to make use of the combination some day.
+
+[1] https://trac.macports.org/ticket/45305
+[2] https://trac.macports.org/changeset/126406
+
+Upstream-Status: Inappropriate [OE Specific]
+Signed-off-by: Paul Gortmaker <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.4/configure.ac
+===================================================================
+--- bind-9.16.4.orig/configure.ac
++++ bind-9.16.4/configure.ac
+@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
+               LMDB_LIBS=""
+               ;;
+       auto|yes)
+-              for d in /usr /usr/local /opt/local
++              for d in "${STAGING_INCDIR}"
+               do
+                       if test -f "${d}/include/lmdb.h"
+                       then
meta/recipes-connectivity/bind/bind-9.16.5/bind9 new file +2 -0
new file mode 100644
index 00000000000..968679ff7f7
@@ -0,0 +1,2 @@
+# startup options for the server
+OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind-9.16.5/conf.patch new file +330 -0
new file mode 100644
index 00000000000..aad345f9fcf
@@ -0,0 +1,330 @@
+Upstream-Status: Inappropriate [configuration]
+
+the patch is imported from openembedded project
+
+11/30/2010 - Qing He <[email protected]>
+
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0  1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0       2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++1.0.0 IN      PTR     localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL  86400
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                        86400 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255
+--- bind-9.3.1.orig/conf/db.255        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.255     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reserve data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++@     IN      A       127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root       1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root    2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options:  printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;.                            IN      NS
++
++;; ANSWER SECTION:
++.                     518400  IN      NS      A.ROOT-SERVERS.NET.
++.                     518400  IN      NS      B.ROOT-SERVERS.NET.
++.                     518400  IN      NS      C.ROOT-SERVERS.NET.
++.                     518400  IN      NS      D.ROOT-SERVERS.NET.
++.                     518400  IN      NS      E.ROOT-SERVERS.NET.
++.                     518400  IN      NS      F.ROOT-SERVERS.NET.
++.                     518400  IN      NS      G.ROOT-SERVERS.NET.
++.                     518400  IN      NS      H.ROOT-SERVERS.NET.
++.                     518400  IN      NS      I.ROOT-SERVERS.NET.
++.                     518400  IN      NS      J.ROOT-SERVERS.NET.
++.                     518400  IN      NS      K.ROOT-SERVERS.NET.
++.                     518400  IN      NS      L.ROOT-SERVERS.NET.
++.                     518400  IN      NS      M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET.   3600000 IN      A       198.41.0.4
++B.ROOT-SERVERS.NET.   3600000 IN      A       192.228.79.201
++C.ROOT-SERVERS.NET.   3600000 IN      A       192.33.4.12
++D.ROOT-SERVERS.NET.   3600000 IN      A       128.8.10.90
++E.ROOT-SERVERS.NET.   3600000 IN      A       192.203.230.10
++F.ROOT-SERVERS.NET.   3600000 IN      A       192.5.5.241
++G.ROOT-SERVERS.NET.   3600000 IN      A       192.112.36.4
++H.ROOT-SERVERS.NET.   3600000 IN      A       128.63.2.53
++I.ROOT-SERVERS.NET.   3600000 IN      A       192.36.148.17
++J.ROOT-SERVERS.NET.   3600000 IN      A       192.58.128.30
++K.ROOT-SERVERS.NET.   3600000 IN      A       193.0.14.129
++L.ROOT-SERVERS.NET.   3600000 IN      A       198.32.64.12
++M.ROOT-SERVERS.NET.   3600000 IN      A       202.12.27.33
++
++;; Query time: 81 msec
++;; SERVER: 198.41.0.4#53(a.root-servers.net.)
++;; WHEN: Sun Feb  1 11:27:14 2004
++;; MSG SIZE  rcvd: 436
++
+diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+--- bind-9.3.1.orig/conf/named.conf    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200
+@@ -0,0 +1,49 @@
++// This is the primary configuration file for the BIND DNS server named.
++//
++// If you are just adding zones, please do that in /etc/bind/named.conf.local
++
++include "/etc/bind/named.conf.options";
++
++// prime the server with knowledge of the root servers
++zone "." {
++      type hint;
++      file "/etc/bind/db.root";
++};
++
++// be authoritative for the localhost forward and reverse zones, and for
++// broadcast zones as per RFC 1912
++
++zone "localhost" {
++      type master;
++      file "/etc/bind/db.local";
++};
++
++zone "127.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.127";
++};
++
++zone "0.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.0";
++};
++
++zone "255.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.255";
++};
++
++// zone "com" { type delegation-only; };
++// zone "net" { type delegation-only; };
++
++// From the release notes:
++//  Because many of our users are uncomfortable receiving undelegated answers
++//  from root or top level domains, other than a few for whom that behaviour
++//  has been trusted and expected for quite some length of time, we have now
++//  introduced the "root-delegations-only" feature which applies delegation-only
++//  logic to all top level domains, and to the root domain.  An exception list
++//  should be specified, including "MUSEUM" and "DE", and any other top level
++//  domains from whom undelegated responses are expected and trusted.
++// root-delegation-only exclude { "DE"; "MUSEUM"; };
++
++include "/etc/bind/named.conf.local";
+diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+--- bind-9.3.1.orig/conf/named.conf.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.local   2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,8 @@
++//
++// Do any local configuration here
++//
++
++// Consider adding the 1918 zones here, if they are not used in your
++// organization
++//include "/etc/bind/zones.rfc1918";
++
+diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
+--- bind-9.3.1.orig/conf/named.conf.options    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,24 @@
++options {
++      directory "/var/cache/bind";
++
++      // If there is a firewall between you and nameservers you want
++      // to talk to, you might need to uncomment the query-source
++      // directive below.  Previous versions of BIND always asked
++      // questions using port 53, but BIND 8.1 and later use an unprivileged
++      // port by default.
++
++      // query-source address * port 53;
++
++      // If your ISP provided one or more IP addresses for stable
++      // nameservers, you probably want to use them as forwarders.
++      // Uncomment the following block, and insert the addresses replacing
++      // the all-0's placeholder.
++
++      // forwarders {
++      //      0.0.0.0;
++      // };
++
++      auth-nxdomain no;    # conform to RFC1035
++
++};
++
+diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/zones.rfc1918      2005-07-10 22:14:10.000000000 +0200
+@@ -0,0 +1,20 @@
++zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
++
++zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++
++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
+--- bind-9.3.1.orig/init.d     1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/init.d  2005-07-10 23:09:58.000000000 +0200
+@@ -0,0 +1,70 @@
++#!/bin/sh
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++
++# for a chrooted server: "-u bind -t /var/lib/named"
++# Don't modify this line, change or create /etc/default/bind9.
++OPTIONS=""
++
++test -f /etc/default/bind9 && . /etc/default/bind9
++
++test -x /usr/sbin/rndc || exit 0
++
++case "$1" in
++    start)
++      echo -n "Starting domain name service: named"
++
++      modprobe capability >/dev/null 2>&1 || true
++      if [ ! -f /etc/bind/rndc.key ]; then
++          /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chmod 0640 /etc/bind/rndc.key
++      fi
++      if [ -f /var/run/named/named.pid ]; then
++          ps `cat /var/run/named/named.pid` > /dev/null && exit 1
++      fi
++
++      # dirs under /var/run can go away on reboots.
++      mkdir -p /var/run/named
++      mkdir -p /var/cache/bind
++      chmod 775 /var/run/named
++      chown root:bind /var/run/named >/dev/null 2>&1 || true
++
++      if [ ! -x /usr/sbin/named ]; then
++          echo "named binary missing - not starting"
++          exit 1
++      fi
++      if start-stop-daemon --start --quiet --exec /usr/sbin/named \
++              --pidfile /var/run/named/named.pid -- $OPTIONS; then
++          if [ -x /sbin/resolvconf ] ; then
++              echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
++          fi
++      fi
++      echo "."
++    ;;
++
++    stop)
++      echo -n "Stopping domain name service: named"
++      if [ -x /sbin/resolvconf ]; then
++          /sbin/resolvconf -d lo
++      fi
++      /usr/sbin/rndc stop >/dev/null 2>&1
++      echo "."
++    ;;
++
++    reload)
++      /usr/sbin/rndc reload
++    ;;
++
++    restart|force-reload)
++      $0 stop
++      sleep 2
++      $0 start
++    ;;
++
++    *)
++      echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
++      exit 1
++    ;;
++esac
++
++exit 0
meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh new file +8 -0
new file mode 100644
index 00000000000..ef915c0ae5a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -s /etc/bind/rndc.key ]; then
+    echo -n "Generating /etc/bind/rndc.key:"
+    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
+    chown root:bind /etc/bind/rndc.key
+    chmod 0640 /etc/bind/rndc.key
+fi
meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch new file +65 -0
new file mode 100644
index 00000000000..11db95ede12
@@ -0,0 +1,65 @@
+Subject: init.d: add support for read-only rootfs
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/init.d b/init.d
+index 0111ed4..24677c8 100644
+--- a/init.d
++++ b/init.d
+@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ # Don't modify this line, change or create /etc/default/bind9.
+ OPTIONS=""
+
++test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/bind9 && . /etc/default/bind9
+
++# This function is here because it's possible that /var and / are on different partitions.
++is_on_read_only_partition () {
++    DIRECTORY=$1
++    dir=`readlink -f $DIRECTORY`
++    while true; do
++      if [ ! -d "$dir" ]; then
++          echo "ERROR: $dir is not a directory"
++          exit 1
++      else
++          for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \
++              END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do
++              [ "$flag" = "FOUND" ] && partition="read-write"
++              [ "$flag" = "ro" ] && { partition="read-only"; break; }
++          done
++          if [ "$dir" = "/" -o -n "$partition" ]; then
++              break
++          else
++              dir=`dirname $dir`
++          fi
++      fi
++    done
++    [ "$partition" = "read-only" ] && echo "yes" || echo "no"
++}
++
++bind_mount () {
++    olddir=$1
++    newdir=$2
++    mkdir -p $olddir
++    cp -a $newdir/* $olddir
++    mount --bind $olddir $newdir
++}
++
++# Deal with read-only rootfs
++if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
++    [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs"
++    [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind
++    [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named
++fi
++
+ test -x /usr/sbin/rndc || exit 0
+
+ case "$1" in
+--
+1.7.9.5
+
meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch new file +42 -0
new file mode 100644
index 00000000000..146f3e35db6
@@ -0,0 +1,42 @@
+bind: make "/etc/init.d/bind stop" work
+
+Upstream-Status: Inappropriate [configuration]
+
+Add some configurations, make rndc command be able to controls
+the named daemon.
+
+Signed-off-by: Roy Li <[email protected]>
+---
+ conf/named.conf |    5 +++++
+ conf/rndc.conf  |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+ create mode 100644 conf/rndc.conf
+
+diff --git a/conf/named.conf b/conf/named.conf
+index 95829cf..c8899e7 100644
+--- a/conf/named.conf
++++ b/conf/named.conf
+@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" {
+ // root-delegation-only exclude { "DE"; "MUSEUM"; };
+
+ include "/etc/bind/named.conf.local";
++include "/etc/bind/rndc.key" ;
++controls {
++      inet 127.0.0.1 allow { localhost; }
++      keys { rndc-key; };
++};
+diff --git a/conf/rndc.conf b/conf/rndc.conf
+new file mode 100644
+index 0000000..a0b481d
+--- /dev/null
++++ b/conf/rndc.conf
+@@ -0,0 +1,5 @@
++include "/etc/bind/rndc.key";
++options {
++      default-server  localhost;
++      default-key     rndc-key;
++};
+
+--
+1.7.5.4
+
meta/recipes-connectivity/bind/bind-9.16.5/named.service new file +22 -0
new file mode 100644
index 00000000000..cda56ef0150
@@ -0,0 +1,22 @@
+[Unit]
+Description=Berkeley Internet Name Domain (DNS)
+Wants=nss-lookup.target
+Before=nss-lookup.target
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/bind9
+PIDFile=/run/named/named.pid
+
+ExecStartPre=@SBINDIR@/generate-rndc-key.sh
+ExecStart=@SBINDIR@/named $OPTIONS
+
+ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
+
+ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
+
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +99 -0
new file mode 100644
index 00000000000..9c20ccc6fa2
@@ -0,0 +1,125 @@
+SUMMARY = "ISC Internet Domain Name Server"
+HOMEPAGE = "http://www.isc.org/sw/bind/"
+SECTION = "console/network"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1"
+
+DEPENDS = "openssl libcap zlib libuv"
+
+SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
+           file://conf.patch \
+           file://named.service \
+           file://bind9 \
+           file://generate-rndc-key.sh \
+           file://make-etc-initd-bind-stop-work.patch \
+           file://init.d-add-support-for-read-only-rootfs.patch \
+           file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
+           file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
+           file://0001-avoid-start-failure-with-bind-user.patch \
+           "
+
+SRC_URI[sha256sum] = "6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075"
+
+UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
+# stay at 9.16 follow the ESV versions divisible by 4
+UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/"
+
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
+
+# PACKAGECONFIGs readline and libedit should NOT be set at same time
+PACKAGECONFIG ?= "readline"
+PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
+PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
+PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
+PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native,"
+
+EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \
+                 --with-gssapi=no --with-lmdb=no --with-zlib \
+                 --sysconfdir=${sysconfdir}/bind \
+                 --with-openssl=${STAGING_DIR_HOST}${prefix} \
+               "
+LDFLAGS_append = " -lz"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)}
+
+# dhcp needs .la so keep them
+REMOVE_LIBTOOL_LA = "0"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
+                       --user-group bind"
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "named.service"
+
+do_install_append() {
+
+       rmdir "${D}${localstatedir}/run"
+       rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+       install -d -o bind "${D}${localstatedir}/cache/bind"
+       install -d "${D}${sysconfdir}/bind"
+       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}
+       install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+       sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+              -e 's,@SBINDIR@,${sbindir},g' \
+              ${D}${systemd_unitdir}/system/named.service
+
+       install -d ${D}${sysconfdir}/default
+       install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               install -d ${D}${sysconfdir}/tmpfiles.d
+               echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
+       fi
+
+    oe_multilib_header isc/platform.h
+}
+
+CONFFILES_${PN} = " \
+       ${sysconfdir}/bind/named.conf \
+       ${sysconfdir}/bind/named.conf.local \
+       ${sysconfdir}/bind/named.conf.options \

meta/recipes-connectivity/bind/bind_9.16.5.bb line 109

Quoted 10 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +10 -0
+       ${sysconfdir}/bind/db.0 \
+       ${sysconfdir}/bind/db.127 \
+       ${sysconfdir}/bind/db.empty \
+       ${sysconfdir}/bind/db.local \
+       ${sysconfdir}/bind/db.root \
+       "
+
+ALTERNATIVE_${PN}-utils = "nslookup"
+ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup"
+ALTERNATIVE_PRIORITY = "100"

I'm seeing this failing with busybox:
update-alternatives: Error: not linking /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup to /bin/busybox.nosuid since /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup exists and is not a link

Quoted 6 lines
Quoted 1 line

busybox sets ALTERNATIVE_PRIORITY = "50". Can this be the issue?

That is weird. I would have expected that to be an issue with the old version too.

Got any steps to reproduce this?

Sorry for delayed response here, it took me some time but I've finally figured the setup to reproduce the issue.

I've used the "vanilla" Poky from master, added IMAGE_INSTALL += "bind-utils" to core-image-minimal and switched from RPM to IPK format. The last thing turned out to be the trigger for the issue, as with RPM package format I was not able to reproduce the issue, and this was cause of the delay here.

After the above is done - following error is produced:
WARNING: core-image-minimal-1.0-r0 do_rootfs: busybox.postinst
returned 1, marking as unpacked only, configuration required on
target.
ERROR: core-image-minimal-1.0-r0 do_rootfs: Postinstall scriptlets of
['busybox'] have failed. If the intention is to defer them to first
boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.
Details of the failure are in /development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.
ERROR: Logfile of failure stored in:
/development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.6423
ERROR: Task (/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs) failed with exit code '1'
NOTE: Tasks Summary: Attempted 3554 tasks of which 3552 didn't need to
be rerun and 1 failed.

Summary: 1 task failed:
/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs
ed:

'nslookup' is definitely comming from the bind-utils package, and the only thing I've noted so far it that in bind-9.11.22 result binary name in ${D} is [nslookup.bind], which is different from the one provided in bind-9.16.5 - [nslookup].

Quoted 7 lines
Quoted 4 lines

In case of previous bind version - both versions seems to be installed, and the symlink is fixed onto the nslookup.bind. In the current version though - I guess that the real binary is installed instead, making symlink operation to fail during update-alternative.

If it is competing with busybox then perhaps priority for bind to provide nslookup should be higher than busybox. Can you try that ?

busybox has ALTERNATIVE_PRIORITY = "50" while bind is set to ALTERNATIVE_PRIORITY = "100". IIRC higher number means higher priority which is already the case...

Nevertheless, I've tried to set 50 and even 40 for 'bind' and had the same failure...

Quoted 42 lines
Quoted 41 lines
Quoted 5 lines
Quoted 27 lines

-armin

Quoted 25 lines

Going back to bind 9.11.22 seems to solve it...

Quoted 20 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +16 -1
+
+PACKAGE_BEFORE_PN += "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate"
+FILES_${PN}-dev += "${bindir}/isc-config.h"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+
+PACKAGE_BEFORE_PN += "${PN}-libs"
+FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.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}"
+
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_python3-bind = "python3-core python3-ply"
--

2.17.1

--
Regards,
Andrey.

Signature · 2 lines
Regards,
Andrey.
#19 lore raw

Re: [OE-core] [PATCH 7/8] bind: Add 9.16.x

Gentle ping here regarding this issue.

Is thre anyone else experiencing this with IPK packages?

Quoted 909 lines · Andrey Zhizhikin
Quoted 845 lines · Khem Raj
Quoted 841 lines · Andrey Zhizhikin
Quoted 797 lines · On Mon, Sep 7, 2020 at 5:28 PM akuster808 <[email protected]> wrote:
Quoted 793 lines · Andrey Zhizhikin

Hello Armin,

Quoted 773 lines · akuster

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
 ...1-avoid-start-failure-with-bind-user.patch |  27 ++
 ...d-V-and-start-log-hide-build-options.patch |  35 ++
 ...ching-for-json-headers-searches-sysr.patch |  47 +++
 .../bind/bind-9.16.5/bind9                    |   2 +
 .../bind/bind-9.16.5/conf.patch               | 330 ++++++++++++++++++
 .../bind/bind-9.16.5/generate-rndc-key.sh     |   8 +
 ...t.d-add-support-for-read-only-rootfs.patch |  65 ++++
 .../make-etc-initd-bind-stop-work.patch       |  42 +++
 .../bind/bind-9.16.5/named.service            |  22 ++
 meta/recipes-connectivity/bind/bind_9.16.5.bb | 125 +++++++
 10 files changed, 703 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind9
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/conf.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch
 create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/named.service
 create mode 100644 meta/recipes-connectivity/bind/bind_9.16.5.bb
meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch new file +27 -0
new file mode 100644
index 00000000000..8db96ec049c
@@ -0,0 +1,27 @@
+From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 15 Oct 2018 16:55:09 +0800
+Subject: [PATCH] avoid start failure with bind user
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d b/init.d
+index b2eec60..6e03936 100644
+--- a/init.d
++++ b/init.d
+@@ -57,6 +57,7 @@ case "$1" in
+       modprobe capability >/dev/null 2>&1 || true
+       if [ ! -f /etc/bind/rndc.key ]; then
+           /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
+           chmod 0640 /etc/bind/rndc.key
+       fi
+       if [ -f /var/run/named/named.pid ]; then
+--
+2.7.4
+
meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file +35 -0
new file mode 100644
index 00000000000..5bcc16c9b2b
@@ -0,0 +1,35 @@
+From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with *** (options are hidden)
+[snip]
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
+---
+ bin/named/include/named/globals.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port        INIT(0);
+ EXTERN isc_dscp_t named_g_dscp               INIT(-1);
meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch new file +47 -0
new file mode 100644
index 00000000000..f9cdc7ca4df
@@ -0,0 +1,47 @@
+From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <[email protected]>
+Date: Tue, 9 Jun 2015 11:22:00 -0400
+Subject: [PATCH] bind: ensure searching for json headers searches sysroot
+
+Bind can fail configure by detecting headers w/o libs[1], or
+it can fail the host contamination check as per below:
+
+ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build'
+ERROR: Function failed: do_qa_configure
+ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242
+ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1'
+NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed.
+No currently running tasks (773 of 781)
+
+Summary: 1 task failed:
+  /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure
+
+One way to fix it would be to unconditionally disable json in bind
+configure[2] but here we fix it by using the path to where we would
+put the header if we had json in the sysroot, in case someone wants
+to make use of the combination some day.
+
+[1] https://trac.macports.org/ticket/45305
+[2] https://trac.macports.org/changeset/126406
+
+Upstream-Status: Inappropriate [OE Specific]
+Signed-off-by: Paul Gortmaker <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.4/configure.ac
+===================================================================
+--- bind-9.16.4.orig/configure.ac
++++ bind-9.16.4/configure.ac
+@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
+               LMDB_LIBS=""
+               ;;
+       auto|yes)
+-              for d in /usr /usr/local /opt/local
++              for d in "${STAGING_INCDIR}"
+               do
+                       if test -f "${d}/include/lmdb.h"
+                       then
meta/recipes-connectivity/bind/bind-9.16.5/bind9 new file +2 -0
new file mode 100644
index 00000000000..968679ff7f7
@@ -0,0 +1,2 @@
+# startup options for the server
+OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind-9.16.5/conf.patch new file +330 -0
new file mode 100644
index 00000000000..aad345f9fcf
@@ -0,0 +1,330 @@
+Upstream-Status: Inappropriate [configuration]
+
+the patch is imported from openembedded project
+
+11/30/2010 - Qing He <[email protected]>
+
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0  1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0       2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++1.0.0 IN      PTR     localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL  86400
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                        86400 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255
+--- bind-9.3.1.orig/conf/db.255        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.255     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reserve data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++@     IN      A       127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root       1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root    2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options:  printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;.                            IN      NS
++
++;; ANSWER SECTION:
++.                     518400  IN      NS      A.ROOT-SERVERS.NET.
++.                     518400  IN      NS      B.ROOT-SERVERS.NET.
++.                     518400  IN      NS      C.ROOT-SERVERS.NET.
++.                     518400  IN      NS      D.ROOT-SERVERS.NET.
++.                     518400  IN      NS      E.ROOT-SERVERS.NET.
++.                     518400  IN      NS      F.ROOT-SERVERS.NET.
++.                     518400  IN      NS      G.ROOT-SERVERS.NET.
++.                     518400  IN      NS      H.ROOT-SERVERS.NET.
++.                     518400  IN      NS      I.ROOT-SERVERS.NET.
++.                     518400  IN      NS      J.ROOT-SERVERS.NET.
++.                     518400  IN      NS      K.ROOT-SERVERS.NET.
++.                     518400  IN      NS      L.ROOT-SERVERS.NET.
++.                     518400  IN      NS      M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET.   3600000 IN      A       198.41.0.4
++B.ROOT-SERVERS.NET.   3600000 IN      A       192.228.79.201
++C.ROOT-SERVERS.NET.   3600000 IN      A       192.33.4.12
++D.ROOT-SERVERS.NET.   3600000 IN      A       128.8.10.90
++E.ROOT-SERVERS.NET.   3600000 IN      A       192.203.230.10
++F.ROOT-SERVERS.NET.   3600000 IN      A       192.5.5.241
++G.ROOT-SERVERS.NET.   3600000 IN      A       192.112.36.4
++H.ROOT-SERVERS.NET.   3600000 IN      A       128.63.2.53
++I.ROOT-SERVERS.NET.   3600000 IN      A       192.36.148.17
++J.ROOT-SERVERS.NET.   3600000 IN      A       192.58.128.30
++K.ROOT-SERVERS.NET.   3600000 IN      A       193.0.14.129
++L.ROOT-SERVERS.NET.   3600000 IN      A       198.32.64.12
++M.ROOT-SERVERS.NET.   3600000 IN      A       202.12.27.33
++
++;; Query time: 81 msec
++;; SERVER: 198.41.0.4#53(a.root-servers.net.)
++;; WHEN: Sun Feb  1 11:27:14 2004
++;; MSG SIZE  rcvd: 436
++
+diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+--- bind-9.3.1.orig/conf/named.conf    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200
+@@ -0,0 +1,49 @@
++// This is the primary configuration file for the BIND DNS server named.
++//
++// If you are just adding zones, please do that in /etc/bind/named.conf.local
++
++include "/etc/bind/named.conf.options";
++
++// prime the server with knowledge of the root servers
++zone "." {
++      type hint;
++      file "/etc/bind/db.root";
++};
++
++// be authoritative for the localhost forward and reverse zones, and for
++// broadcast zones as per RFC 1912
++
++zone "localhost" {
++      type master;
++      file "/etc/bind/db.local";
++};
++
++zone "127.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.127";
++};
++
++zone "0.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.0";
++};
++
++zone "255.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.255";
++};
++
++// zone "com" { type delegation-only; };
++// zone "net" { type delegation-only; };
++
++// From the release notes:
++//  Because many of our users are uncomfortable receiving undelegated answers
++//  from root or top level domains, other than a few for whom that behaviour
++//  has been trusted and expected for quite some length of time, we have now
++//  introduced the "root-delegations-only" feature which applies delegation-only
++//  logic to all top level domains, and to the root domain.  An exception list
++//  should be specified, including "MUSEUM" and "DE", and any other top level
++//  domains from whom undelegated responses are expected and trusted.
++// root-delegation-only exclude { "DE"; "MUSEUM"; };
++
++include "/etc/bind/named.conf.local";
+diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+--- bind-9.3.1.orig/conf/named.conf.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.local   2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,8 @@
++//
++// Do any local configuration here
++//
++
++// Consider adding the 1918 zones here, if they are not used in your
++// organization
++//include "/etc/bind/zones.rfc1918";
++
+diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
+--- bind-9.3.1.orig/conf/named.conf.options    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,24 @@
++options {
++      directory "/var/cache/bind";
++
++      // If there is a firewall between you and nameservers you want
++      // to talk to, you might need to uncomment the query-source
++      // directive below.  Previous versions of BIND always asked
++      // questions using port 53, but BIND 8.1 and later use an unprivileged
++      // port by default.
++
++      // query-source address * port 53;
++
++      // If your ISP provided one or more IP addresses for stable
++      // nameservers, you probably want to use them as forwarders.
++      // Uncomment the following block, and insert the addresses replacing
++      // the all-0's placeholder.
++
++      // forwarders {
++      //      0.0.0.0;
++      // };
++
++      auth-nxdomain no;    # conform to RFC1035
++
++};
++
+diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/zones.rfc1918      2005-07-10 22:14:10.000000000 +0200
+@@ -0,0 +1,20 @@
++zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
++
++zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++
++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
+--- bind-9.3.1.orig/init.d     1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/init.d  2005-07-10 23:09:58.000000000 +0200
+@@ -0,0 +1,70 @@
++#!/bin/sh
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++
++# for a chrooted server: "-u bind -t /var/lib/named"
++# Don't modify this line, change or create /etc/default/bind9.
++OPTIONS=""
++
++test -f /etc/default/bind9 && . /etc/default/bind9
++
++test -x /usr/sbin/rndc || exit 0
++
++case "$1" in
++    start)
++      echo -n "Starting domain name service: named"
++
++      modprobe capability >/dev/null 2>&1 || true
++      if [ ! -f /etc/bind/rndc.key ]; then
++          /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chmod 0640 /etc/bind/rndc.key
++      fi
++      if [ -f /var/run/named/named.pid ]; then
++          ps `cat /var/run/named/named.pid` > /dev/null && exit 1
++      fi
++
++      # dirs under /var/run can go away on reboots.
++      mkdir -p /var/run/named
++      mkdir -p /var/cache/bind
++      chmod 775 /var/run/named
++      chown root:bind /var/run/named >/dev/null 2>&1 || true
++
++      if [ ! -x /usr/sbin/named ]; then
++          echo "named binary missing - not starting"
++          exit 1
++      fi
++      if start-stop-daemon --start --quiet --exec /usr/sbin/named \
++              --pidfile /var/run/named/named.pid -- $OPTIONS; then
++          if [ -x /sbin/resolvconf ] ; then
++              echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
++          fi
++      fi
++      echo "."
++    ;;
++
++    stop)
++      echo -n "Stopping domain name service: named"
++      if [ -x /sbin/resolvconf ]; then
++          /sbin/resolvconf -d lo
++      fi
++      /usr/sbin/rndc stop >/dev/null 2>&1
++      echo "."
++    ;;
++
++    reload)
++      /usr/sbin/rndc reload
++    ;;
++
++    restart|force-reload)
++      $0 stop
++      sleep 2
++      $0 start
++    ;;
++
++    *)
++      echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
++      exit 1
++    ;;
++esac
++
++exit 0
meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh new file +8 -0
new file mode 100644
index 00000000000..ef915c0ae5a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -s /etc/bind/rndc.key ]; then
+    echo -n "Generating /etc/bind/rndc.key:"
+    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
+    chown root:bind /etc/bind/rndc.key
+    chmod 0640 /etc/bind/rndc.key
+fi
meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch new file +65 -0
new file mode 100644
index 00000000000..11db95ede12
@@ -0,0 +1,65 @@
+Subject: init.d: add support for read-only rootfs
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/init.d b/init.d
+index 0111ed4..24677c8 100644
+--- a/init.d
++++ b/init.d
+@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ # Don't modify this line, change or create /etc/default/bind9.
+ OPTIONS=""
+
++test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/bind9 && . /etc/default/bind9
+
++# This function is here because it's possible that /var and / are on different partitions.
++is_on_read_only_partition () {
++    DIRECTORY=$1
++    dir=`readlink -f $DIRECTORY`
++    while true; do
++      if [ ! -d "$dir" ]; then
++          echo "ERROR: $dir is not a directory"
++          exit 1
++      else
++          for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \
++              END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do
++              [ "$flag" = "FOUND" ] && partition="read-write"
++              [ "$flag" = "ro" ] && { partition="read-only"; break; }
++          done
++          if [ "$dir" = "/" -o -n "$partition" ]; then
++              break
++          else
++              dir=`dirname $dir`
++          fi
++      fi
++    done
++    [ "$partition" = "read-only" ] && echo "yes" || echo "no"
++}
++
++bind_mount () {
++    olddir=$1
++    newdir=$2
++    mkdir -p $olddir
++    cp -a $newdir/* $olddir
++    mount --bind $olddir $newdir
++}
++
++# Deal with read-only rootfs
++if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
++    [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs"
++    [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind
++    [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named
++fi
++
+ test -x /usr/sbin/rndc || exit 0
+
+ case "$1" in
+--
+1.7.9.5
+
meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch new file +42 -0
new file mode 100644
index 00000000000..146f3e35db6
@@ -0,0 +1,42 @@
+bind: make "/etc/init.d/bind stop" work
+
+Upstream-Status: Inappropriate [configuration]
+
+Add some configurations, make rndc command be able to controls
+the named daemon.
+
+Signed-off-by: Roy Li <[email protected]>
+---
+ conf/named.conf |    5 +++++
+ conf/rndc.conf  |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+ create mode 100644 conf/rndc.conf
+
+diff --git a/conf/named.conf b/conf/named.conf
+index 95829cf..c8899e7 100644
+--- a/conf/named.conf
++++ b/conf/named.conf
+@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" {
+ // root-delegation-only exclude { "DE"; "MUSEUM"; };
+
+ include "/etc/bind/named.conf.local";
++include "/etc/bind/rndc.key" ;
++controls {
++      inet 127.0.0.1 allow { localhost; }
++      keys { rndc-key; };
++};
+diff --git a/conf/rndc.conf b/conf/rndc.conf
+new file mode 100644
+index 0000000..a0b481d
+--- /dev/null
++++ b/conf/rndc.conf
+@@ -0,0 +1,5 @@
++include "/etc/bind/rndc.key";
++options {
++      default-server  localhost;
++      default-key     rndc-key;
++};
+
+--
+1.7.5.4
+
meta/recipes-connectivity/bind/bind-9.16.5/named.service new file +22 -0
new file mode 100644
index 00000000000..cda56ef0150
@@ -0,0 +1,22 @@
+[Unit]
+Description=Berkeley Internet Name Domain (DNS)
+Wants=nss-lookup.target
+Before=nss-lookup.target
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/bind9
+PIDFile=/run/named/named.pid
+
+ExecStartPre=@SBINDIR@/generate-rndc-key.sh
+ExecStart=@SBINDIR@/named $OPTIONS
+
+ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
+
+ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
+
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +99 -0
new file mode 100644
index 00000000000..9c20ccc6fa2
@@ -0,0 +1,125 @@
+SUMMARY = "ISC Internet Domain Name Server"
+HOMEPAGE = "http://www.isc.org/sw/bind/"
+SECTION = "console/network"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1"
+
+DEPENDS = "openssl libcap zlib libuv"
+
+SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
+           file://conf.patch \
+           file://named.service \
+           file://bind9 \
+           file://generate-rndc-key.sh \
+           file://make-etc-initd-bind-stop-work.patch \
+           file://init.d-add-support-for-read-only-rootfs.patch \
+           file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
+           file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
+           file://0001-avoid-start-failure-with-bind-user.patch \
+           "
+
+SRC_URI[sha256sum] = "6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075"
+
+UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
+# stay at 9.16 follow the ESV versions divisible by 4
+UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/"
+
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
+
+# PACKAGECONFIGs readline and libedit should NOT be set at same time
+PACKAGECONFIG ?= "readline"
+PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
+PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
+PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
+PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native,"
+
+EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \
+                 --with-gssapi=no --with-lmdb=no --with-zlib \
+                 --sysconfdir=${sysconfdir}/bind \
+                 --with-openssl=${STAGING_DIR_HOST}${prefix} \
+               "
+LDFLAGS_append = " -lz"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)}
+
+# dhcp needs .la so keep them
+REMOVE_LIBTOOL_LA = "0"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
+                       --user-group bind"
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "named.service"
+
+do_install_append() {
+
+       rmdir "${D}${localstatedir}/run"
+       rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+       install -d -o bind "${D}${localstatedir}/cache/bind"
+       install -d "${D}${sysconfdir}/bind"
+       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}
+       install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+       sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+              -e 's,@SBINDIR@,${sbindir},g' \
+              ${D}${systemd_unitdir}/system/named.service
+
+       install -d ${D}${sysconfdir}/default
+       install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               install -d ${D}${sysconfdir}/tmpfiles.d
+               echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
+       fi
+
+    oe_multilib_header isc/platform.h
+}
+
+CONFFILES_${PN} = " \
+       ${sysconfdir}/bind/named.conf \
+       ${sysconfdir}/bind/named.conf.local \
+       ${sysconfdir}/bind/named.conf.options \

meta/recipes-connectivity/bind/bind_9.16.5.bb line 109

Quoted 10 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +10 -0
+       ${sysconfdir}/bind/db.0 \
+       ${sysconfdir}/bind/db.127 \
+       ${sysconfdir}/bind/db.empty \
+       ${sysconfdir}/bind/db.local \
+       ${sysconfdir}/bind/db.root \
+       "
+
+ALTERNATIVE_${PN}-utils = "nslookup"
+ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup"
+ALTERNATIVE_PRIORITY = "100"

I'm seeing this failing with busybox:
update-alternatives: Error: not linking /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup to /bin/busybox.nosuid since /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup exists and is not a link

Quoted 6 lines
Quoted 1 line

busybox sets ALTERNATIVE_PRIORITY = "50". Can this be the issue?

That is weird. I would have expected that to be an issue with the old version too.

Got any steps to reproduce this?

Sorry for delayed response here, it took me some time but I've finally figured the setup to reproduce the issue.

I've used the "vanilla" Poky from master, added IMAGE_INSTALL += "bind-utils" to core-image-minimal and switched from RPM to IPK format. The last thing turned out to be the trigger for the issue, as with RPM package format I was not able to reproduce the issue, and this was cause of the delay here.

After the above is done - following error is produced:
WARNING: core-image-minimal-1.0-r0 do_rootfs: busybox.postinst
returned 1, marking as unpacked only, configuration required on
target.
ERROR: core-image-minimal-1.0-r0 do_rootfs: Postinstall scriptlets of
['busybox'] have failed. If the intention is to defer them to first
boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.
Details of the failure are in /development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.
ERROR: Logfile of failure stored in:
/development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.6423
ERROR: Task (/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs) failed with exit code '1'
NOTE: Tasks Summary: Attempted 3554 tasks of which 3552 didn't need to
be rerun and 1 failed.

Summary: 1 task failed:
/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs
ed:

'nslookup' is definitely comming from the bind-utils package, and the only thing I've noted so far it that in bind-9.11.22 result binary name in ${D} is [nslookup.bind], which is different from the one provided in bind-9.16.5 - [nslookup].

Quoted 7 lines
Quoted 4 lines

In case of previous bind version - both versions seems to be installed, and the symlink is fixed onto the nslookup.bind. In the current version though - I guess that the real binary is installed instead, making symlink operation to fail during update-alternative.

If it is competing with busybox then perhaps priority for bind to provide nslookup should be higher than busybox. Can you try that ?

busybox has ALTERNATIVE_PRIORITY = "50" while bind is set to ALTERNATIVE_PRIORITY = "100". IIRC higher number means higher priority which is already the case...

Nevertheless, I've tried to set 50 and even 40 for 'bind' and had the same failure...

Quoted 34 lines
Quoted 34 lines
Quoted 32 lines

-armin

Quoted 25 lines

Going back to bind 9.11.22 seems to solve it...

Quoted 20 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +16 -1
+
+PACKAGE_BEFORE_PN += "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate"
+FILES_${PN}-dev += "${bindir}/isc-config.h"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+
+PACKAGE_BEFORE_PN += "${PN}-libs"
+FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.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}"
+
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_python3-bind = "python3-core python3-ply"
--

2.17.1

Quoted 8 lines
Quoted 7 lines

--
Regards,
Andrey.

--
Regards,
Andrey.

Signature · 2 lines
Regards,
Andrey.
#20 lore raw

Re: [OE-core] [PATCH 7/8] bind: Add 9.16.x

Quoted 3 lines · Andrey Zhizhikin

Gentle ping here regarding this issue.

Is thre anyone else experiencing this with IPK packages?

Alright thanks for being persist it has paid off :) I have taken a look at it and sent a fix to ml

Quoted 914 lines · Andrey Zhizhikin
Quoted 909 lines · Khem Raj
Quoted 845 lines · Andrey Zhizhikin
Quoted 841 lines · On Mon, Sep 7, 2020 at 5:28 PM akuster808 <[email protected]> wrote:
Quoted 797 lines · Andrey Zhizhikin
Quoted 793 lines

Hello Armin,

Quoted 773 lines · akuster

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
  ...1-avoid-start-failure-with-bind-user.patch |  27 ++
  ...d-V-and-start-log-hide-build-options.patch |  35 ++
  ...ching-for-json-headers-searches-sysr.patch |  47 +++
  .../bind/bind-9.16.5/bind9                    |   2 +
  .../bind/bind-9.16.5/conf.patch               | 330 ++++++++++++++++++
  .../bind/bind-9.16.5/generate-rndc-key.sh     |   8 +
  ...t.d-add-support-for-read-only-rootfs.patch |  65 ++++
  .../make-etc-initd-bind-stop-work.patch       |  42 +++
  .../bind/bind-9.16.5/named.service            |  22 ++
  meta/recipes-connectivity/bind/bind_9.16.5.bb | 125 +++++++
  10 files changed, 703 insertions(+)

create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind9
create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/conf.patch
create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh
create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/named.service
create mode 100644 meta/recipes-connectivity/bind/bind_9.16.5.bb

meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch new file +27 -0
new file mode 100644
index 00000000000..8db96ec049c
@@ -0,0 +1,27 @@
+From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 15 Oct 2018 16:55:09 +0800
+Subject: [PATCH] avoid start failure with bind user
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d b/init.d
+index b2eec60..6e03936 100644
+--- a/init.d
++++ b/init.d
+@@ -57,6 +57,7 @@ case "$1" in
+       modprobe capability >/dev/null 2>&1 || true
+       if [ ! -f /etc/bind/rndc.key ]; then
+           /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
+           chmod 0640 /etc/bind/rndc.key
+       fi
+       if [ -f /var/run/named/named.pid ]; then
+--
+2.7.4
+
meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file +35 -0
new file mode 100644
index 00000000000..5bcc16c9b2b
@@ -0,0 +1,35 @@
+From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with *** (options are hidden)
+[snip]
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
+---
+ bin/named/include/named/globals.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port        INIT(0);
+ EXTERN isc_dscp_t named_g_dscp               INIT(-1);
meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch new file +47 -0
new file mode 100644
index 00000000000..f9cdc7ca4df
@@ -0,0 +1,47 @@
+From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <[email protected]>
+Date: Tue, 9 Jun 2015 11:22:00 -0400
+Subject: [PATCH] bind: ensure searching for json headers searches sysroot
+
+Bind can fail configure by detecting headers w/o libs[1], or
+it can fail the host contamination check as per below:
+
+ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build'
+ERROR: Function failed: do_qa_configure
+ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242
+ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1'
+NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed.
+No currently running tasks (773 of 781)
+
+Summary: 1 task failed:
+  /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure
+
+One way to fix it would be to unconditionally disable json in bind
+configure[2] but here we fix it by using the path to where we would
+put the header if we had json in the sysroot, in case someone wants
+to make use of the combination some day.
+
+[1] https://trac.macports.org/ticket/45305
+[2] https://trac.macports.org/changeset/126406
+
+Upstream-Status: Inappropriate [OE Specific]
+Signed-off-by: Paul Gortmaker <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.4/configure.ac
+===================================================================
+--- bind-9.16.4.orig/configure.ac
++++ bind-9.16.4/configure.ac
+@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
+               LMDB_LIBS=""
+               ;;
+       auto|yes)
+-              for d in /usr /usr/local /opt/local
++              for d in "${STAGING_INCDIR}"
+               do
+                       if test -f "${d}/include/lmdb.h"
+                       then
meta/recipes-connectivity/bind/bind-9.16.5/bind9 new file +2 -0
new file mode 100644
index 00000000000..968679ff7f7
@@ -0,0 +1,2 @@
+# startup options for the server
+OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind-9.16.5/conf.patch new file +330 -0
new file mode 100644
index 00000000000..aad345f9fcf
@@ -0,0 +1,330 @@
+Upstream-Status: Inappropriate [configuration]
+
+the patch is imported from openembedded project
+
+11/30/2010 - Qing He <[email protected]>
+
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0  1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0       2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++1.0.0 IN      PTR     localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL  86400
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                        86400 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255
+--- bind-9.3.1.orig/conf/db.255        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.255     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reserve data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++@     IN      A       127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root       1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root    2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options:  printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;.                            IN      NS
++
++;; ANSWER SECTION:
++.                     518400  IN      NS      A.ROOT-SERVERS.NET.
++.                     518400  IN      NS      B.ROOT-SERVERS.NET.
++.                     518400  IN      NS      C.ROOT-SERVERS.NET.
++.                     518400  IN      NS      D.ROOT-SERVERS.NET.
++.                     518400  IN      NS      E.ROOT-SERVERS.NET.
++.                     518400  IN      NS      F.ROOT-SERVERS.NET.
++.                     518400  IN      NS      G.ROOT-SERVERS.NET.
++.                     518400  IN      NS      H.ROOT-SERVERS.NET.
++.                     518400  IN      NS      I.ROOT-SERVERS.NET.
++.                     518400  IN      NS      J.ROOT-SERVERS.NET.
++.                     518400  IN      NS      K.ROOT-SERVERS.NET.
++.                     518400  IN      NS      L.ROOT-SERVERS.NET.
++.                     518400  IN      NS      M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET.   3600000 IN      A       198.41.0.4
++B.ROOT-SERVERS.NET.   3600000 IN      A       192.228.79.201
++C.ROOT-SERVERS.NET.   3600000 IN      A       192.33.4.12
++D.ROOT-SERVERS.NET.   3600000 IN      A       128.8.10.90
++E.ROOT-SERVERS.NET.   3600000 IN      A       192.203.230.10
++F.ROOT-SERVERS.NET.   3600000 IN      A       192.5.5.241
++G.ROOT-SERVERS.NET.   3600000 IN      A       192.112.36.4
++H.ROOT-SERVERS.NET.   3600000 IN      A       128.63.2.53
++I.ROOT-SERVERS.NET.   3600000 IN      A       192.36.148.17
++J.ROOT-SERVERS.NET.   3600000 IN      A       192.58.128.30
++K.ROOT-SERVERS.NET.   3600000 IN      A       193.0.14.129
++L.ROOT-SERVERS.NET.   3600000 IN      A       198.32.64.12
++M.ROOT-SERVERS.NET.   3600000 IN      A       202.12.27.33
++
++;; Query time: 81 msec
++;; SERVER: 198.41.0.4#53(a.root-servers.net.)
++;; WHEN: Sun Feb  1 11:27:14 2004
++;; MSG SIZE  rcvd: 436
++
+diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+--- bind-9.3.1.orig/conf/named.conf    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200
+@@ -0,0 +1,49 @@
++// This is the primary configuration file for the BIND DNS server named.
++//
++// If you are just adding zones, please do that in /etc/bind/named.conf.local
++
++include "/etc/bind/named.conf.options";
++
++// prime the server with knowledge of the root servers
++zone "." {
++      type hint;
++      file "/etc/bind/db.root";
++};
++
++// be authoritative for the localhost forward and reverse zones, and for
++// broadcast zones as per RFC 1912
++
++zone "localhost" {
++      type master;
++      file "/etc/bind/db.local";
++};
++
++zone "127.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.127";
++};
++
++zone "0.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.0";
++};
++
++zone "255.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.255";
++};
++
++// zone "com" { type delegation-only; };
++// zone "net" { type delegation-only; };
++
++// From the release notes:
++//  Because many of our users are uncomfortable receiving undelegated answers
++//  from root or top level domains, other than a few for whom that behaviour
++//  has been trusted and expected for quite some length of time, we have now
++//  introduced the "root-delegations-only" feature which applies delegation-only
++//  logic to all top level domains, and to the root domain.  An exception list
++//  should be specified, including "MUSEUM" and "DE", and any other top level
++//  domains from whom undelegated responses are expected and trusted.
++// root-delegation-only exclude { "DE"; "MUSEUM"; };
++
++include "/etc/bind/named.conf.local";
+diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+--- bind-9.3.1.orig/conf/named.conf.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.local   2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,8 @@
++//
++// Do any local configuration here
++//
++
++// Consider adding the 1918 zones here, if they are not used in your
++// organization
++//include "/etc/bind/zones.rfc1918";
++
+diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
+--- bind-9.3.1.orig/conf/named.conf.options    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,24 @@
++options {
++      directory "/var/cache/bind";
++
++      // If there is a firewall between you and nameservers you want
++      // to talk to, you might need to uncomment the query-source
++      // directive below.  Previous versions of BIND always asked
++      // questions using port 53, but BIND 8.1 and later use an unprivileged
++      // port by default.
++
++      // query-source address * port 53;
++
++      // If your ISP provided one or more IP addresses for stable
++      // nameservers, you probably want to use them as forwarders.
++      // Uncomment the following block, and insert the addresses replacing
++      // the all-0's placeholder.
++
++      // forwarders {
++      //      0.0.0.0;
++      // };
++
++      auth-nxdomain no;    # conform to RFC1035
++
++};
++
+diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/zones.rfc1918      2005-07-10 22:14:10.000000000 +0200
+@@ -0,0 +1,20 @@
++zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
++
++zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++
++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
+--- bind-9.3.1.orig/init.d     1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/init.d  2005-07-10 23:09:58.000000000 +0200
+@@ -0,0 +1,70 @@
++#!/bin/sh
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++
++# for a chrooted server: "-u bind -t /var/lib/named"
++# Don't modify this line, change or create /etc/default/bind9.
++OPTIONS=""
++
++test -f /etc/default/bind9 && . /etc/default/bind9
++
++test -x /usr/sbin/rndc || exit 0
++
++case "$1" in
++    start)
++      echo -n "Starting domain name service: named"
++
++      modprobe capability >/dev/null 2>&1 || true
++      if [ ! -f /etc/bind/rndc.key ]; then
++          /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chmod 0640 /etc/bind/rndc.key
++      fi
++      if [ -f /var/run/named/named.pid ]; then
++          ps `cat /var/run/named/named.pid` > /dev/null && exit 1
++      fi
++
++      # dirs under /var/run can go away on reboots.
++      mkdir -p /var/run/named
++      mkdir -p /var/cache/bind
++      chmod 775 /var/run/named
++      chown root:bind /var/run/named >/dev/null 2>&1 || true
++
++      if [ ! -x /usr/sbin/named ]; then
++          echo "named binary missing - not starting"
++          exit 1
++      fi
++      if start-stop-daemon --start --quiet --exec /usr/sbin/named \
++              --pidfile /var/run/named/named.pid -- $OPTIONS; then
++          if [ -x /sbin/resolvconf ] ; then
++              echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
++          fi
++      fi
++      echo "."
++    ;;
++
++    stop)
++      echo -n "Stopping domain name service: named"
++      if [ -x /sbin/resolvconf ]; then
++          /sbin/resolvconf -d lo
++      fi
++      /usr/sbin/rndc stop >/dev/null 2>&1
++      echo "."
++    ;;
++
++    reload)
++      /usr/sbin/rndc reload
++    ;;
++
++    restart|force-reload)
++      $0 stop
++      sleep 2
++      $0 start
++    ;;
++
++    *)
++      echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
++      exit 1
++    ;;
++esac
++
++exit 0
meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh new file +8 -0
new file mode 100644
index 00000000000..ef915c0ae5a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -s /etc/bind/rndc.key ]; then
+    echo -n "Generating /etc/bind/rndc.key:"
+    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
+    chown root:bind /etc/bind/rndc.key
+    chmod 0640 /etc/bind/rndc.key
+fi
meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch new file +65 -0
new file mode 100644
index 00000000000..11db95ede12
@@ -0,0 +1,65 @@
+Subject: init.d: add support for read-only rootfs
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/init.d b/init.d
+index 0111ed4..24677c8 100644
+--- a/init.d
++++ b/init.d
+@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ # Don't modify this line, change or create /etc/default/bind9.
+ OPTIONS=""
+
++test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/bind9 && . /etc/default/bind9
+
++# This function is here because it's possible that /var and / are on different partitions.
++is_on_read_only_partition () {
++    DIRECTORY=$1
++    dir=`readlink -f $DIRECTORY`
++    while true; do
++      if [ ! -d "$dir" ]; then
++          echo "ERROR: $dir is not a directory"
++          exit 1
++      else
++          for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \
++              END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do
++              [ "$flag" = "FOUND" ] && partition="read-write"
++              [ "$flag" = "ro" ] && { partition="read-only"; break; }
++          done
++          if [ "$dir" = "/" -o -n "$partition" ]; then
++              break
++          else
++              dir=`dirname $dir`
++          fi
++      fi
++    done
++    [ "$partition" = "read-only" ] && echo "yes" || echo "no"
++}
++
++bind_mount () {
++    olddir=$1
++    newdir=$2
++    mkdir -p $olddir
++    cp -a $newdir/* $olddir
++    mount --bind $olddir $newdir
++}
++
++# Deal with read-only rootfs
++if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
++    [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs"
++    [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind
++    [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named
++fi
++
+ test -x /usr/sbin/rndc || exit 0
+
+ case "$1" in
+--
+1.7.9.5
+
meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch new file +42 -0
new file mode 100644
index 00000000000..146f3e35db6
@@ -0,0 +1,42 @@
+bind: make "/etc/init.d/bind stop" work
+
+Upstream-Status: Inappropriate [configuration]
+
+Add some configurations, make rndc command be able to controls
+the named daemon.
+
+Signed-off-by: Roy Li <[email protected]>
+---
+ conf/named.conf |    5 +++++
+ conf/rndc.conf  |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+ create mode 100644 conf/rndc.conf
+
+diff --git a/conf/named.conf b/conf/named.conf
+index 95829cf..c8899e7 100644
+--- a/conf/named.conf
++++ b/conf/named.conf
+@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" {
+ // root-delegation-only exclude { "DE"; "MUSEUM"; };
+
+ include "/etc/bind/named.conf.local";
++include "/etc/bind/rndc.key" ;
++controls {
++      inet 127.0.0.1 allow { localhost; }
++      keys { rndc-key; };
++};
+diff --git a/conf/rndc.conf b/conf/rndc.conf
+new file mode 100644
+index 0000000..a0b481d
+--- /dev/null
++++ b/conf/rndc.conf
+@@ -0,0 +1,5 @@
++include "/etc/bind/rndc.key";
++options {
++      default-server  localhost;
++      default-key     rndc-key;
++};
+
+--
+1.7.5.4
+
meta/recipes-connectivity/bind/bind-9.16.5/named.service new file +22 -0
new file mode 100644
index 00000000000..cda56ef0150
@@ -0,0 +1,22 @@
+[Unit]
+Description=Berkeley Internet Name Domain (DNS)
+Wants=nss-lookup.target
+Before=nss-lookup.target
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/bind9
+PIDFile=/run/named/named.pid
+
+ExecStartPre=@SBINDIR@/generate-rndc-key.sh
+ExecStart=@SBINDIR@/named $OPTIONS
+
+ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
+
+ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
+
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +99 -0
new file mode 100644
index 00000000000..9c20ccc6fa2
@@ -0,0 +1,125 @@
+SUMMARY = "ISC Internet Domain Name Server"
+HOMEPAGE = "http://www.isc.org/sw/bind/"
+SECTION = "console/network"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1"
+
+DEPENDS = "openssl libcap zlib libuv"
+
+SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
+           file://conf.patch \
+           file://named.service \
+           file://bind9 \
+           file://generate-rndc-key.sh \
+           file://make-etc-initd-bind-stop-work.patch \
+           file://init.d-add-support-for-read-only-rootfs.patch \
+           file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
+           file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
+           file://0001-avoid-start-failure-with-bind-user.patch \
+           "
+
+SRC_URI[sha256sum] = "6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075"
+
+UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
+# stay at 9.16 follow the ESV versions divisible by 4
+UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/"
+
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
+
+# PACKAGECONFIGs readline and libedit should NOT be set at same time
+PACKAGECONFIG ?= "readline"
+PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
+PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
+PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
+PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native,"
+
+EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \
+                 --with-gssapi=no --with-lmdb=no --with-zlib \
+                 --sysconfdir=${sysconfdir}/bind \
+                 --with-openssl=${STAGING_DIR_HOST}${prefix} \
+               "
+LDFLAGS_append = " -lz"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)}
+
+# dhcp needs .la so keep them
+REMOVE_LIBTOOL_LA = "0"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
+                       --user-group bind"
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "named.service"
+
+do_install_append() {
+
+       rmdir "${D}${localstatedir}/run"
+       rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+       install -d -o bind "${D}${localstatedir}/cache/bind"
+       install -d "${D}${sysconfdir}/bind"
+       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}
+       install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+       sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+              -e 's,@SBINDIR@,${sbindir},g' \
+              ${D}${systemd_unitdir}/system/named.service
+
+       install -d ${D}${sysconfdir}/default
+       install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               install -d ${D}${sysconfdir}/tmpfiles.d
+               echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
+       fi
+
+    oe_multilib_header isc/platform.h
+}
+
+CONFFILES_${PN} = " \
+       ${sysconfdir}/bind/named.conf \
+       ${sysconfdir}/bind/named.conf.local \
+       ${sysconfdir}/bind/named.conf.options \

meta/recipes-connectivity/bind/bind_9.16.5.bb line 109

Quoted 10 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +10 -0
+       ${sysconfdir}/bind/db.0 \
+       ${sysconfdir}/bind/db.127 \
+       ${sysconfdir}/bind/db.empty \
+       ${sysconfdir}/bind/db.local \
+       ${sysconfdir}/bind/db.root \
+       "
+
+ALTERNATIVE_${PN}-utils = "nslookup"
+ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup"
+ALTERNATIVE_PRIORITY = "100"

I'm seeing this failing with busybox:
update-alternatives: Error: not linking /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup to /bin/busybox.nosuid since /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup exists and is not a link

Quoted 6 lines
Quoted 1 line

busybox sets ALTERNATIVE_PRIORITY = "50". Can this be the issue?

That is weird. I would have expected that to be an issue with the old version too.

Got any steps to reproduce this?

Sorry for delayed response here, it took me some time but I've finally figured the setup to reproduce the issue.

I've used the "vanilla" Poky from master, added IMAGE_INSTALL += "bind-utils" to core-image-minimal and switched from RPM to IPK format. The last thing turned out to be the trigger for the issue, as with RPM package format I was not able to reproduce the issue, and this was cause of the delay here.

After the above is done - following error is produced:
WARNING: core-image-minimal-1.0-r0 do_rootfs: busybox.postinst
returned 1, marking as unpacked only, configuration required on
target.
ERROR: core-image-minimal-1.0-r0 do_rootfs: Postinstall scriptlets of
['busybox'] have failed. If the intention is to defer them to first
boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.
Details of the failure are in /development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.
ERROR: Logfile of failure stored in:
/development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.6423
ERROR: Task (/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs) failed with exit code '1'
NOTE: Tasks Summary: Attempted 3554 tasks of which 3552 didn't need to
be rerun and 1 failed.

Summary: 1 task failed:
/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs
ed:

'nslookup' is definitely comming from the bind-utils package, and the only thing I've noted so far it that in bind-9.11.22 result binary name in ${D} is [nslookup.bind], which is different from the one provided in bind-9.16.5 - [nslookup].

Quoted 7 lines
Quoted 4 lines

In case of previous bind version - both versions seems to be installed, and the symlink is fixed onto the nslookup.bind. In the current version though - I guess that the real binary is installed instead, making symlink operation to fail during update-alternative.

If it is competing with busybox then perhaps priority for bind to provide nslookup should be higher than busybox. Can you try that ?

busybox has ALTERNATIVE_PRIORITY = "50" while bind is set to ALTERNATIVE_PRIORITY = "100". IIRC higher number means higher priority which is already the case...

Nevertheless, I've tried to set 50 and even 40 for 'bind' and had the same failure...

Quoted 34 lines
Quoted 34 lines
Quoted 32 lines

-armin

Quoted 25 lines

Going back to bind 9.11.22 seems to solve it...

Quoted 20 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +16 -1
+
+PACKAGE_BEFORE_PN += "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate"
+FILES_${PN}-dev += "${bindir}/isc-config.h"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+
+PACKAGE_BEFORE_PN += "${PN}-libs"
+FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.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}"
+
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_python3-bind = "python3-core python3-ply"
--

2.17.1

Quoted 8 lines
Quoted 7 lines

--
Regards,
Andrey.

--
Regards,
Andrey.

#21 lore raw

Re: [OE-core] [PATCH 7/8] bind: Add 9.16.x

Quoted 10 lines · Khem Raj
Quoted 3 lines · Andrey Zhizhikin

Gentle ping here regarding this issue.

Is thre anyone else experiencing this with IPK packages?

Alright thanks for being persist it has paid off :) I have taken a look at it and sent a fix to ml

Thanks a lot! :)

Actually, it was such an obvious thing that I managed to overlook - it didn't cross my eye that update-alternative inheritance was missing in the first place! :)

The mystery that still remains however: why did it work for RPM package types? Is there a check that is missing somewhere, or update-alternatives are inherited implicitly?

I guess if not because of the fact that it did work out for RPM in the first place - those kinds of obvious failures could be avoided at the very start.

Quoted 916 lines
Quoted 916 lines · Andrey Zhizhikin
Quoted 909 lines · Khem Raj
Quoted 845 lines · Andrey Zhizhikin
Quoted 841 lines · On Mon, Sep 7, 2020 at 5:28 PM akuster808 <[email protected]> wrote:
Quoted 797 lines · Andrey Zhizhikin
Quoted 793 lines

Hello Armin,

Quoted 773 lines · akuster

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
  ...1-avoid-start-failure-with-bind-user.patch |  27 ++
  ...d-V-and-start-log-hide-build-options.patch |  35 ++
  ...ching-for-json-headers-searches-sysr.patch |  47 +++
  .../bind/bind-9.16.5/bind9                    |   2 +
  .../bind/bind-9.16.5/conf.patch               | 330 ++++++++++++++++++
  .../bind/bind-9.16.5/generate-rndc-key.sh     |   8 +
  ...t.d-add-support-for-read-only-rootfs.patch |  65 ++++
  .../make-etc-initd-bind-stop-work.patch       |  42 +++
  .../bind/bind-9.16.5/named.service            |  22 ++
  meta/recipes-connectivity/bind/bind_9.16.5.bb | 125 +++++++
  10 files changed, 703 insertions(+)

create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/bind9
create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/conf.patch
create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh
create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.16.5/named.service
create mode 100644 meta/recipes-connectivity/bind/bind_9.16.5.bb

meta/recipes-connectivity/bind/bind-9.16.5/0001-avoid-start-failure-with-bind-user.patch new file +27 -0
new file mode 100644
index 00000000000..8db96ec049c
@@ -0,0 +1,27 @@
+From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 15 Oct 2018 16:55:09 +0800
+Subject: [PATCH] avoid start failure with bind user
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d b/init.d
+index b2eec60..6e03936 100644
+--- a/init.d
++++ b/init.d
+@@ -57,6 +57,7 @@ case "$1" in
+       modprobe capability >/dev/null 2>&1 || true
+       if [ ! -f /etc/bind/rndc.key ]; then
+           /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
+           chmod 0640 /etc/bind/rndc.key
+       fi
+       if [ -f /var/run/named/named.pid ]; then
+--
+2.7.4
+
meta/recipes-connectivity/bind/bind-9.16.5/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file +35 -0
new file mode 100644
index 00000000000..5bcc16c9b2b
@@ -0,0 +1,35 @@
+From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with *** (options are hidden)
+[snip]
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
+---
+ bin/named/include/named/globals.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port        INIT(0);
+ EXTERN isc_dscp_t named_g_dscp               INIT(-1);
meta/recipes-connectivity/bind/bind-9.16.5/bind-ensure-searching-for-json-headers-searches-sysr.patch new file +47 -0
new file mode 100644
index 00000000000..f9cdc7ca4df
@@ -0,0 +1,47 @@
+From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <[email protected]>
+Date: Tue, 9 Jun 2015 11:22:00 -0400
+Subject: [PATCH] bind: ensure searching for json headers searches sysroot
+
+Bind can fail configure by detecting headers w/o libs[1], or
+it can fail the host contamination check as per below:
+
+ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build'
+ERROR: Function failed: do_qa_configure
+ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242
+ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1'
+NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed.
+No currently running tasks (773 of 781)
+
+Summary: 1 task failed:
+  /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure
+
+One way to fix it would be to unconditionally disable json in bind
+configure[2] but here we fix it by using the path to where we would
+put the header if we had json in the sysroot, in case someone wants
+to make use of the combination some day.
+
+[1] https://trac.macports.org/ticket/45305
+[2] https://trac.macports.org/changeset/126406
+
+Upstream-Status: Inappropriate [OE Specific]
+Signed-off-by: Paul Gortmaker <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: bind-9.16.4/configure.ac
+===================================================================
+--- bind-9.16.4.orig/configure.ac
++++ bind-9.16.4/configure.ac
+@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
+               LMDB_LIBS=""
+               ;;
+       auto|yes)
+-              for d in /usr /usr/local /opt/local
++              for d in "${STAGING_INCDIR}"
+               do
+                       if test -f "${d}/include/lmdb.h"
+                       then
meta/recipes-connectivity/bind/bind-9.16.5/bind9 new file +2 -0
new file mode 100644
index 00000000000..968679ff7f7
@@ -0,0 +1,2 @@
+# startup options for the server
+OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind-9.16.5/conf.patch new file +330 -0
new file mode 100644
index 00000000000..aad345f9fcf
@@ -0,0 +1,330 @@
+Upstream-Status: Inappropriate [configuration]
+
+the patch is imported from openembedded project
+
+11/30/2010 - Qing He <[email protected]>
+
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0  1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0       2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++1.0.0 IN      PTR     localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL  86400
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                        86400 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255
+--- bind-9.3.1.orig/conf/db.255        1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.255     2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reserve data file for broadcast zone
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local   2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL  604800
++@     IN      SOA     localhost. root.localhost. (
++                            1         ; Serial
++                       604800         ; Refresh
++                        86400         ; Retry
++                      2419200         ; Expire
++                       604800 )       ; Negative Cache TTL
++;
++@     IN      NS      localhost.
++@     IN      A       127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root       1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root    2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options:  printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;.                            IN      NS
++
++;; ANSWER SECTION:
++.                     518400  IN      NS      A.ROOT-SERVERS.NET.
++.                     518400  IN      NS      B.ROOT-SERVERS.NET.
++.                     518400  IN      NS      C.ROOT-SERVERS.NET.
++.                     518400  IN      NS      D.ROOT-SERVERS.NET.
++.                     518400  IN      NS      E.ROOT-SERVERS.NET.
++.                     518400  IN      NS      F.ROOT-SERVERS.NET.
++.                     518400  IN      NS      G.ROOT-SERVERS.NET.
++.                     518400  IN      NS      H.ROOT-SERVERS.NET.
++.                     518400  IN      NS      I.ROOT-SERVERS.NET.
++.                     518400  IN      NS      J.ROOT-SERVERS.NET.
++.                     518400  IN      NS      K.ROOT-SERVERS.NET.
++.                     518400  IN      NS      L.ROOT-SERVERS.NET.
++.                     518400  IN      NS      M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET.   3600000 IN      A       198.41.0.4
++B.ROOT-SERVERS.NET.   3600000 IN      A       192.228.79.201
++C.ROOT-SERVERS.NET.   3600000 IN      A       192.33.4.12
++D.ROOT-SERVERS.NET.   3600000 IN      A       128.8.10.90
++E.ROOT-SERVERS.NET.   3600000 IN      A       192.203.230.10
++F.ROOT-SERVERS.NET.   3600000 IN      A       192.5.5.241
++G.ROOT-SERVERS.NET.   3600000 IN      A       192.112.36.4
++H.ROOT-SERVERS.NET.   3600000 IN      A       128.63.2.53
++I.ROOT-SERVERS.NET.   3600000 IN      A       192.36.148.17
++J.ROOT-SERVERS.NET.   3600000 IN      A       192.58.128.30
++K.ROOT-SERVERS.NET.   3600000 IN      A       193.0.14.129
++L.ROOT-SERVERS.NET.   3600000 IN      A       198.32.64.12
++M.ROOT-SERVERS.NET.   3600000 IN      A       202.12.27.33
++
++;; Query time: 81 msec
++;; SERVER: 198.41.0.4#53(a.root-servers.net.)
++;; WHEN: Sun Feb  1 11:27:14 2004
++;; MSG SIZE  rcvd: 436
++
+diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+--- bind-9.3.1.orig/conf/named.conf    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200
+@@ -0,0 +1,49 @@
++// This is the primary configuration file for the BIND DNS server named.
++//
++// If you are just adding zones, please do that in /etc/bind/named.conf.local
++
++include "/etc/bind/named.conf.options";
++
++// prime the server with knowledge of the root servers
++zone "." {
++      type hint;
++      file "/etc/bind/db.root";
++};
++
++// be authoritative for the localhost forward and reverse zones, and for
++// broadcast zones as per RFC 1912
++
++zone "localhost" {
++      type master;
++      file "/etc/bind/db.local";
++};
++
++zone "127.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.127";
++};
++
++zone "0.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.0";
++};
++
++zone "255.in-addr.arpa" {
++      type master;
++      file "/etc/bind/db.255";
++};
++
++// zone "com" { type delegation-only; };
++// zone "net" { type delegation-only; };
++
++// From the release notes:
++//  Because many of our users are uncomfortable receiving undelegated answers
++//  from root or top level domains, other than a few for whom that behaviour
++//  has been trusted and expected for quite some length of time, we have now
++//  introduced the "root-delegations-only" feature which applies delegation-only
++//  logic to all top level domains, and to the root domain.  An exception list
++//  should be specified, including "MUSEUM" and "DE", and any other top level
++//  domains from whom undelegated responses are expected and trusted.
++// root-delegation-only exclude { "DE"; "MUSEUM"; };
++
++include "/etc/bind/named.conf.local";
+diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+--- bind-9.3.1.orig/conf/named.conf.local      1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.local   2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,8 @@
++//
++// Do any local configuration here
++//
++
++// Consider adding the 1918 zones here, if they are not used in your
++// organization
++//include "/etc/bind/zones.rfc1918";
++
+diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
+--- bind-9.3.1.orig/conf/named.conf.options    1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,24 @@
++options {
++      directory "/var/cache/bind";
++
++      // If there is a firewall between you and nameservers you want
++      // to talk to, you might need to uncomment the query-source
++      // directive below.  Previous versions of BIND always asked
++      // questions using port 53, but BIND 8.1 and later use an unprivileged
++      // port by default.
++
++      // query-source address * port 53;
++
++      // If your ISP provided one or more IP addresses for stable
++      // nameservers, you probably want to use them as forwarders.
++      // Uncomment the following block, and insert the addresses replacing
++      // the all-0's placeholder.
++
++      // forwarders {
++      //      0.0.0.0;
++      // };
++
++      auth-nxdomain no;    # conform to RFC1035
++
++};
++
+diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/zones.rfc1918      2005-07-10 22:14:10.000000000 +0200
+@@ -0,0 +1,20 @@
++zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
++
++zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++
++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
+--- bind-9.3.1.orig/init.d     1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/init.d  2005-07-10 23:09:58.000000000 +0200
+@@ -0,0 +1,70 @@
++#!/bin/sh
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++
++# for a chrooted server: "-u bind -t /var/lib/named"
++# Don't modify this line, change or create /etc/default/bind9.
++OPTIONS=""
++
++test -f /etc/default/bind9 && . /etc/default/bind9
++
++test -x /usr/sbin/rndc || exit 0
++
++case "$1" in
++    start)
++      echo -n "Starting domain name service: named"
++
++      modprobe capability >/dev/null 2>&1 || true
++      if [ ! -f /etc/bind/rndc.key ]; then
++          /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
++          chmod 0640 /etc/bind/rndc.key
++      fi
++      if [ -f /var/run/named/named.pid ]; then
++          ps `cat /var/run/named/named.pid` > /dev/null && exit 1
++      fi
++
++      # dirs under /var/run can go away on reboots.
++      mkdir -p /var/run/named
++      mkdir -p /var/cache/bind
++      chmod 775 /var/run/named
++      chown root:bind /var/run/named >/dev/null 2>&1 || true
++
++      if [ ! -x /usr/sbin/named ]; then
++          echo "named binary missing - not starting"
++          exit 1
++      fi
++      if start-stop-daemon --start --quiet --exec /usr/sbin/named \
++              --pidfile /var/run/named/named.pid -- $OPTIONS; then
++          if [ -x /sbin/resolvconf ] ; then
++              echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
++          fi
++      fi
++      echo "."
++    ;;
++
++    stop)
++      echo -n "Stopping domain name service: named"
++      if [ -x /sbin/resolvconf ]; then
++          /sbin/resolvconf -d lo
++      fi
++      /usr/sbin/rndc stop >/dev/null 2>&1
++      echo "."
++    ;;
++
++    reload)
++      /usr/sbin/rndc reload
++    ;;
++
++    restart|force-reload)
++      $0 stop
++      sleep 2
++      $0 start
++    ;;
++
++    *)
++      echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
++      exit 1
++    ;;
++esac
++
++exit 0
meta/recipes-connectivity/bind/bind-9.16.5/generate-rndc-key.sh new file +8 -0
new file mode 100644
index 00000000000..ef915c0ae5a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -s /etc/bind/rndc.key ]; then
+    echo -n "Generating /etc/bind/rndc.key:"
+    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
+    chown root:bind /etc/bind/rndc.key
+    chmod 0640 /etc/bind/rndc.key
+fi
meta/recipes-connectivity/bind/bind-9.16.5/init.d-add-support-for-read-only-rootfs.patch new file +65 -0
new file mode 100644
index 00000000000..11db95ede12
@@ -0,0 +1,65 @@
+Subject: init.d: add support for read-only rootfs
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ init.d |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/init.d b/init.d
+index 0111ed4..24677c8 100644
+--- a/init.d
++++ b/init.d
+@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ # Don't modify this line, change or create /etc/default/bind9.
+ OPTIONS=""
+
++test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/bind9 && . /etc/default/bind9
+
++# This function is here because it's possible that /var and / are on different partitions.
++is_on_read_only_partition () {
++    DIRECTORY=$1
++    dir=`readlink -f $DIRECTORY`
++    while true; do
++      if [ ! -d "$dir" ]; then
++          echo "ERROR: $dir is not a directory"
++          exit 1
++      else
++          for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \
++              END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do
++              [ "$flag" = "FOUND" ] && partition="read-write"
++              [ "$flag" = "ro" ] && { partition="read-only"; break; }
++          done
++          if [ "$dir" = "/" -o -n "$partition" ]; then
++              break
++          else
++              dir=`dirname $dir`
++          fi
++      fi
++    done
++    [ "$partition" = "read-only" ] && echo "yes" || echo "no"
++}
++
++bind_mount () {
++    olddir=$1
++    newdir=$2
++    mkdir -p $olddir
++    cp -a $newdir/* $olddir
++    mount --bind $olddir $newdir
++}
++
++# Deal with read-only rootfs
++if [ "$ROOTFS_READ_ONLY" = "yes" ]; then
++    [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs"
++    [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind
++    [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named
++fi
++
+ test -x /usr/sbin/rndc || exit 0
+
+ case "$1" in
+--
+1.7.9.5
+
meta/recipes-connectivity/bind/bind-9.16.5/make-etc-initd-bind-stop-work.patch new file +42 -0
new file mode 100644
index 00000000000..146f3e35db6
@@ -0,0 +1,42 @@
+bind: make "/etc/init.d/bind stop" work
+
+Upstream-Status: Inappropriate [configuration]
+
+Add some configurations, make rndc command be able to controls
+the named daemon.
+
+Signed-off-by: Roy Li <[email protected]>
+---
+ conf/named.conf |    5 +++++
+ conf/rndc.conf  |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+ create mode 100644 conf/rndc.conf
+
+diff --git a/conf/named.conf b/conf/named.conf
+index 95829cf..c8899e7 100644
+--- a/conf/named.conf
++++ b/conf/named.conf
+@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" {
+ // root-delegation-only exclude { "DE"; "MUSEUM"; };
+
+ include "/etc/bind/named.conf.local";
++include "/etc/bind/rndc.key" ;
++controls {
++      inet 127.0.0.1 allow { localhost; }
++      keys { rndc-key; };
++};
+diff --git a/conf/rndc.conf b/conf/rndc.conf
+new file mode 100644
+index 0000000..a0b481d
+--- /dev/null
++++ b/conf/rndc.conf
+@@ -0,0 +1,5 @@
++include "/etc/bind/rndc.key";
++options {
++      default-server  localhost;
++      default-key     rndc-key;
++};
+
+--
+1.7.5.4
+
meta/recipes-connectivity/bind/bind-9.16.5/named.service new file +22 -0
new file mode 100644
index 00000000000..cda56ef0150
@@ -0,0 +1,22 @@
+[Unit]
+Description=Berkeley Internet Name Domain (DNS)
+Wants=nss-lookup.target
+Before=nss-lookup.target
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/bind9
+PIDFile=/run/named/named.pid
+
+ExecStartPre=@SBINDIR@/generate-rndc-key.sh
+ExecStart=@SBINDIR@/named $OPTIONS
+
+ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
+
+ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
+
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +99 -0
new file mode 100644
index 00000000000..9c20ccc6fa2
@@ -0,0 +1,125 @@
+SUMMARY = "ISC Internet Domain Name Server"
+HOMEPAGE = "http://www.isc.org/sw/bind/"
+SECTION = "console/network"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1"
+
+DEPENDS = "openssl libcap zlib libuv"
+
+SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
+           file://conf.patch \
+           file://named.service \
+           file://bind9 \
+           file://generate-rndc-key.sh \
+           file://make-etc-initd-bind-stop-work.patch \
+           file://init.d-add-support-for-read-only-rootfs.patch \
+           file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
+           file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
+           file://0001-avoid-start-failure-with-bind-user.patch \
+           "
+
+SRC_URI[sha256sum] = "6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075"
+
+UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
+# stay at 9.16 follow the ESV versions divisible by 4
+UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/"
+
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
+
+# PACKAGECONFIGs readline and libedit should NOT be set at same time
+PACKAGECONFIG ?= "readline"
+PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
+PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
+PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
+PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native,"
+
+EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \
+                 --with-gssapi=no --with-lmdb=no --with-zlib \
+                 --sysconfdir=${sysconfdir}/bind \
+                 --with-openssl=${STAGING_DIR_HOST}${prefix} \
+               "
+LDFLAGS_append = " -lz"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)}
+
+# dhcp needs .la so keep them
+REMOVE_LIBTOOL_LA = "0"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
+                       --user-group bind"
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "named.service"
+
+do_install_append() {
+
+       rmdir "${D}${localstatedir}/run"
+       rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+       install -d -o bind "${D}${localstatedir}/cache/bind"
+       install -d "${D}${sysconfdir}/bind"
+       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}
+       install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+       sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+              -e 's,@SBINDIR@,${sbindir},g' \
+              ${D}${systemd_unitdir}/system/named.service
+
+       install -d ${D}${sysconfdir}/default
+       install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               install -d ${D}${sysconfdir}/tmpfiles.d
+               echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
+       fi
+
+    oe_multilib_header isc/platform.h
+}
+
+CONFFILES_${PN} = " \
+       ${sysconfdir}/bind/named.conf \
+       ${sysconfdir}/bind/named.conf.local \
+       ${sysconfdir}/bind/named.conf.options \

meta/recipes-connectivity/bind/bind_9.16.5.bb line 109

Quoted 10 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +10 -0
+       ${sysconfdir}/bind/db.0 \
+       ${sysconfdir}/bind/db.127 \
+       ${sysconfdir}/bind/db.empty \
+       ${sysconfdir}/bind/db.local \
+       ${sysconfdir}/bind/db.root \
+       "
+
+ALTERNATIVE_${PN}-utils = "nslookup"
+ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup"
+ALTERNATIVE_PRIORITY = "100"

I'm seeing this failing with busybox:
update-alternatives: Error: not linking /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup to /bin/busybox.nosuid since /development/yocto-master/build-output/work/imx8mmevk-fsl-linux/image-cmdline-validation/1.0-r0/rootfs/usr/bin/nslookup exists and is not a link

Quoted 6 lines
Quoted 1 line

busybox sets ALTERNATIVE_PRIORITY = "50". Can this be the issue?

That is weird. I would have expected that to be an issue with the old version too.

Got any steps to reproduce this?

Sorry for delayed response here, it took me some time but I've finally figured the setup to reproduce the issue.

I've used the "vanilla" Poky from master, added IMAGE_INSTALL += "bind-utils" to core-image-minimal and switched from RPM to IPK format. The last thing turned out to be the trigger for the issue, as with RPM package format I was not able to reproduce the issue, and this was cause of the delay here.

After the above is done - following error is produced:
WARNING: core-image-minimal-1.0-r0 do_rootfs: busybox.postinst
returned 1, marking as unpacked only, configuration required on
target.
ERROR: core-image-minimal-1.0-r0 do_rootfs: Postinstall scriptlets of
['busybox'] have failed. If the intention is to defer them to first
boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.
Details of the failure are in /development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.
ERROR: Logfile of failure stored in:
/development/projects/poky-vanilla/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.6423
ERROR: Task (/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs) failed with exit code '1'
NOTE: Tasks Summary: Attempted 3554 tasks of which 3552 didn't need to
be rerun and 1 failed.

Summary: 1 task failed:
/development/projects/poky-vanilla/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs
ed:

'nslookup' is definitely comming from the bind-utils package, and the only thing I've noted so far it that in bind-9.11.22 result binary name in ${D} is [nslookup.bind], which is different from the one provided in bind-9.16.5 - [nslookup].

Quoted 7 lines
Quoted 4 lines

In case of previous bind version - both versions seems to be installed, and the symlink is fixed onto the nslookup.bind. In the current version though - I guess that the real binary is installed instead, making symlink operation to fail during update-alternative.

If it is competing with busybox then perhaps priority for bind to provide nslookup should be higher than busybox. Can you try that ?

busybox has ALTERNATIVE_PRIORITY = "50" while bind is set to ALTERNATIVE_PRIORITY = "100". IIRC higher number means higher priority which is already the case...

Nevertheless, I've tried to set 50 and even 40 for 'bind' and had the same failure...

Quoted 34 lines
Quoted 34 lines
Quoted 32 lines

-armin

Quoted 25 lines

Going back to bind 9.11.22 seems to solve it...

Quoted 20 lines
meta/recipes-connectivity/bind/bind_9.16.5.bb new file +16 -1
+
+PACKAGE_BEFORE_PN += "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate"
+FILES_${PN}-dev += "${bindir}/isc-config.h"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+
+PACKAGE_BEFORE_PN += "${PN}-libs"
+FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.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}"
+
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_python3-bind = "python3-core python3-ply"
--

2.17.1

Quoted 8 lines
Quoted 7 lines

--
Regards,
Andrey.

--
Regards,
Andrey.

Signature · 2 lines
Regards,
Andrey.
author
#22 lore raw

PATCH 8/8 bind: 9.11 remove

In reply to akuster
---
 ...1-avoid-start-failure-with-bind-user.patch |  27 --
 ....in-remove-useless-L-use_openssl-lib.patch |  30 --
 ...d-V-and-start-log-hide-build-options.patch |  34 --
 ...ching-for-json-headers-searches-sysr.patch |  47 ---
 meta/recipes-connectivity/bind/bind/bind9     |   2 -
 .../recipes-connectivity/bind/bind/conf.patch | 330 ------------------
 .../bind/bind/generate-rndc-key.sh            |   8 -
 ...t.d-add-support-for-read-only-rootfs.patch |  65 ----
 .../bind/make-etc-initd-bind-stop-work.patch  |  42 ---
 .../bind/bind/named.service                   |  22 --
 .../recipes-connectivity/bind/bind_9.11.22.bb | 140 --------
 11 files changed, 747 deletions(-)
 delete mode 100644 meta/recipes-connectivity/bind/bind/0001-avoid-start-failure-with-bind-user.patch
 delete mode 100644 meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch
 delete mode 100644 meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch
 delete mode 100644 meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
 delete mode 100644 meta/recipes-connectivity/bind/bind/bind9
 delete mode 100644 meta/recipes-connectivity/bind/bind/conf.patch
 delete mode 100644 meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
 delete mode 100644 meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch
 delete mode 100644 meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
 delete mode 100644 meta/recipes-connectivity/bind/bind/named.service
 delete mode 100644 meta/recipes-connectivity/bind/bind_9.11.22.bb
meta/recipes-connectivity/bind/bind/0001-avoid-start-failure-with-bind-user.patch deleted +0 -27
deleted file mode 100644
index 8db96ec049c..00000000000
@@ -1,27 +0,0 @@
-From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
-From: Chen Qi <[email protected]>
-Date: Mon, 15 Oct 2018 16:55:09 +0800
-Subject: [PATCH] avoid start failure with bind user
-
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi <[email protected]>
----
- init.d | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/init.d b/init.d
-index b2eec60..6e03936 100644
---- a/init.d
-+++ b/init.d
-@@ -57,6 +57,7 @@ case "$1" in
- 	modprobe capability >/dev/null 2>&1 || true
- 	if [ ! -f /etc/bind/rndc.key ]; then
- 	    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
-+	    chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true
- 	    chmod 0640 /etc/bind/rndc.key
- 	fi
- 	if [ -f /var/run/named/named.pid ]; then
--- 
-2.7.4
-
meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch deleted +0 -30
deleted file mode 100644
index 9d31b980807..00000000000
@@ -1,30 +0,0 @@
-From 2325a92f1896a2a7f586611686801b41fbc91b50 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Mon, 27 Aug 2018 15:00:51 +0800
-Subject: [PATCH] configure.in: remove useless `-L$use_openssl/lib'
-
-Since `--with-openssl=${STAGING_DIR_HOST}${prefix}' is used in bind recipe,
-the `-L$use_openssl/lib' has a hardcoded suffix, removing it is harmless
-and helpful for clean up host build path in isc-config.sh
-
-Upstream-Status: Inappropriate [oe-core specific]
-
-Signed-off-by: Hongxu Jia <[email protected]>
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e85a5c6..2bbfc58 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1631,7 +1631,7 @@ If you don't want OpenSSL, use --without-openssl])
- 				fi
- 				;;
- 			*)
--				DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
-+				DST_OPENSSL_LIBS="-lcrypto"
- 				;;
- 			esac
- 		fi
meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch deleted +0 -34
deleted file mode 100644
index 75908aa638f..00000000000
@@ -1,34 +0,0 @@
-From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Mon, 27 Aug 2018 21:24:20 +0800
-Subject: [PATCH] `named/lwresd -V' and start log hide build options
-
-The build options expose build path directories, so hide them.
-[snip]
-$ named -V
-|built by make with *** (options are hidden)
-[snip]
-
-Upstream-Status: Inappropriate [oe-core specific]
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- bin/named/include/named/globals.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
-index ba3457e..7741da7 100644
---- a/bin/named/include/named/globals.h
-+++ b/bin/named/include/named/globals.h
-@@ -68,7 +68,7 @@ EXTERN const char *		ns_g_version		INIT(VERSION);
- EXTERN const char *		ns_g_product		INIT(PRODUCT);
- EXTERN const char *		ns_g_description	INIT(DESCRIPTION);
- EXTERN const char *		ns_g_srcid		INIT(SRCID);
--EXTERN const char *		ns_g_configargs		INIT(CONFIGARGS);
-+EXTERN const char *		ns_g_configargs		INIT("*** (options are hidden)");
- EXTERN const char *		ns_g_builder		INIT(BUILDER);
- EXTERN in_port_t		ns_g_port		INIT(0);
- EXTERN isc_dscp_t		ns_g_dscp		INIT(-1);
--- 
-2.7.4
-
meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch deleted +0 -47

47 lines not on this page · raw message

meta/recipes-connectivity/bind/bind/bind9 deleted +0 -2
deleted file mode 100644
index 968679ff7f7..00000000000
@@ -1,2 +0,0 @@
-# startup options for the server
-OPTIONS="-u bind"
meta/recipes-connectivity/bind/bind/conf.patch deleted +0 -330

330 lines not on this page · raw message

meta/recipes-connectivity/bind/bind/generate-rndc-key.sh deleted +0 -8
deleted file mode 100644
index ef915c0ae5a..00000000000
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ ! -s /etc/bind/rndc.key ]; then
-    echo -n "Generating /etc/bind/rndc.key:"
-    /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
-    chown root:bind /etc/bind/rndc.key
-    chmod 0640 /etc/bind/rndc.key
-fi
meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch deleted +0 -65

65 lines not on this page · raw message

meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch deleted +0 -42

42 lines not on this page · raw message

meta/recipes-connectivity/bind/bind/named.service deleted +0 -22
deleted file mode 100644
index cda56ef0150..00000000000
@@ -1,22 +0,0 @@
-[Unit]
-Description=Berkeley Internet Name Domain (DNS)
-Wants=nss-lookup.target
-Before=nss-lookup.target
-After=network.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/default/bind9
-PIDFile=/run/named/named.pid
-
-ExecStartPre=@SBINDIR@/generate-rndc-key.sh
-ExecStart=@SBINDIR@/named $OPTIONS
-
-ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID'
-
-ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID'
-
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-connectivity/bind/bind_9.11.22.bb deleted +0 -140

140 lines not on this page · raw message

Signature · 1 line
2.17.1
#23 lore raw

✗ patchtest: failure for "log4cplus: move meta-oe pkg to..." and 7 more

In reply to akuster

== Series Details ==

Series: "log4cplus: move meta-oe pkg to..." and 7 more
Revision: 1
URL : https://patchwork.openembedded.org/series/25890/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence]
Suggested fix Sign off the added patch file (meta/recipes-connectivity/bind/bind-9.16.5/conf.patch)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe