summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2017-05-19 16:52:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-29 15:15:20 +0100
commit27200a3afd606df7f8e592439a8dd403d714ea6f (patch)
tree2610c1d5357e5650b068b4ae6208210b3985764b
parent291a273502b5675455de30cd652850517d425f4f (diff)
downloadpoky-27200a3afd606df7f8e592439a8dd403d714ea6f.tar.gz
bind: build with threads and update configure options
Build without threads for bind is inherited from legacy openembedded. All libc's support proper threading on Linux now, so enable threads support for bind. It is also need to disable static library build which cause package dhcp fail to build after enable bind threads support. Options devpoll and epoll are configured to choose most preferable multiplex method for unix socket. The priorities are: epoll > poll > select. When set '--enable-epoll', it just defines a var and include header file that is available for cross compile. So use epoll for bind. Add PACKAGECONFIG 'urandom' that could use /dev/urandom as random device. Update file/directory ownerships to fix daemon start failure. (From OE-Core rev: 598e5da5a2af2bd93ad890687dd32009e348fc85) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bind/bind/generate-rndc-key.sh1
-rw-r--r--meta/recipes-connectivity/bind/bind_9.10.3-P3.bb10
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
index db201270fa..ef915c0ae5 100644
--- a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
+++ b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
@@ -3,5 +3,6 @@
3if [ ! -s /etc/bind/rndc.key ]; then 3if [ ! -s /etc/bind/rndc.key ]; then
4 echo -n "Generating /etc/bind/rndc.key:" 4 echo -n "Generating /etc/bind/rndc.key:"
5 /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom 5 /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
6 chown root:bind /etc/bind/rndc.key
6 chmod 0640 /etc/bind/rndc.key 7 chmod 0640 /etc/bind/rndc.key
7fi 8fi
diff --git a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb b/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
index 18249f2a83..7eb79b0ea0 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb
@@ -38,8 +38,8 @@ SRC_URI[md5sum] = "bcf7e772b616f7259420a3edc5df350a"
38SRC_URI[sha256sum] = "690810d1fbb72afa629e74638d19cd44e28d2b2e5eb63f55c705ad85d1a4cb83" 38SRC_URI[sha256sum] = "690810d1fbb72afa629e74638d19cd44e28d2b2e5eb63f55c705ad85d1a4cb83"
39 39
40ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" 40ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
41EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ 41EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \
42 --disable-devpoll --disable-epoll --with-gost=no \ 42 --disable-devpoll --enable-epoll --with-gost=no \
43 --with-gssapi=no --with-ecdsa=yes \ 43 --with-gssapi=no --with-ecdsa=yes \
44 --sysconfdir=${sysconfdir}/bind \ 44 --sysconfdir=${sysconfdir}/bind \
45 --with-openssl=${STAGING_LIBDIR}/.. \ 45 --with-openssl=${STAGING_LIBDIR}/.. \
@@ -51,6 +51,7 @@ PACKAGECONFIG ?= "readline"
51PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2" 51PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2"
52PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline" 52PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
53PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit" 53PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
54PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,,"
54 55
55USERADD_PACKAGES = "${PN}" 56USERADD_PACKAGES = "${PN}"
56USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ 57USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
@@ -101,6 +102,11 @@ do_install_append() {
101 102
102 install -d ${D}${sysconfdir}/default 103 install -d ${D}${sysconfdir}/default
103 install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default 104 install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
105
106 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
107 install -d ${D}${sysconfdir}/tmpfiles.d
108 echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
109 fi
104} 110}
105 111
106CONFFILES_${PN} = " \ 112CONFFILES_${PN} = " \