summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-12-22 09:04:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-28 09:25:17 +0000
commitc2e8079e87b184f064b7113da4314f869804f2ca (patch)
tree285034369759c1d0d7ff2fd8d296e9eb4550e75d
parent7204a0f18ec46f6dec4246a46cee64293821474d (diff)
downloadpoky-c2e8079e87b184f064b7113da4314f869804f2ca.tar.gz
bind: 9.10.2-P4 -> 9.10.3-P2
Upgrade bind from 9.10.2-P4 to 9.10.3-P2. * update context of 0001-build-use-pkg-config-to-find-libxml2.patch * add PACKAGECONFIGs readline and libedit. They provide same library, so should not be set at same time. (From OE-Core rev: b49751e7febd262b754043e4e523e6690bfbbfaa) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch20
-rw-r--r--meta/recipes-connectivity/bind/bind_9.10.3-P2.bb (renamed from meta/recipes-connectivity/bind/bind_9.10.2-P4.bb)9
2 files changed, 20 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch b/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
index cb5251d159..805cbb3315 100644
--- a/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
+++ b/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
@@ -4,15 +4,18 @@ libxml2.
4Upstream-Status: Inappropriate 4Upstream-Status: Inappropriate
5Signed-off-by: Ross Burton <ross.burton@intel.com> 5Signed-off-by: Ross Burton <ross.burton@intel.com>
6 6
7Update context for version 9.10.3-P2.
8
9Signed-off-by: Kai Kang <kai.kang@windriver.com>
7--- 10---
8 configure.in | 18 +++--------------- 11 configure.in | 23 +++--------------------
9 1 file changed, 3 insertions(+), 15 deletions(-) 12 1 file changed, 3 insertions(+), 20 deletions(-)
10 13
11diff --git a/configure.in b/configure.in 14diff --git a/configure.in b/configure.in
12index d566e1c..c9ef3a6 100644 15index 0db826d..75819eb 100644
13--- a/configure.in 16--- a/configure.in
14+++ b/configure.in 17+++ b/configure.in
15@@ -2102,21 +2102,9 @@ case "$use_libxml2" in 18@@ -2107,26 +2107,9 @@ case "$use_libxml2" in
16 DST_LIBXML2_INC="" 19 DST_LIBXML2_INC=""
17 ;; 20 ;;
18 auto|yes) 21 auto|yes)
@@ -22,8 +25,13 @@ index d566e1c..c9ef3a6 100644
22- libxml2_cflags=`xml2-config --cflags` 25- libxml2_cflags=`xml2-config --cflags`
23- ;; 26- ;;
24- *) 27- *)
25- libxml2_libs= 28- if test "$use_libxml2" = "yes" ; then
26- libxml2_cflags= 29- AC_MSG_RESULT(no)
30- AC_MSG_ERROR(required libxml2 version not available)
31- else
32- libxml2_libs=
33- libxml2_cflags=
34- fi
27- ;; 35- ;;
28- esac 36- esac
29- ;; 37- ;;
diff --git a/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb b/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb
index 1e1e7262fe..875a0c8f80 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb
@@ -23,8 +23,8 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
23 file://0001-lib-dns-gen.c-fix-too-long-error.patch \ 23 file://0001-lib-dns-gen.c-fix-too-long-error.patch \
24 " 24 "
25 25
26SRC_URI[md5sum] = "8b1f5064837756c938eadc1537dec5c7" 26SRC_URI[md5sum] = "672dd3c2796b12ac8440f55bcaecfa82"
27SRC_URI[sha256sum] = "c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8" 27SRC_URI[sha256sum] = "4a6c1911ac0d4b6be635b63de3429b6c168ea244043f12bbc8a4eb3368fd6ecd"
28 28
29ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" 29ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
30EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ 30EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
@@ -35,8 +35,11 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
35 " 35 "
36inherit autotools update-rc.d systemd useradd pkgconfig 36inherit autotools update-rc.d systemd useradd pkgconfig
37 37
38PACKAGECONFIG ?= "" 38# PACKAGECONFIGs readline and libedit should NOT be set at same time
39PACKAGECONFIG ?= "readline"
39PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2" 40PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2"
41PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
42PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
40 43
41USERADD_PACKAGES = "${PN}" 44USERADD_PACKAGES = "${PN}"
42USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \ 45USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \