From patchwork Tue Apr 3 08:55:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 150350 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 3BD01B6FC9 for ; Tue, 3 Apr 2012 18:56:05 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 48FAF31FC0; Tue, 3 Apr 2012 08:56:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uaDE54ixNtnC; Tue, 3 Apr 2012 08:56:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3108231FAA; Tue, 3 Apr 2012 08:55:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 483708F753 for ; Tue, 3 Apr 2012 08:55:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 374608D31B for ; Tue, 3 Apr 2012 08:55:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Edv16MwOTuP5 for ; Tue, 3 Apr 2012 08:55:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [88.190.12.23]) by whitealder.osuosl.org (Postfix) with ESMTP id 23EF68D284 for ; Tue, 3 Apr 2012 08:55:53 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 2EA451BD; Tue, 3 Apr 2012 10:55:01 +0200 (CEST) Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id DAE931AE for ; Tue, 3 Apr 2012 10:54:47 +0200 (CEST) From: Maxime Ripard To: buildroot@busybox.net Date: Tue, 3 Apr 2012 10:55:32 +0200 Message-Id: <6ba987689f0509f25ac5fdffc3365c9287e97b92.1333443312.git.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 4/4] Fix installation of socketcand X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Maxime Ripard --- .../socketcand-replace-cp-by-install.patch | 25 ++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) create mode 100644 package/socketcand/socketcand-replace-cp-by-install.patch diff --git a/package/socketcand/socketcand-replace-cp-by-install.patch b/package/socketcand/socketcand-replace-cp-by-install.patch new file mode 100644 index 0000000..d66ed71 --- /dev/null +++ b/package/socketcand/socketcand-replace-cp-by-install.patch @@ -0,0 +1,25 @@ +From 9d2797ce08034aba0087e6fe45873c3ccd8db489 Mon Sep 17 00:00:00 2001 +From: Maxime Ripard +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 +--- + 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 -D $(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 +