From b951fc75d3a5875d467f0f76b616b481d2fff0dd Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 27 Jun 2018 02:49:13 -0700 Subject: libndp: Upgrade to 1.7 Upgrade libndp to 1.7 and remove the backported patch 0001-include-sys-select.h-for-fd_-definitions.patch Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- ...-include-sys-select.h-for-fd_-definitions.patch | 25 ---------------------- meta-oe/recipes-connectivity/libndp/libndp_1.6.bb | 13 ----------- meta-oe/recipes-connectivity/libndp/libndp_1.7.bb | 12 +++++++++++ 3 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch delete mode 100644 meta-oe/recipes-connectivity/libndp/libndp_1.6.bb create mode 100644 meta-oe/recipes-connectivity/libndp/libndp_1.7.bb diff --git a/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch b/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch deleted file mode 100644 index 15aa94e2cc..0000000000 --- a/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 94e9a082d76414f82794b0c9817d0c24e3868275 Mon Sep 17 00:00:00 2001 -From: Kylie McClain -Date: Sat, 21 May 2016 21:24:36 -0400 -Subject: [PATCH] ndptool: Fix compilation on musl libc - -FD_ZERO, fd_set, etc are defined within sys/select.h on musl. - -Signed-off-by: Kylie McClain -Signed-off-by: Jiri Pirko ---- - utils/ndptool.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/ndptool.c b/utils/ndptool.c -index 1d96f4c..96479fa 100644 ---- a/utils/ndptool.c -+++ b/utils/ndptool.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - enum verbosity_level { - VERB1, diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb deleted file mode 100644 index 5148798abe..0000000000 --- a/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Library for IPv6 Neighbor Discovery Protocol" -HOMEPAGE = "http://libndp.org/" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "git://github.com/jpirko/libndp \ - file://0001-include-sys-select.h-for-fd_-definitions.patch \ - " -# tag for v1.6 -SRCREV = "2f721c4ff519f38f46695a60d9f9d88f35bf3c1d" -S = "${WORKDIR}/git" - -inherit autotools diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb new file mode 100644 index 0000000000..07a7a1d239 --- /dev/null +++ b/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb @@ -0,0 +1,12 @@ +SUMMARY = "Library for IPv6 Neighbor Discovery Protocol" +HOMEPAGE = "http://libndp.org/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://github.com/jpirko/libndp \ + " +# tag for v1.6 +SRCREV = "96674e7d4f4d569c2c961e865cc16152dfab5f09" +S = "${WORKDIR}/git" + +inherit autotools -- cgit v1.2.3-54-g00ecf