diff --git a/canutils/libcanard/Kconfig b/canutils/libcanard/Kconfig index aec812525..1a125327b 100644 --- a/canutils/libcanard/Kconfig +++ b/canutils/libcanard/Kconfig @@ -20,7 +20,7 @@ config LIBCANARD_URL config LIBCANARD_VERSION string "libcanard Version" - default "b28bf6ac337e55d49037fd9904d4b951760c4690" + default "e4a1d52be862b03e5872add75890e67bf1d9187c" ---help--- libcanard version. diff --git a/canutils/libcanard/Makefile b/canutils/libcanard/Makefile index 57a065432..35756c3f2 100644 --- a/canutils/libcanard/Makefile +++ b/canutils/libcanard/Makefile @@ -46,7 +46,6 @@ LIBCANARD_UNPACKNAME = libcanard-$(LIBCANARD_VERSION) LIBCANARD_PACKNAME = $(LIBCANARD_UNPACKNAME)$(PACKEXT) LIBCANARD_SRCDIR = $(LIBCANARD_UNPACKNAME) LIBCANARD_DRVDIR = $(LIBCANARD_SRCDIR)$(DELIM)drivers$(DELIM)nuttx -LIBCANARD_PATCHNAME = nuttx-$(LIBCANARD_VERSION).patch APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)canutils @@ -79,9 +78,6 @@ $(LIBCANARD_UNPACKNAME): $(LIBCANARD_PACKNAME) @echo "Unpacking: $< -> $@" $(call DELDIR, $@) $(Q) $(UNPACK) $< - $(Q) if [ -r $(LIBCANARD_PATCHNAME) ]; then \ - cat $(LIBCANARD_PATCHNAME) | patch -p0 || { echo "ERROR: Patch failed"; exit 1; }; \ - fi $(Q) touch $@ $(LIBCANARD_SRCDIR)$(DELIM)canard.h: $(LIBCANARD_UNPACKNAME) diff --git a/canutils/libcanard/nuttx-b28bf6ac337e55d49037fd9904d4b951760c4690.patch b/canutils/libcanard/nuttx-b28bf6ac337e55d49037fd9904d4b951760c4690.patch deleted file mode 100644 index 92f5302ac..000000000 --- a/canutils/libcanard/nuttx-b28bf6ac337e55d49037fd9904d4b951760c4690.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libcanard-b28bf6ac337e55d49037fd9904d4b951760c4690/drivers/nuttx/canard_nuttx.c.orig 2016-07-21 09:10:10.781658371 -0600 -+++ libcanard-b28bf6ac337e55d49037fd9904d4b951760c4690/drivers/nuttx/canard_nuttx.c 2016-07-21 09:10:26.608658284 -0600 -@@ -10,7 +10,7 @@ - #include - #include - #include --#include -+#include - - int canardNuttXInit(CanardNuttXInstance* out_ins, const char* can_iface_name) - {