diff options
author | douglas.royds <douglas.royds@taitradio.com> | 2018-11-21 13:52:19 +1300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-26 09:38:14 -0800 |
commit | dcdb5fa30285e156cc7eeecda57f3763ead80c43 (patch) | |
tree | fe20035f0fd98d4a786517b7c555332cb184609d /meta-networking/recipes-protocols | |
parent | 374bfe0cc6fcb703a1594f5cd308442cd637d007 (diff) | |
download | meta-openembedded-dcdb5fa30285e156cc7eeecda57f3763ead80c43.tar.gz |
net-snmp: Reproducibility: Set NETSNMP_CONFIGURE_OPTIONS null
To avoid build host paths being written into binaries,
accept a null NETSNMP_CONFIGURE_OPTIONS from the environment.
Upstream-Status: Submitted https://sourceforge.net/p/net-snmp/patches/1384/
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-protocols')
-rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-accept-configure-options-from-env.patch | 15 | ||||
-rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-accept-configure-options-from-env.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-accept-configure-options-from-env.patch new file mode 100644 index 000000000..b0dbf5ad3 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-accept-configure-options-from-env.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Reproducible build: To avoid build host paths being written into binaries, | ||
2 | accept NETSNMP_CONFIGURE_OPTIONS from the environment. | ||
3 | NETSNMP_CONFIGURE_OPTIONS can be set either null or to a fixed value. | ||
4 | |||
5 | --- net-snmp-5.8.original/configure.ac 2018-11-20 17:41:39.926529072 +1300 | ||
6 | +++ net-snmp-5.8/configure.ac 2018-11-20 17:54:44.488180224 +1300 | ||
7 | @@ -28,7 +28,7 @@ | ||
8 | # | ||
9 | # save the configure arguments | ||
10 | # | ||
11 | -AC_DEFINE_UNQUOTED(NETSNMP_CONFIGURE_OPTIONS,"$ac_configure_args", | ||
12 | +AC_DEFINE_UNQUOTED(NETSNMP_CONFIGURE_OPTIONS,"${NETSNMP_CONFIGURE_OPTIONS-$ac_configure_args}", | ||
13 | [configure options specified]) | ||
14 | CONFIGURE_OPTIONS="\"$ac_configure_args\"" | ||
15 | AC_SUBST(CONFIGURE_OPTIONS) | ||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb index f556c5898..2a0d88ab2 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | |||
@@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ | |||
25 | file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ | 25 | file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ |
26 | file://net-snmp-fix-for-disable-des.patch \ | 26 | file://net-snmp-fix-for-disable-des.patch \ |
27 | file://reproducibility-have-printcap.patch \ | 27 | file://reproducibility-have-printcap.patch \ |
28 | file://reproducibility-accept-configure-options-from-env.patch \ | ||
28 | " | 29 | " |
29 | SRC_URI[md5sum] = "6aae5948df7efde626613d6a4b3cd9d4" | 30 | SRC_URI[md5sum] = "6aae5948df7efde626613d6a4b3cd9d4" |
30 | SRC_URI[sha256sum] = "c6291385b8ed84f05890fe4197005daf7e7ee7b082c2e390fa114a9477a56042" | 31 | SRC_URI[sha256sum] = "c6291385b8ed84f05890fe4197005daf7e7ee7b082c2e390fa114a9477a56042" |
@@ -70,6 +71,7 @@ CACHED_CONFIGUREVARS = " \ | |||
70 | lt_cv_shlibpath_overrides_runpath=yes \ | 71 | lt_cv_shlibpath_overrides_runpath=yes \ |
71 | ac_cv_path_UNAMEPROG=${base_bindir}/uname \ | 72 | ac_cv_path_UNAMEPROG=${base_bindir}/uname \ |
72 | ac_cv_file__etc_printcap=no \ | 73 | ac_cv_file__etc_printcap=no \ |
74 | NETSNMP_CONFIGURE_OPTIONS= \ | ||
73 | " | 75 | " |
74 | export PERLPROG="${bindir}/env perl" | 76 | export PERLPROG="${bindir}/env perl" |
75 | PERLPROG_append = "${@bb.utils.contains('PACKAGECONFIG', 'perl', ' -I${WORKDIR}', '', d)}" | 77 | PERLPROG_append = "${@bb.utils.contains('PACKAGECONFIG', 'perl', ' -I${WORKDIR}', '', d)}" |