summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorJan Luebbe <jlu@pengutronix.de>2017-08-30 15:59:48 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-09-04 15:04:25 +0200
commita4ee0b457baa1682ce6738f8ffb3b24c817e1dd0 (patch)
treea315f6b72d81d9c0938b8e0500968ce2a22826ff /rules
parent0bf14d3e3c96db5edb1b6a4a87adac113d5d91cf (diff)
downloadptxdist-a4ee0b457baa1682ce6738f8ffb3b24c817e1dd0.tar.gz
ptxdist-a4ee0b457baa1682ce6738f8ffb3b24c817e1dd0.tar.xz
lldpd: bump version to 0.9.8
JSON support is now built-in, so drop the JSON_C dependency. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r--rules/lldpd.in1
-rw-r--r--rules/lldpd.make5
2 files changed, 2 insertions, 4 deletions
diff --git a/rules/lldpd.in b/rules/lldpd.in
index 75a5fce4b..abe6f35c8 100644
--- a/rules/lldpd.in
+++ b/rules/lldpd.in
@@ -9,7 +9,6 @@ menuconfig LLDPD
select READLINE
select NET_SNMP if LLDPD_SNMP
select NET_SNMP_MIB_MODULES_AGENTX if LLDPD_SNMP
- select JSON_C if LLDPD_JSON
select LIBXML2 if LLDPD_XML
select LIBXML2_WRITER if LLDPD_XML
select BUSYBOX_START_STOP_DAEMON if LLDPD_STARTSCRIPT
diff --git a/rules/lldpd.make b/rules/lldpd.make
index 3cb6393e7..21df78018 100644
--- a/rules/lldpd.make
+++ b/rules/lldpd.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LLDPD) += lldpd
#
# Paths and names
#
-LLDPD_VERSION := 0.9.2
-LLDPD_MD5 := b809887bc927fb558fd5dd64b6c0a494
+LLDPD_VERSION := 0.9.8
+LLDPD_MD5 := 8809600492f6b73149eb19158e819c1f
LLDPD := lldpd-$(LLDPD_VERSION)
LLDPD_SUFFIX := tar.gz
LLDPD_URL := http://media.luffy.cx/files/lldpd//$(LLDPD).$(LLDPD_SUFFIX)
@@ -44,7 +44,6 @@ LLDPD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--$(call ptx/endis, PTXCONF_LLDPD_CUSTOM_TLV)-custom \
--$(call ptx/endis, PTXCONF_LLDPD_OLDIES)-oldies \
--$(call ptx/wwo, PTXCONF_LLDPD_SNMP)-snmp \
- --$(call ptx/wwo, PTXCONF_LLDPD_JSON)-json \
--$(call ptx/wwo, PTXCONF_LLDPD_XML)-xml \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--with-privsep-user="$(PTXCONF_LLDPD_PRIVSEP_USER)" \