diff options
Diffstat (limited to 'meta/recipes-connectivity/bind/bind')
6 files changed, 15 insertions, 125 deletions
diff --git a/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch b/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch index 1215093716..a8d601dcaa 100644 --- a/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch +++ b/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch | |||
@@ -7,11 +7,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
7 | lib/dns/gen.c | 2 +- | 7 | lib/dns/gen.c | 2 +- |
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) |
9 | 9 | ||
10 | diff --git a/lib/dns/gen.c b/lib/dns/gen.c | 10 | Index: bind-9.11.3/lib/dns/gen.c |
11 | index 7a7dafb..51a0435 100644 | 11 | =================================================================== |
12 | --- a/lib/dns/gen.c | 12 | --- bind-9.11.3.orig/lib/dns/gen.c |
13 | +++ b/lib/dns/gen.c | 13 | +++ bind-9.11.3/lib/dns/gen.c |
14 | @@ -148,7 +148,7 @@ static const char copyright[] = | 14 | @@ -130,7 +130,7 @@ static const char copyright[] = |
15 | #define TYPECLASSBUF (TYPECLASSLEN + 1) | 15 | #define TYPECLASSBUF (TYPECLASSLEN + 1) |
16 | #define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d" | 16 | #define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d" |
17 | #define ATTRIBUTESIZE 256 | 17 | #define ATTRIBUTESIZE 256 |
@@ -20,6 +20,3 @@ index 7a7dafb..51a0435 100644 | |||
20 | 20 | ||
21 | static struct cc { | 21 | static struct cc { |
22 | struct cc *next; | 22 | struct cc *next; |
23 | -- | ||
24 | 1.9.1 | ||
25 | |||
diff --git a/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch b/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch index 1ed858cd3f..01874a4407 100644 --- a/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch +++ b/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch | |||
@@ -13,11 +13,11 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | |||
13 | lib/dns/gen.c | 4 ++++ | 13 | lib/dns/gen.c | 4 ++++ |
14 | 1 file changed, 4 insertions(+) | 14 | 1 file changed, 4 insertions(+) |
15 | 15 | ||
16 | diff --git a/lib/dns/gen.c b/lib/dns/gen.c | 16 | Index: bind-9.11.3/lib/dns/gen.c |
17 | index 51a0435..3d7214f 100644 | 17 | =================================================================== |
18 | --- a/lib/dns/gen.c | 18 | --- bind-9.11.3.orig/lib/dns/gen.c |
19 | +++ b/lib/dns/gen.c | 19 | +++ bind-9.11.3/lib/dns/gen.c |
20 | @@ -148,7 +148,11 @@ static const char copyright[] = | 20 | @@ -130,7 +130,11 @@ static const char copyright[] = |
21 | #define TYPECLASSBUF (TYPECLASSLEN + 1) | 21 | #define TYPECLASSBUF (TYPECLASSLEN + 1) |
22 | #define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d" | 22 | #define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d" |
23 | #define ATTRIBUTESIZE 256 | 23 | #define ATTRIBUTESIZE 256 |
@@ -29,6 +29,3 @@ index 51a0435..3d7214f 100644 | |||
29 | 29 | ||
30 | static struct cc { | 30 | static struct cc { |
31 | struct cc *next; | 31 | struct cc *next; |
32 | -- | ||
33 | 1.7.9.5 | ||
34 | |||
diff --git a/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch b/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch deleted file mode 100644 index 8bc4ea30f8..0000000000 --- a/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From 9b40619ff6fddfef2758ba797789f8487f412df3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 16 Feb 2015 00:50:01 -0800 | ||
4 | Subject: [PATCH] confgen: don't build unix.o twice | ||
5 | |||
6 | Fixed: | ||
7 | unix/os.o: file not recognized: File truncated | ||
8 | collect2: error: ld returned 1 exit status | ||
9 | |||
10 | This is because os.o was built twice: | ||
11 | * The implicity rule (depends on unix/os.o) | ||
12 | * The "make all" in unix subdir (depends on unix/os.o) | ||
13 | |||
14 | Depend on subdirs which is unix only rather than unix/os.o will fix the | ||
15 | problem. | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
20 | |||
21 | Update context(trailing whitespace) for version 9.10.5-P3. | ||
22 | |||
23 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
24 | --- | ||
25 | bin/confgen/Makefile.in | 4 ++-- | ||
26 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
27 | |||
28 | diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in | ||
29 | index dca272f..02becce 100644 | ||
30 | --- a/bin/confgen/Makefile.in | ||
31 | +++ b/bin/confgen/Makefile.in | ||
32 | @@ -74,11 +74,11 @@ rndc-confgen.@O@: rndc-confgen.c | ||
33 | ddns-confgen.@O@: ddns-confgen.c | ||
34 | ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c ${srcdir}/ddns-confgen.c | ||
35 | |||
36 | -rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS} | ||
37 | +rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS) | ||
38 | export BASEOBJS="rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \ | ||
39 | ${FINALBUILDCMD} | ||
40 | |||
41 | -ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS} | ||
42 | +ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS) | ||
43 | export BASEOBJS="ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \ | ||
44 | ${FINALBUILDCMD} | ||
45 | |||
46 | -- | ||
47 | 1.7.9.5 | ||
48 | |||
diff --git a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch index 13df3bb0e9..37e210e6da 100644 --- a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch +++ b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch | |||
@@ -31,11 +31,11 @@ Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | |||
31 | configure.in | 2 +- | 31 | configure.in | 2 +- |
32 | 1 file changed, 1 insertion(+), 1 deletion(-) | 32 | 1 file changed, 1 insertion(+), 1 deletion(-) |
33 | 33 | ||
34 | diff --git a/configure.in b/configure.in | 34 | Index: bind-9.11.3/configure.in |
35 | index c9ef3a601343..17a1f613e9ac 100644 | 35 | =================================================================== |
36 | --- a/configure.in | 36 | --- bind-9.11.3.orig/configure.in |
37 | +++ b/configure.in | 37 | +++ bind-9.11.3/configure.in |
38 | @@ -2139,7 +2139,7 @@ case "$use_libjson" in | 38 | @@ -2574,7 +2574,7 @@ case "$use_libjson" in |
39 | libjson_libs="" | 39 | libjson_libs="" |
40 | ;; | 40 | ;; |
41 | auto|yes) | 41 | auto|yes) |
@@ -44,6 +44,3 @@ index c9ef3a601343..17a1f613e9ac 100644 | |||
44 | do | 44 | do |
45 | if test -f "${d}/include/json/json.h" | 45 | if test -f "${d}/include/json/json.h" |
46 | then | 46 | then |
47 | -- | ||
48 | 2.4.2 | ||
49 | |||
diff --git a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch deleted file mode 100644 index b02ecb1061..0000000000 --- a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
4 | |||
5 | Index: bind-9.9.5/bin/Makefile.in | ||
6 | =================================================================== | ||
7 | --- bind-9.9.5.orig/bin/Makefile.in | ||
8 | +++ bind-9.9.5/bin/Makefile.in | ||
9 | @@ -19,7 +19,7 @@ srcdir = @srcdir@ | ||
10 | VPATH = @srcdir@ | ||
11 | top_srcdir = @top_srcdir@ | ||
12 | |||
13 | -SUBDIRS = named rndc dig delv dnssec tools tests nsupdate \ | ||
14 | +SUBDIRS = named rndc dig delv dnssec tools nsupdate \ | ||
15 | check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ | ||
16 | TARGETS = | ||
17 | |||
diff --git a/meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch b/meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch deleted file mode 100644 index 9829f15881..0000000000 --- a/meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | Use python3 rather default python which maybe links to python2 for oe. And add | ||
2 | option for setup.py to install files to right directory. | ||
3 | |||
4 | Upstream-Status: Inappropriate [OE specific] | ||
5 | |||
6 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
7 | --- | ||
8 | diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in | ||
9 | index a43a3c1..2e727f2 100644 | ||
10 | --- a/bin/python/Makefile.in | ||
11 | +++ b/bin/python/Makefile.in | ||
12 | @@ -55,9 +55,9 @@ install:: ${TARGETS} installdirs | ||
13 | ${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8 | ||
14 | if test -n "${PYTHON}" ; then \ | ||
15 | if test -n "${DESTDIR}" ; then \ | ||
16 | - ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} ; \ | ||
17 | + ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} --install-lib=${PYTHON_SITEPACKAGES_DIR} ; \ | ||
18 | else \ | ||
19 | - ${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} ; \ | ||
20 | + ${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} --install-lib=${PYTHON_SITEPACKAGES_DIR} ; \ | ||
21 | fi \ | ||
22 | fi | ||
23 | |||
24 | diff --git a/configure.in b/configure.in | ||
25 | index 314bb90..867923e 100644 | ||
26 | --- a/configure.in | ||
27 | +++ b/configure.in | ||
28 | @@ -227,7 +227,7 @@ AC_ARG_WITH(python, | ||
29 | [ --with-python=PATH specify path to python interpreter], | ||
30 | use_python="$withval", use_python="unspec") | ||
31 | |||
32 | -python="python python3 python3.5 python3.4 python3.3 python3.2 python2 python2.7" | ||
33 | +python="python3 python3.5 python3.4 python3.3 python3.2 python2 python2.7" | ||
34 | |||
35 | testargparse='try: import argparse | ||
36 | except: exit(1)' | ||