summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-08-27 23:31:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-29 10:42:48 +0100
commitea2f74e9a780f76cb4c86dadc97ce32af0f96d69 (patch)
tree1704b3e5c68a67816f57ee48ac9844ef15250dbb
parent7eb2ead27a256699cd3158d7a1c98f5aab87f841 (diff)
downloadpoky-ea2f74e9a780f76cb4c86dadc97ce32af0f96d69.tar.gz
bind: improve reproducibility
- Tweak var-DST_OPENSSL_LIBS assignment in configure.in, it is helpful to fix build path issue in isc-config.sh - `named/lwresd -V' and start log hide build options which expose build path directories. (From OE-Core rev: 037d741c94dd7f8518b3499ee0beb91a343ffa6a) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch32
-rw-r--r--meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch34
-rw-r--r--meta/recipes-connectivity/bind/bind_9.11.4.bb2
3 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch b/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch
new file mode 100644
index 0000000000..871bb2a5f6
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch
@@ -0,0 +1,32 @@
1From 950867d9fd3f690e271c8c807b6eed144b2935b2 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 27 Aug 2018 15:00:51 +0800
4Subject: [PATCH] configure.in: remove useless `-L$use_openssl/lib'
5
6Since `--with-openssl=${STAGING_DIR_HOST}${prefix}' is used in bind recipe,
7the `-L$use_openssl/lib' has a hardcoded suffix, removing it is harmless
8and helpful for clean up host build path in isc-config.sh
9
10Upstream-Status: Inappropriate [oe-core specific]
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 configure.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.in b/configure.in
18index 54efc55..76ac0eb 100644
19--- a/configure.in
20+++ b/configure.in
21@@ -1691,7 +1691,7 @@ If you don't want OpenSSL, use --without-openssl])
22 fi
23 ;;
24 *)
25- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
26+ DST_OPENSSL_LIBS="-lcrypto"
27 ;;
28 esac
29 fi
30--
312.7.4
32
diff --git a/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch
new file mode 100644
index 0000000000..75908aa638
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch
@@ -0,0 +1,34 @@
1From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 27 Aug 2018 21:24:20 +0800
4Subject: [PATCH] `named/lwresd -V' and start log hide build options
5
6The build options expose build path directories, so hide them.
7[snip]
8$ named -V
9|built by make with *** (options are hidden)
10[snip]
11
12Upstream-Status: Inappropriate [oe-core specific]
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 bin/named/include/named/globals.h | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
20index ba3457e..7741da7 100644
21--- a/bin/named/include/named/globals.h
22+++ b/bin/named/include/named/globals.h
23@@ -68,7 +68,7 @@ EXTERN const char * ns_g_version INIT(VERSION);
24 EXTERN const char * ns_g_product INIT(PRODUCT);
25 EXTERN const char * ns_g_description INIT(DESCRIPTION);
26 EXTERN const char * ns_g_srcid INIT(SRCID);
27-EXTERN const char * ns_g_configargs INIT(CONFIGARGS);
28+EXTERN const char * ns_g_configargs INIT("*** (options are hidden)");
29 EXTERN const char * ns_g_builder INIT(BUILDER);
30 EXTERN in_port_t ns_g_port INIT(0);
31 EXTERN isc_dscp_t ns_g_dscp INIT(-1);
32--
332.7.4
34
diff --git a/meta/recipes-connectivity/bind/bind_9.11.4.bb b/meta/recipes-connectivity/bind/bind_9.11.4.bb
index 7522fdbaa0..d27068c64f 100644
--- a/meta/recipes-connectivity/bind/bind_9.11.4.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.4.bb
@@ -17,6 +17,8 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
17 file://bind-ensure-searching-for-json-headers-searches-sysr.patch \ 17 file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
18 file://0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch \ 18 file://0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch \
19 file://0001-lib-dns-gen.c-fix-too-long-error.patch \ 19 file://0001-lib-dns-gen.c-fix-too-long-error.patch \
20 file://0001-configure.in-remove-useless-L-use_openssl-lib.patch \
21 file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
20" 22"
21 23
22SRC_URI[md5sum] = "9b4834d78f30cdb796ce437262272a36" 24SRC_URI[md5sum] = "9b4834d78f30cdb796ce437262272a36"