diff options
-rw-r--r-- | meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch | 10 | ||||
-rw-r--r-- | meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb (renamed from meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb) | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch index 98ecd38642..b1d746f8bc 100644 --- a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dc3f2250908587710f109c80ddf8a94f0bc40b82 Mon Sep 17 00:00:00 2001 | 1 | From 7147add9fedfb28909639ae419f995041d086266 Mon Sep 17 00:00:00 2001 |
2 | From: Jonathan Richardson <jonathan.richardson@broadcom.com> | 2 | From: Jonathan Richardson <jonathan.richardson@broadcom.com> |
3 | Date: Fri, 6 Apr 2018 10:49:04 -0700 | 3 | Date: Fri, 6 Apr 2018 10:49:04 -0700 |
4 | Subject: [PATCH] autotools: Add option to disable installation of systemd conf | 4 | Subject: [PATCH] autotools: Add option to disable installation of systemd conf |
@@ -23,10 +23,10 @@ Upstream-Status: Pending | |||
23 | 2 files changed, 11 insertions(+), 1 deletion(-) | 23 | 2 files changed, 11 insertions(+), 1 deletion(-) |
24 | 24 | ||
25 | diff --git a/Makefile.am b/Makefile.am | 25 | diff --git a/Makefile.am b/Makefile.am |
26 | index 292c0fd..0fb9bb0 100644 | 26 | index 86174e9..e90e966 100644 |
27 | --- a/Makefile.am | 27 | --- a/Makefile.am |
28 | +++ b/Makefile.am | 28 | +++ b/Makefile.am |
29 | @@ -138,8 +138,9 @@ install-data-hook: installdirs-local | 29 | @@ -141,8 +141,9 @@ install-data-hook: installdirs-local |
30 | pkgconfigdir = ${libdir}/pkgconfig | 30 | pkgconfigdir = ${libdir}/pkgconfig |
31 | pkgconfig_DATA = lldpad.pc liblldp_clif.pc | 31 | pkgconfig_DATA = lldpad.pc liblldp_clif.pc |
32 | 32 | ||
@@ -38,10 +38,10 @@ index 292c0fd..0fb9bb0 100644 | |||
38 | bashcompletiondir = $(sysconfdir)/bash_completion.d | 38 | bashcompletiondir = $(sysconfdir)/bash_completion.d |
39 | dist_bashcompletion_DATA = contrib/bash_completion/lldpad contrib/bash_completion/lldptool | 39 | dist_bashcompletion_DATA = contrib/bash_completion/lldpad contrib/bash_completion/lldptool |
40 | diff --git a/configure.ac b/configure.ac | 40 | diff --git a/configure.ac b/configure.ac |
41 | index 0667446..f75f433 100644 | 41 | index fa2f3a0..1a038cd 100644 |
42 | --- a/configure.ac | 42 | --- a/configure.ac |
43 | +++ b/configure.ac | 43 | +++ b/configure.ac |
44 | @@ -95,6 +95,15 @@ AC_TYPE_UINT16_T | 44 | @@ -132,6 +132,15 @@ AC_TYPE_UINT16_T |
45 | AC_TYPE_UINT32_T | 45 | AC_TYPE_UINT32_T |
46 | AC_TYPE_UINT8_T | 46 | AC_TYPE_UINT8_T |
47 | 47 | ||
diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb index 71d738ddc1..010cd5af84 100644 --- a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb +++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb | |||
@@ -12,7 +12,7 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} | |||
12 | 12 | ||
13 | DEPENDS = "libnl libconfig readline" | 13 | DEPENDS = "libnl libconfig readline" |
14 | 14 | ||
15 | SRCREV = "85e55837a81d710e5baa7da47f7ed0d205c8ede5" | 15 | SRCREV = "f1dd9eb961fab06723d2bedb2f7e2b81e45ee9ab" |
16 | PV .= "+git" | 16 | PV .= "+git" |
17 | SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=branch-1.1 \ | 17 | SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=branch-1.1 \ |
18 | file://0001-Fix-musl-libc-build-issue.patch \ | 18 | file://0001-Fix-musl-libc-build-issue.patch \ |