diff --git a/utils/open-plc-utils/Makefile b/utils/open-plc-utils/Makefile index 0cb49dbf02..3a09146acc 100644 --- a/utils/open-plc-utils/Makefile +++ b/utils/open-plc-utils/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=open-plc-utils -PKG_VERSION:=2015-09-21 +PKG_VERSION:=2017-01-11 PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/qca/open-plc-utils.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=885a1b7e2e663b5ab8797db6d40a0318131fdf18 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE_VERSION:=6a07d621583cb86ddf2fddcacb41cc4cf28bf33a +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Florian Fainelli @@ -75,10 +75,6 @@ OPEN_PLC_UTILS_APPS:=efbu efeu efru efsu edru edsu nics \ $(foreach a,$(OPEN_PLC_UTILS_APPS),$(eval $(call GenPlugin,$(a)))) -ifdef CONFIG_USE_MUSL - TARGET_CFLAGS += -D__UCLIBC__ -endif - define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ EXTRA_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ diff --git a/utils/open-plc-utils/patches/100-musl-compat.patch b/utils/open-plc-utils/patches/100-musl-compat.patch deleted file mode 100644 index c20c0a1fea..0000000000 --- a/utils/open-plc-utils/patches/100-musl-compat.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/ether/readpacket.c -+++ b/ether/readpacket.c -@@ -70,6 +70,10 @@ - #include - #include - -+#if defined (__linux__) -+#include -+#endif -+ - #include "../ether/channel.h" - #include "../tools/memory.h" - #include "../tools/error.h" -@@ -95,8 +99,6 @@ ssize_t readpacket (struct channel const - - #elif defined (__linux__) - --#include -- - struct pollfd pollfd = - { - channel->fd, ---- a/serial/serial.c -+++ b/serial/serial.c -@@ -69,6 +69,8 @@ - - #if defined (WIN32) - #include -+#else -+#include - #endif - - /*====================================================================*