From 554ea0aeac86dfcb144ba44f90affd65823e2c2f Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 19 Mar 2024 13:45:03 +0800 Subject: openlldp: upgrade 1.1.0 -> 1.1.1 0001-autotools-Add-option-to-disable-installation-of-syst.patch refreshed for 1.1.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...dd-option-to-disable-installation-of-syst.patch | 10 +++---- .../recipes-protocols/openlldp/openlldp_1.1.0.bb | 32 ---------------------- .../recipes-protocols/openlldp/openlldp_1.1.1.bb | 32 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb create mode 100644 meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb (limited to 'meta-networking') 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 @@ -From dc3f2250908587710f109c80ddf8a94f0bc40b82 Mon Sep 17 00:00:00 2001 +From 7147add9fedfb28909639ae419f995041d086266 Mon Sep 17 00:00:00 2001 From: Jonathan Richardson Date: Fri, 6 Apr 2018 10:49:04 -0700 Subject: [PATCH] autotools: Add option to disable installation of systemd conf @@ -23,10 +23,10 @@ Upstream-Status: Pending 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 292c0fd..0fb9bb0 100644 +index 86174e9..e90e966 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -138,8 +138,9 @@ install-data-hook: installdirs-local +@@ -141,8 +141,9 @@ install-data-hook: installdirs-local pkgconfigdir = ${libdir}/pkgconfig pkgconfig_DATA = lldpad.pc liblldp_clif.pc @@ -38,10 +38,10 @@ index 292c0fd..0fb9bb0 100644 bashcompletiondir = $(sysconfdir)/bash_completion.d dist_bashcompletion_DATA = contrib/bash_completion/lldpad contrib/bash_completion/lldptool diff --git a/configure.ac b/configure.ac -index 0667446..f75f433 100644 +index fa2f3a0..1a038cd 100644 --- a/configure.ac +++ b/configure.ac -@@ -95,6 +95,15 @@ AC_TYPE_UINT16_T +@@ -132,6 +132,15 @@ AC_TYPE_UINT16_T AC_TYPE_UINT32_T AC_TYPE_UINT8_T diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb deleted file mode 100644 index 71d738ddc1..0000000000 --- a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Open-LLDP" -DESCRIPTION = "Link Layer Discovery Protocol for Linux that includes support for DCBX" -HOMEPAGE = "http://open-lldp.org/start" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162" - -S = "${WORKDIR}/git" - -inherit pkgconfig autotools -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} - -DEPENDS = "libnl libconfig readline" - -SRCREV = "85e55837a81d710e5baa7da47f7ed0d205c8ede5" -PV .= "+git" -SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=branch-1.1 \ - file://0001-Fix-musl-libc-build-issue.patch \ - file://0001-autotools-Add-include-path-to-generated-version.h.patch \ - file://0001-autotools-Add-option-to-disable-installation-of-syst.patch \ - file://0004-clif-Include-string.h-for-mem-function-prototypes.patch \ - " - -# Enable install of systemd conf files. -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_system_unitdir}', '', d)}" - -SYSTEMD_SERVICE:${PN} = "lldpad.service lldpad.socket" - -# To enable service at boot set to enable in local.conf. -SYSTEMD_AUTO_ENABLE ?= "disable" - -RRECOMMENDS:${PN} = "iproute2-tc" diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb new file mode 100644 index 0000000000..010cd5af84 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "Open-LLDP" +DESCRIPTION = "Link Layer Discovery Protocol for Linux that includes support for DCBX" +HOMEPAGE = "http://open-lldp.org/start" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} + +DEPENDS = "libnl libconfig readline" + +SRCREV = "f1dd9eb961fab06723d2bedb2f7e2b81e45ee9ab" +PV .= "+git" +SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=branch-1.1 \ + file://0001-Fix-musl-libc-build-issue.patch \ + file://0001-autotools-Add-include-path-to-generated-version.h.patch \ + file://0001-autotools-Add-option-to-disable-installation-of-syst.patch \ + file://0004-clif-Include-string.h-for-mem-function-prototypes.patch \ + " + +# Enable install of systemd conf files. +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_system_unitdir}', '', d)}" + +SYSTEMD_SERVICE:${PN} = "lldpad.service lldpad.socket" + +# To enable service at boot set to enable in local.conf. +SYSTEMD_AUTO_ENABLE ?= "disable" + +RRECOMMENDS:${PN} = "iproute2-tc" -- cgit v1.2.3-54-g00ecf