diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2018-09-28 23:24:40 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-09-29 02:10:12 -0700 |
| commit | 57d8e2c673d5f5686bbf411333f1d39c3e29690e (patch) | |
| tree | a1d2c3200d41970495bf46fba9b92942cd638323 /meta-networking | |
| parent | b769242d90ab38c4aa113f16581a378e0b5bb400 (diff) | |
| download | meta-openembedded-57d8e2c673d5f5686bbf411333f1d39c3e29690e.tar.gz | |
net-snmp: improve reproducibility
- Remoe prefix ${RECIPE_SYSROOT} from net-snmp-config
- Remove configure options from versioninfo
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp/0001-remove-configure-options-from-versioninfo.patch | 42 | ||||
| -rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 7 |
2 files changed, 49 insertions, 0 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-remove-configure-options-from-versioninfo.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-remove-configure-options-from-versioninfo.patch new file mode 100644 index 0000000000..2d540967e5 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-remove-configure-options-from-versioninfo.patch @@ -0,0 +1,42 @@ +From f592398b1c659f84168f5c84f63af3b71454b8f5 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 28 Sep 2018 22:59:23 +0800 +Subject: [PATCH] remove configure options from versioninfo + +Configure options contains host build paths which breaks +binary reproducibility. + +It is no harm to remove it from version info. + +Upstream-Status: Inappropriate [cross compile specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + agent/mibgroup/ucd-snmp/versioninfo.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/agent/mibgroup/ucd-snmp/versioninfo.c b/agent/mibgroup/ucd-snmp/versioninfo.c +index a5151c1..1160382 100644 +--- a/agent/mibgroup/ucd-snmp/versioninfo.c ++++ b/agent/mibgroup/ucd-snmp/versioninfo.c +@@ -92,7 +92,7 @@ var_extensible_version(struct variable *vp, + static char errmsg[300]; + char *cptr; + time_t curtime; +-#ifdef NETSNMP_CONFIGURE_OPTIONS ++#if 0 + static char config_opts[] = NETSNMP_CONFIGURE_OPTIONS; + #endif + +@@ -126,7 +126,7 @@ var_extensible_version(struct variable *vp, + *var_len = strlen(errmsg); + return ((u_char *) errmsg); + case VERCONFIG: +-#ifdef NETSNMP_CONFIGURE_OPTIONS ++#if 0 + *var_len = strlen(config_opts); + if (*var_len > 1024) + *var_len = 1024; /* mib imposed restriction */ +-- +2.7.4 + 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 a32d09d775..d47f9e4a3d 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 @@ -24,6 +24,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ file://0004-configure-fix-incorrect-variable.patch \ file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ file://net-snmp-fix-for-disable-des.patch \ + file://0001-remove-configure-options-from-versioninfo.patch \ " SRC_URI[md5sum] = "6aae5948df7efde626613d6a4b3cd9d4" SRC_URI[sha256sum] = "c6291385b8ed84f05890fe4197005daf7e7ee7b082c2e390fa114a9477a56042" @@ -168,6 +169,12 @@ net_snmp_sysroot_preprocess () { fi } +PACKAGE_PREPROCESS_FUNCS += "net_snmp_package_preprocess" +net_snmp_package_preprocess () { + sed -e 's@${RECIPE_SYSROOT}@@g' \ + -i ${PKGD}${bindir}/net-snmp-config +} + PACKAGES += "${PN}-libs ${PN}-mibs ${PN}-server ${PN}-client \ ${PN}-server-snmpd ${PN}-server-snmptrapd \ ${PN}-lib-netsnmp ${PN}-lib-agent ${PN}-lib-helpers \ |