From patchwork Tue Apr 3 21:05:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 150546 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 72D0BB6FDC for ; Wed, 4 Apr 2012 07:07:29 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 482E3101F6A; Tue, 3 Apr 2012 21:07:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y2cXKwhVlJbr; Tue, 3 Apr 2012 21:07:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 48249101EF4; Tue, 3 Apr 2012 21:07:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id ABDB18F753 for ; Tue, 3 Apr 2012 21:07:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A829D32084 for ; Tue, 3 Apr 2012 21:07:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G13y5rYCSRlD for ; Tue, 3 Apr 2012 21:07:21 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by silver.osuosl.org (Postfix) with ESMTP id C15AB32099 for ; Tue, 3 Apr 2012 21:07:21 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id B91A4969F2; Tue, 3 Apr 2012 21:07:21 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Tue, 3 Apr 2012 23:05:42 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: d58777fdf0d18da7c08f6b604d36f85aae2ec5bb X-Git-Newrev: 5fd8f38fbc9742530efeec5f751c28fe7afbf4e0 X-Patchwork-Hint: ignore Message-Id: <20120403210721.B91A4969F2@busybox.osuosl.org> Subject: [Buildroot] [git commit] socketcand: fix installation on old systems 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 commit: http://git.buildroot.net/buildroot/commit/?id=5fd8f38fbc9742530efeec5f751c28fe7afbf4e0 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master [Peter: adjust patch to do install -m 0644 and not -D] Signed-off-by: Maxime Ripard Signed-off-by: Peter Korsgaard --- .../socketcand-replace-cp-by-install.patch | 25 ++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) 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..4462ddf --- /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 -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 +