From bae04482631df031457551718b5782d8d93f714d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 1 May 2019 12:03:39 -0700 Subject: [PATCH] device-observatory: Fix compilation with uClibc-ng Two protocol definitions are missing. Took values from Musl. Signed-off-by: Rosen Penev --- utils/device-observatory/Makefile | 2 +- .../patches/010-uClibc-ng.patch | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 utils/device-observatory/patches/010-uClibc-ng.patch diff --git a/utils/device-observatory/Makefile b/utils/device-observatory/Makefile index 6970dad089..cc9c579683 100644 --- a/utils/device-observatory/Makefile +++ b/utils/device-observatory/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=device-observatory PKG_VERSION:=1.2.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=https://codeload.github.com/mwarning/device-observatory/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/utils/device-observatory/patches/010-uClibc-ng.patch b/utils/device-observatory/patches/010-uClibc-ng.patch new file mode 100644 index 0000000000..077a971b3d --- /dev/null +++ b/utils/device-observatory/patches/010-uClibc-ng.patch @@ -0,0 +1,22 @@ +--- a/src/parse_ether.c ++++ b/src/parse_ether.c +@@ -21,10 +21,18 @@ + #include "parse_ether.h" + + /* tcpdump header (ether.h) defines ETHER_HDRLEN) */ +-#ifndef ETHER_HDRLEN ++#ifndef ETHER_HDRLEN + #define ETHER_HDRLEN 14 + #endif + ++/* uClibc-ng compatibility */ ++#ifndef IPPROTO_BEETPH ++#define IPPROTO_BEETPH 94 ++#endif ++ ++#ifndef IPPROTO_MPLS ++#define IPPROTO_MPLS 137 ++#endif + + const char *ip_protcol_str(int p) + { -- 2.30.2