Skip to contentSkip to conversation

can-utils: bump version

PATCH New Yegor Yefremov 2 participants 2 messages Jul 25, 2015 – Jul 26, 2015

lore
Share & tools
lore

Yegor Yefremov

author
#0 lore raw

PATCH 1/1 can-utils: bump version

Remove upstreamed patches.

Signed-off-by Yegor Yefremov <[email protected]>
---
 .../0001-log2asc-include-sys-time.h.patch          | 28 ---------------
 ...Include-linux-sockios.h-to-fix-musl-build.patch | 42 ----------------------
 package/can-utils/can-utils.mk                     |  2 +-
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 package/can-utils/0001-log2asc-include-sys-time.h.patch
 delete mode 100644 package/can-utils/0002-Include-linux-sockios.h-to-fix-musl-build.patch
package/can-utils/0001-log2asc-include-sys-time.h.patch deleted +0 -28
deleted file mode 100644
index 30cf23b..0000000
@@ -1,28 +0,0 @@
-From 50a71462a3291f7e08fa25f67b274792bb419211 Mon Sep 17 00:00:00 2001
-From: Yegor Yefremov <[email protected]>
-Date: Tue, 14 Jul 2015 21:24:37 +0200
-Subject: [PATCH 1/2] log2asc: include sys/time.h
-
-Without this patch compilation against musl C library
-breaks, because struct timeval cannot be found.
-
-Signed-off-by: Yegor Yefremov <[email protected]>
----
- log2asc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/log2asc.c b/log2asc.c
-index 29d13e8..8fb88a9 100644
---- a/log2asc.c
-+++ b/log2asc.c
-@@ -48,6 +48,7 @@
- #include <unistd.h>
- 
- #include <net/if.h>
-+#include <sys/time.h>
- #include <linux/can.h>
- 
- #include "lib.h"
--- 
-2.1.4
-
package/can-utils/0002-Include-linux-sockios.h-to-fix-musl-build.patch deleted +0 -42

42 lines not on this page · raw message

package/can-utils/can-utils.mk +1 -1
index 23649fe..8e8ed4e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CAN_UTILS_VERSION = 0eb1e3db2e20b0d895468363dbe6030cd8afa61c
+CAN_UTILS_VERSION = f0abaaacb0a3f620f73dd6fd716d7daa3c36a8e3
 CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION))
 CAN_UTILS_AUTORECONF = YES
Signature · 1 line
2.1.0
Applied
#1 lore raw

PATCH 1/1 can-utils: bump version

Dear Yegor Yefremov,

Quoted 10 lines · Yegor Yefremov

Remove upstreamed patches.

Signed-off-by Yegor Yefremov <[email protected]>
---
 .../0001-log2asc-include-sys-time.h.patch          | 28 ---------------
 ...Include-linux-sockios.h-to-fix-musl-build.patch | 42 ----------------------
 package/can-utils/can-utils.mk                     |  2 +-
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 package/can-utils/0001-log2asc-include-sys-time.h.patch
 delete mode 100644 package/can-utils/0002-Include-linux-sockios.h-to-fix-musl-build.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com