diff options
| author | Thomas Fitzsimmons <fitzsim@cisco.com> | 2013-06-04 18:36:28 -0400 |
|---|---|---|
| committer | Joe MacDonald <joe.macdonald@windriver.com> | 2013-06-10 11:18:38 -0400 |
| commit | b57465fc8c023b798b713766ca7d093a6752186b (patch) | |
| tree | b0d6f4d6bb221db698fca522cbe10c6355a82ef1 | |
| parent | 72ddf338d848d613855c96259fcf9ffb57e98010 (diff) | |
| download | meta-openembedded-b57465fc8c023b798b713766ca7d093a6752186b.tar.gz | |
net-snmp: Backport fix for NETSNMP_NO_SYSTEMD typos
Added Signed-off-by for backport patch refresh. Bumped PR.
Signed-off-by: Thomas Fitzsimmons <fitzsim@cisco.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
| -rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch | 6 | ||||
| -rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch index 18955f29ee..e19153bbc4 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch | |||
| @@ -7,12 +7,14 @@ fef6cddfdb94da1a6b1fb768af62918b80f11fd3 | |||
| 7 | 0641e43c694c485cbbffef0556efc4641bd3ff50 | 7 | 0641e43c694c485cbbffef0556efc4641bd3ff50 |
| 8 | 76530a89f1c8bbd0b63acce63e10d5d4812a1a16 (conflict resolved) | 8 | 76530a89f1c8bbd0b63acce63e10d5d4812a1a16 (conflict resolved) |
| 9 | bf108d7f1354f6276fc43c129963f2c49b9fc242 | 9 | bf108d7f1354f6276fc43c129963f2c49b9fc242 |
| 10 | 3692875172352f72cf3afd0d35f355e83d7e421b | ||
| 10 | 74412748067c685e1d8ab6ed3bcc3ca9c2774844 | 11 | 74412748067c685e1d8ab6ed3bcc3ca9c2774844 |
| 11 | 86132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0 | 12 | 86132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0 |
| 12 | 63557cf8986a33dba1d4429b583a901361052c4f | 13 | 63557cf8986a33dba1d4429b583a901361052c4f |
| 13 | 14 | ||
| 14 | Upstream-Status: Backport | 15 | Upstream-Status: Backport |
| 15 | 16 | ||
| 17 | Signed-off-by: Thomas Fitzsimmons <fitzsim@cisco.com> | ||
| 16 | diff --git a/README.systemd b/README.systemd | 18 | diff --git a/README.systemd b/README.systemd |
| 17 | new file mode 100644 | 19 | new file mode 100644 |
| 18 | index 0000000..f731851 | 20 | index 0000000..f731851 |
| @@ -89,10 +91,10 @@ index b177d5b..08bdfc7 100644 | |||
| 89 | #endif | 91 | #endif |
| 90 | 92 | ||
| 91 | #ifndef WIN32 | 93 | #ifndef WIN32 |
| 92 | +#ifndef NETSNMP_NO_SYSYSTEMD | 94 | +#ifndef NETSNMP_NO_SYSTEMD |
| 93 | + /* check if systemd has sockets for us and don't close them */ | 95 | + /* check if systemd has sockets for us and don't close them */ |
| 94 | + prepared_sockets = netsnmp_sd_listen_fds(0); | 96 | + prepared_sockets = netsnmp_sd_listen_fds(0); |
| 95 | +#endif /* NETSNMP_NO_SYSYSTEMD */ | 97 | +#endif /* NETSNMP_NO_SYSTEMD */ |
| 96 | + | 98 | + |
| 97 | /* | 99 | /* |
| 98 | * close all non-standard file descriptors we may have | 100 | * close all non-standard file descriptors we may have |
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb index 4c3939a7e4..d21995a9e1 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb | |||
| @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5 | |||
| 6 | 6 | ||
| 7 | DEPENDS = "openssl libnl pciutils" | 7 | DEPENDS = "openssl libnl pciutils" |
| 8 | 8 | ||
| 9 | PR = "r1" | ||
| 10 | |||
| 9 | SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ |
| 10 | file://init \ | 12 | file://init \ |
| 11 | file://snmpd.conf \ | 13 | file://snmpd.conf \ |
