Commit 074a420c authored by Yegor Yefremov's avatar Yegor Yefremov Committed by Peter Korsgaard
Browse files

socketcand: bump version and remove obsolete patch 



The latest socketcand revision replaced 'cp -n' with proper
'install command.

Signed-off-by: default avatarYegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 304cb4d5

package/socketcand/socketcand-replace-cp-by-install.patch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
From 9d2797ce08034aba0087e6fe45873c3ccd8db489 Mon Sep 17 00:00:00 2001

From: Maxime Ripard <maxime.ripard@free-electrons.com>

Date: Tue, 3 Apr 2012 10:35:09 +0200

Subject: [PATCH] Remove cp -n which might not exist on old system and rely on install instead



Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

---

 Makefile.in |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)



diff --git a/Makefile.in b/Makefile.in

index 40d8193..290a8dd 100644

--- a/Makefile.in

+++ b/Makefile.in

@@ -38,6 +38,6 @@ install: socketcand

 	mkdir -p $(DESTDIR)$(sysroot)$(mandir)

 	cp $(srcdir)/socketcand.1 $(DESTDIR)$(sysroot)$(mandir)/

 	mkdir -p $(DESTDIR)$(sysroot)/etc/

-	cp -n $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/

+	install -m 0644 $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/

 	if [ $(init_script) = yes ]; then mkdir -p $(DESTDIR)$(sysroot)/etc/init.d; install --mode=755 $(srcdir)/init.d/socketcand $(DESTDIR)$(sysroot)/etc/init.d/socketcand; fi

 	if [ $(rc_script) = yes ]; then install --mode=755 $(srcdir)/rc.d/socketcand $(DESTDIR)$(sysroot)/etc/rc.d/socketcand; fi

-- 

1.7.4.1

package/socketcand/socketcand.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



SOCKETCAND_VERSION = dc3437abf17359fa8cb16567415b47e7ef8568d0

SOCKETCAND_VERSION = 274e4e44107f6138a29bbc4e20f9fbd2a7d4dab1

SOCKETCAND_SITE = $(call github,dschanoeh,socketcand,$(SOCKETCAND_VERSION))

SOCKETCAND_AUTORECONF = YES